diff --git a/apps/calendar/apps/web/package.json b/apps/calendar/apps/web/package.json
index 39775e513..3d68fc541 100644
--- a/apps/calendar/apps/web/package.json
+++ b/apps/calendar/apps/web/package.json
@@ -49,8 +49,7 @@
 		"@manacore/shared-auth-ui": "workspace:*",
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
-		"@manacore/shared-feedback-ui": "workspace:*",
+		"@manacore/feedback": "workspace:*",
 		"@manacore/shared-i18n": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
diff --git a/apps/calendar/apps/web/src/lib/services/feedback.ts b/apps/calendar/apps/web/src/lib/services/feedback.ts
index de6a8a6d0..e4032e017 100644
--- a/apps/calendar/apps/web/src/lib/services/feedback.ts
+++ b/apps/calendar/apps/web/src/lib/services/feedback.ts
@@ -3,7 +3,7 @@
  */
 
 import { browser } from '$app/environment';
-import { createFeedbackService } from '@manacore/shared-feedback-service';
+import { createFeedbackService } from '@manacore/feedback';
 import { authStore } from '$lib/stores/auth.svelte';
 
 // Get auth URL dynamically at runtime
diff --git a/apps/calendar/apps/web/src/routes/(app)/feedback/+page.svelte b/apps/calendar/apps/web/src/routes/(app)/feedback/+page.svelte
index 580947375..cced1cd54 100644
--- a/apps/calendar/apps/web/src/routes/(app)/feedback/+page.svelte
+++ b/apps/calendar/apps/web/src/routes/(app)/feedback/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { FeedbackPage } from '@manacore/shared-feedback-ui';
+	import { FeedbackPage } from '@manacore/feedback';
 	import { feedbackService } from '$lib/services/feedback';
 	import { authStore } from '$lib/stores/auth.svelte';
 </script>
diff --git a/apps/chat/apps/server/package.json b/apps/chat/apps/server/package.json
new file mode 100644
index 000000000..e1b371f74
--- /dev/null
+++ b/apps/chat/apps/server/package.json
@@ -0,0 +1,19 @@
+{
+	"name": "@chat/server",
+	"version": "0.1.0",
+	"private": true,
+	"type": "module",
+	"scripts": {
+		"dev": "bun run --watch src/index.ts",
+		"start": "bun run src/index.ts"
+	},
+	"dependencies": {
+		"@manacore/shared-hono": "workspace:*",
+		"hono": "^4.7.0",
+		"drizzle-orm": "^0.38.3",
+		"postgres": "^3.4.5"
+	},
+	"devDependencies": {
+		"typescript": "^5.9.3"
+	}
+}
diff --git a/apps/chat/apps/server/src/index.ts b/apps/chat/apps/server/src/index.ts
new file mode 100644
index 000000000..d1cbd96c2
--- /dev/null
+++ b/apps/chat/apps/server/src/index.ts
@@ -0,0 +1,136 @@
+/**
+ * Chat Hono Server — LLM completions (sync + streaming)
+ *
+ * CRUD for conversations/messages handled by mana-sync.
+ * This server handles AI completions via mana-llm or OpenRouter.
+ */
+
+import { Hono } from 'hono';
+import { cors } from 'hono/cors';
+import { streamSSE } from 'hono/streaming';
+import { authMiddleware, healthRoute, errorHandler, notFoundHandler } from '@manacore/shared-hono';
+import { consumeCredits, validateCredits } from '@manacore/shared-hono/credits';
+
+const PORT = parseInt(process.env.PORT || '3002', 10);
+const LLM_URL = process.env.MANA_LLM_URL || 'http://localhost:3025';
+const OPENROUTER_KEY = process.env.OPENROUTER_API_KEY || '';
+const CORS_ORIGINS = (process.env.CORS_ORIGINS || 'http://localhost:5173').split(',');
+
+const app = new Hono();
+
+app.onError(errorHandler);
+app.notFound(notFoundHandler);
+app.use('*', cors({ origin: CORS_ORIGINS, credentials: true }));
+app.route('/health', healthRoute('chat-server'));
+app.use('/api/*', authMiddleware());
+
+// ─── Chat Completion (sync) ──────────────────────────────────
+
+app.post('/api/v1/chat/completions', async (c) => {
+	const userId = c.get('userId');
+	const { messages, model, temperature, maxTokens } = await c.req.json();
+
+	if (!messages?.length) return c.json({ error: 'messages required' }, 400);
+
+	const isLocal = !model || model.startsWith('ollama/') || model.startsWith('local/');
+	const cost = isLocal ? 0.1 : 5;
+
+	const validation = await validateCredits(userId, 'AI_CHAT', cost);
+	if (!validation.hasCredits) {
+		return c.json({ error: 'Insufficient credits', required: cost }, 402);
+	}
+
+	try {
+		const llmRes = await fetch(`${LLM_URL}/api/v1/chat/completions`, {
+			method: 'POST',
+			headers: { 'Content-Type': 'application/json' },
+			body: JSON.stringify({
+				messages,
+				model: model || 'gemma3:4b',
+				temperature: temperature || 0.7,
+				max_tokens: maxTokens || 2000,
+			}),
+		});
+
+		if (!llmRes.ok) return c.json({ error: 'LLM request failed' }, 502);
+
+		const data = await llmRes.json();
+		await consumeCredits(userId, 'AI_CHAT', cost, `Chat: ${model || 'gemma3:4b'}`);
+
+		return c.json(data);
+	} catch (_err) {
+		return c.json({ error: 'Chat completion failed' }, 500);
+	}
+});
+
+// ─── Chat Completion (streaming SSE) ─────────────────────────
+
+app.post('/api/v1/chat/completions/stream', async (c) => {
+	const userId = c.get('userId');
+	const { messages, model, temperature, maxTokens } = await c.req.json();
+
+	if (!messages?.length) return c.json({ error: 'messages required' }, 400);
+
+	const isLocal = !model || model.startsWith('ollama/') || model.startsWith('local/');
+	const cost = isLocal ? 0.1 : 5;
+
+	const validation = await validateCredits(userId, 'AI_CHAT', cost);
+	if (!validation.hasCredits) {
+		return c.json({ error: 'Insufficient credits' }, 402);
+	}
+
+	return streamSSE(c, async (stream) => {
+		try {
+			const llmRes = await fetch(`${LLM_URL}/api/v1/chat/completions`, {
+				method: 'POST',
+				headers: { 'Content-Type': 'application/json' },
+				body: JSON.stringify({
+					messages,
+					model: model || 'gemma3:4b',
+					temperature: temperature || 0.7,
+					max_tokens: maxTokens || 2000,
+					stream: true,
+				}),
+			});
+
+			if (!llmRes.ok || !llmRes.body) {
+				await stream.writeSSE({ data: JSON.stringify({ error: 'LLM failed' }) });
+				return;
+			}
+
+			const reader = llmRes.body.getReader();
+			const decoder = new TextDecoder();
+
+			while (true) {
+				const { done, value } = await reader.read();
+				if (done) break;
+				const chunk = decoder.decode(value, { stream: true });
+				// Forward SSE chunks directly
+				for (const line of chunk.split('\n')) {
+					if (line.startsWith('data: ')) {
+						await stream.writeSSE({ data: line.slice(6) });
+					}
+				}
+			}
+
+			await stream.writeSSE({ data: '[DONE]' });
+			consumeCredits(userId, 'AI_CHAT', cost, `Chat stream: ${model || 'gemma3:4b'}`).catch(() => {});
+		} catch (_err) {
+			await stream.writeSSE({ data: JSON.stringify({ error: 'Stream failed' }) });
+		}
+	});
+});
+
+// ─── Models List ─────────────────────────────────────────────
+
+app.get('/api/v1/chat/models', async (c) => {
+	try {
+		const res = await fetch(`${LLM_URL}/api/v1/models`);
+		if (res.ok) return c.json(await res.json());
+	} catch {
+		// Fallback
+	}
+	return c.json({ models: [] });
+});
+
+export default { port: PORT, fetch: app.fetch };
diff --git a/apps/chat/apps/server/tsconfig.json b/apps/chat/apps/server/tsconfig.json
new file mode 100644
index 000000000..9c7e5fa56
--- /dev/null
+++ b/apps/chat/apps/server/tsconfig.json
@@ -0,0 +1,11 @@
+{
+	"compilerOptions": {
+		"target": "ESNext",
+		"module": "ESNext",
+		"moduleResolution": "bundler",
+		"strict": true,
+		"esModuleInterop": true,
+		"skipLibCheck": true
+	},
+	"include": ["src/**/*.ts"]
+}
diff --git a/apps/chat/apps/web/package.json b/apps/chat/apps/web/package.json
index f5a00dbf0..769c27b1a 100644
--- a/apps/chat/apps/web/package.json
+++ b/apps/chat/apps/web/package.json
@@ -40,8 +40,7 @@
 		"@manacore/local-store": "workspace:*",
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
-		"@manacore/shared-feedback-ui": "workspace:*",
+		"@manacore/feedback": "workspace:*",
 		"@manacore/shared-i18n": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
diff --git a/apps/chat/apps/web/src/lib/services/feedback.ts b/apps/chat/apps/web/src/lib/services/feedback.ts
index a68733fa4..bd32c2635 100644
--- a/apps/chat/apps/web/src/lib/services/feedback.ts
+++ b/apps/chat/apps/web/src/lib/services/feedback.ts
@@ -2,7 +2,7 @@
  * Feedback Service Instance for Chat Web App
  */
 
-import { createFeedbackService } from '@manacore/shared-feedback-service';
+import { createFeedbackService } from '@manacore/feedback';
 import { authStore } from '$lib/stores/auth.svelte';
 
 // Use environment variable at runtime
diff --git a/apps/chat/apps/web/src/routes/(protected)/feedback/+page.svelte b/apps/chat/apps/web/src/routes/(protected)/feedback/+page.svelte
index a3abf48ca..b85cf3eda 100644
--- a/apps/chat/apps/web/src/routes/(protected)/feedback/+page.svelte
+++ b/apps/chat/apps/web/src/routes/(protected)/feedback/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { FeedbackPage } from '@manacore/shared-feedback-ui';
+	import { FeedbackPage } from '@manacore/feedback';
 	import { feedbackService } from '$lib/services/feedback';
 	import { authStore } from '$lib/stores/auth.svelte';
 </script>
diff --git a/apps/citycorners/apps/web/package.json b/apps/citycorners/apps/web/package.json
index 263d6aa1d..47c0a31c2 100644
--- a/apps/citycorners/apps/web/package.json
+++ b/apps/citycorners/apps/web/package.json
@@ -36,8 +36,7 @@
 		"@manacore/local-store": "workspace:*",
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
-		"@manacore/shared-feedback-ui": "workspace:*",
+		"@manacore/feedback": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
 		"@manacore/shared-i18n": "workspace:*",
diff --git a/apps/citycorners/apps/web/src/routes/(app)/feedback/+page.svelte b/apps/citycorners/apps/web/src/routes/(app)/feedback/+page.svelte
index 028634274..bc0f544a5 100644
--- a/apps/citycorners/apps/web/src/routes/(app)/feedback/+page.svelte
+++ b/apps/citycorners/apps/web/src/routes/(app)/feedback/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { browser } from '$app/environment';
-	import { FeedbackPage } from '@manacore/shared-feedback-ui';
-	import { createFeedbackService } from '@manacore/shared-feedback-service';
+	import { FeedbackPage } from '@manacore/feedback';
+	import { createFeedbackService } from '@manacore/feedback';
 	import { authStore } from '$lib/stores/auth.svelte';
 	import '$lib/i18n';
 
diff --git a/apps/clock/apps/web/package.json b/apps/clock/apps/web/package.json
index dab1a7ca8..7bae9a145 100644
--- a/apps/clock/apps/web/package.json
+++ b/apps/clock/apps/web/package.json
@@ -43,8 +43,7 @@
 		"@manacore/shared-auth-ui": "workspace:*",
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
-		"@manacore/shared-feedback-ui": "workspace:*",
+		"@manacore/feedback": "workspace:*",
 		"@manacore/shared-i18n": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
diff --git a/apps/clock/apps/web/src/routes/(app)/feedback/+page.svelte b/apps/clock/apps/web/src/routes/(app)/feedback/+page.svelte
index 1d3c8d9c2..83db9757e 100644
--- a/apps/clock/apps/web/src/routes/(app)/feedback/+page.svelte
+++ b/apps/clock/apps/web/src/routes/(app)/feedback/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { browser } from '$app/environment';
-	import { FeedbackPage } from '@manacore/shared-feedback-ui';
-	import { createFeedbackService } from '@manacore/shared-feedback-service';
+	import { FeedbackPage } from '@manacore/feedback';
+	import { createFeedbackService } from '@manacore/feedback';
 	import { authStore } from '$lib/stores/auth.svelte';
 	import '$lib/i18n';
 
diff --git a/apps/contacts/apps/web/package.json b/apps/contacts/apps/web/package.json
index 293fd40ce..effb7489d 100644
--- a/apps/contacts/apps/web/package.json
+++ b/apps/contacts/apps/web/package.json
@@ -41,8 +41,7 @@
 		"@manacore/shared-auth-ui": "workspace:*",
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
-		"@manacore/shared-feedback-ui": "workspace:*",
+		"@manacore/feedback": "workspace:*",
 		"@manacore/shared-help-content": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
diff --git a/apps/contacts/apps/web/src/lib/services/feedback.ts b/apps/contacts/apps/web/src/lib/services/feedback.ts
index 08c5e19cf..18ecafb41 100644
--- a/apps/contacts/apps/web/src/lib/services/feedback.ts
+++ b/apps/contacts/apps/web/src/lib/services/feedback.ts
@@ -3,7 +3,7 @@
  */
 
 import { browser } from '$app/environment';
-import { createFeedbackService } from '@manacore/shared-feedback-service';
+import { createFeedbackService } from '@manacore/feedback';
 import { authStore } from '$lib/stores/auth.svelte';
 
 // Get auth URL dynamically at runtime
diff --git a/apps/contacts/apps/web/src/routes/(app)/feedback/+page.svelte b/apps/contacts/apps/web/src/routes/(app)/feedback/+page.svelte
index fc6901f85..024cad4c6 100644
--- a/apps/contacts/apps/web/src/routes/(app)/feedback/+page.svelte
+++ b/apps/contacts/apps/web/src/routes/(app)/feedback/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { FeedbackPage } from '@manacore/shared-feedback-ui';
+	import { FeedbackPage } from '@manacore/feedback';
 	import { feedbackService } from '$lib/services/feedback';
 	import { authStore } from '$lib/stores/auth.svelte';
 </script>
diff --git a/apps/context/apps/web/package.json b/apps/context/apps/web/package.json
index 719d5f092..b10cd2c4d 100644
--- a/apps/context/apps/web/package.json
+++ b/apps/context/apps/web/package.json
@@ -39,8 +39,7 @@
 		"@manacore/local-store": "workspace:*",
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
-		"@manacore/shared-feedback-ui": "workspace:*",
+		"@manacore/feedback": "workspace:*",
 		"@manacore/shared-i18n": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
diff --git a/apps/context/apps/web/src/routes/(app)/feedback/+page.svelte b/apps/context/apps/web/src/routes/(app)/feedback/+page.svelte
index bcd779939..04a3a97af 100644
--- a/apps/context/apps/web/src/routes/(app)/feedback/+page.svelte
+++ b/apps/context/apps/web/src/routes/(app)/feedback/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { browser } from '$app/environment';
-	import { FeedbackPage } from '@manacore/shared-feedback-ui';
-	import { createFeedbackService } from '@manacore/shared-feedback-service';
+	import { FeedbackPage } from '@manacore/feedback';
+	import { createFeedbackService } from '@manacore/feedback';
 	import { authStore } from '$lib/stores/auth.svelte';
 	import '$lib/i18n';
 
diff --git a/apps/inventar/apps/web/package.json b/apps/inventar/apps/web/package.json
index f4765b24c..7093ece4d 100644
--- a/apps/inventar/apps/web/package.json
+++ b/apps/inventar/apps/web/package.json
@@ -37,7 +37,6 @@
 		"@manacore/shared-auth-ui": "workspace:*",
 		"@manacore/shared-landing-ui": "workspace:*",
 		"@manacore/shared-profile-ui": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
 		"@manacore/shared-stores": "workspace:*",
 		"@manacore/shared-subscription-ui": "workspace:*",
 		"@manacore/shared-theme": "workspace:*",
diff --git a/apps/inventar/apps/web/src/lib/services/feedback.ts b/apps/inventar/apps/web/src/lib/services/feedback.ts
index 63b7beade..a0745099c 100644
--- a/apps/inventar/apps/web/src/lib/services/feedback.ts
+++ b/apps/inventar/apps/web/src/lib/services/feedback.ts
@@ -1,5 +1,5 @@
 import { browser } from '$app/environment';
-import { createFeedbackService } from '@manacore/shared-feedback-service';
+import { createFeedbackService } from '@manacore/feedback';
 import { authStore } from '$lib/stores/auth.svelte';
 
 function getAuthUrl(): string {
diff --git a/apps/manacore/apps/web/package.json b/apps/manacore/apps/web/package.json
index 4b0d51d35..0ad9a9425 100644
--- a/apps/manacore/apps/web/package.json
+++ b/apps/manacore/apps/web/package.json
@@ -49,8 +49,7 @@
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-config": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
-		"@manacore/shared-feedback-ui": "workspace:*",
+		"@manacore/feedback": "workspace:*",
 		"@manacore/shared-i18n": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
diff --git a/apps/manacore/apps/web/src/lib/api/feedback.ts b/apps/manacore/apps/web/src/lib/api/feedback.ts
index 2969d9ecd..a28be045c 100644
--- a/apps/manacore/apps/web/src/lib/api/feedback.ts
+++ b/apps/manacore/apps/web/src/lib/api/feedback.ts
@@ -2,7 +2,7 @@
  * Feedback Service Instance for ManaCore Web App
  */
 
-import { createFeedbackService } from '@manacore/shared-feedback-service';
+import { createFeedbackService } from '@manacore/feedback';
 import { authStore } from '$lib/stores/auth.svelte';
 import { getManaAuthUrl } from './config';
 
diff --git a/apps/manacore/apps/web/src/routes/(app)/feedback/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/feedback/+page.svelte
index a8cb80d2c..733fc5944 100644
--- a/apps/manacore/apps/web/src/routes/(app)/feedback/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/feedback/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { FeedbackPage } from '@manacore/shared-feedback-ui';
+	import { FeedbackPage } from '@manacore/feedback';
 	import { feedbackService } from '$lib/api/feedback';
 	import { authStore } from '$lib/stores/auth.svelte';
 </script>
diff --git a/apps/manadeck/apps/web/package.json b/apps/manadeck/apps/web/package.json
index d696b0965..6d627615b 100644
--- a/apps/manadeck/apps/web/package.json
+++ b/apps/manadeck/apps/web/package.json
@@ -37,8 +37,7 @@
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-config": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
-		"@manacore/shared-feedback-ui": "workspace:*",
+		"@manacore/feedback": "workspace:*",
 		"@manacore/shared-i18n": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
diff --git a/apps/manadeck/apps/web/src/lib/api/feedback.ts b/apps/manadeck/apps/web/src/lib/api/feedback.ts
index f8d68757a..2ac23708a 100644
--- a/apps/manadeck/apps/web/src/lib/api/feedback.ts
+++ b/apps/manadeck/apps/web/src/lib/api/feedback.ts
@@ -2,7 +2,7 @@
  * Feedback Service Instance for ManaDeck Web App
  */
 
-import { createFeedbackService } from '@manacore/shared-feedback-service';
+import { createFeedbackService } from '@manacore/feedback';
 import { authService } from '$lib/auth';
 import { PUBLIC_MANA_CORE_AUTH_URL } from '$env/static/public';
 
diff --git a/apps/manadeck/apps/web/src/routes/(app)/feedback/+page.svelte b/apps/manadeck/apps/web/src/routes/(app)/feedback/+page.svelte
index 2c7891c74..1d630febe 100644
--- a/apps/manadeck/apps/web/src/routes/(app)/feedback/+page.svelte
+++ b/apps/manadeck/apps/web/src/routes/(app)/feedback/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { FeedbackPage } from '@manacore/shared-feedback-ui';
+	import { FeedbackPage } from '@manacore/feedback';
 	import { feedbackService } from '$lib/api/feedback';
 	import { authStore } from '$lib/stores/auth.svelte';
 </script>
diff --git a/apps/matrix/apps/web/package.json b/apps/matrix/apps/web/package.json
index aa03aaae5..5157de532 100644
--- a/apps/matrix/apps/web/package.json
+++ b/apps/matrix/apps/web/package.json
@@ -41,8 +41,7 @@
 		"@manacore/shared-auth": "workspace:*",
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
-		"@manacore/shared-feedback-ui": "workspace:*",
+		"@manacore/feedback": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
 		"@manacore/shared-i18n": "workspace:*",
diff --git a/apps/matrix/apps/web/src/routes/(app)/feedback/+page.svelte b/apps/matrix/apps/web/src/routes/(app)/feedback/+page.svelte
index 1e19c487c..4e6fb723a 100644
--- a/apps/matrix/apps/web/src/routes/(app)/feedback/+page.svelte
+++ b/apps/matrix/apps/web/src/routes/(app)/feedback/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { browser } from '$app/environment';
-	import { FeedbackPage } from '@manacore/shared-feedback-ui';
-	import { createFeedbackService } from '@manacore/shared-feedback-service';
+	import { FeedbackPage } from '@manacore/feedback';
+	import { createFeedbackService } from '@manacore/feedback';
 	import { matrixStore } from '$lib/matrix';
 
 	function getAuthUrl(): string {
diff --git a/apps/mukke/apps/server/package.json b/apps/mukke/apps/server/package.json
new file mode 100644
index 000000000..2016eed60
--- /dev/null
+++ b/apps/mukke/apps/server/package.json
@@ -0,0 +1,18 @@
+{
+	"name": "@mukke/server",
+	"version": "0.1.0",
+	"private": true,
+	"type": "module",
+	"scripts": {
+		"dev": "bun run --watch src/index.ts",
+		"start": "bun run src/index.ts"
+	},
+	"dependencies": {
+		"@manacore/shared-hono": "workspace:*",
+		"@manacore/shared-storage": "workspace:*",
+		"hono": "^4.7.0"
+	},
+	"devDependencies": {
+		"typescript": "^5.9.3"
+	}
+}
diff --git a/apps/mukke/apps/server/src/index.ts b/apps/mukke/apps/server/src/index.ts
new file mode 100644
index 000000000..684d775da
--- /dev/null
+++ b/apps/mukke/apps/server/src/index.ts
@@ -0,0 +1,110 @@
+/**
+ * Mukke Hono Server — Audio upload, metadata, presigned URLs
+ *
+ * CRUD for songs/playlists/projects handled by mana-sync.
+ * This server handles S3 operations and metadata extraction.
+ */
+
+import { Hono } from 'hono';
+import { cors } from 'hono/cors';
+import { authMiddleware, healthRoute, errorHandler, notFoundHandler } from '@manacore/shared-hono';
+
+const PORT = parseInt(process.env.PORT || '3010', 10);
+const S3_ENDPOINT = process.env.S3_ENDPOINT || 'http://localhost:9000';
+const S3_BUCKET = process.env.S3_BUCKET || 'mukke-storage';
+const S3_ACCESS_KEY = process.env.S3_ACCESS_KEY || 'minioadmin';
+const S3_SECRET_KEY = process.env.S3_SECRET_KEY || 'minioadmin';
+const CORS_ORIGINS = (process.env.CORS_ORIGINS || 'http://localhost:5180').split(',');
+
+const app = new Hono();
+
+app.onError(errorHandler);
+app.notFound(notFoundHandler);
+app.use('*', cors({ origin: CORS_ORIGINS, credentials: true }));
+app.route('/health', healthRoute('mukke-server'));
+app.use('/api/*', authMiddleware());
+
+// ─── Song Upload (server-only: S3 presigned URL) ────────────
+
+app.post('/api/v1/songs/upload', async (c) => {
+	const userId = c.get('userId');
+	const { filename } = await c.req.json();
+
+	if (!filename) return c.json({ error: 'filename required' }, 400);
+
+	const songId = crypto.randomUUID();
+	const key = `users/${userId}/songs/${songId}/${filename}`;
+
+	// Generate presigned upload URL
+	try {
+		const { createMukkeStorage, generateUserFileKey } = await import('@manacore/shared-storage');
+		const storage = createMukkeStorage();
+		const uploadUrl = await storage.getUploadUrl(key, { expiresIn: 3600 });
+
+		return c.json({
+			song: { id: songId, title: filename.replace(/\.[^/.]+$/, ''), storagePath: key },
+			uploadUrl,
+		});
+	} catch (_err) {
+		return c.json({ error: 'Failed to generate upload URL' }, 500);
+	}
+});
+
+// ─── Download URL (server-only: S3 presigned URL) ────────────
+
+app.get('/api/v1/songs/:id/download-url', async (c) => {
+	const { storagePath } = c.req.query();
+	if (!storagePath) return c.json({ error: 'storagePath required' }, 400);
+
+	try {
+		const { createMukkeStorage } = await import('@manacore/shared-storage');
+		const storage = createMukkeStorage();
+		const url = await storage.getDownloadUrl(storagePath, { expiresIn: 3600 });
+		return c.json({ url });
+	} catch (_err) {
+		return c.json({ error: 'Failed to generate download URL' }, 500);
+	}
+});
+
+// ─── Cover Art URL (server-only: S3 presigned URL) ───────────
+
+app.get('/api/v1/songs/:id/cover-url', async (c) => {
+	const { coverArtPath } = c.req.query();
+	if (!coverArtPath) return c.json({ url: null });
+
+	try {
+		const { createMukkeStorage } = await import('@manacore/shared-storage');
+		const storage = createMukkeStorage();
+		const url = await storage.getDownloadUrl(coverArtPath, { expiresIn: 3600 });
+		return c.json({ url });
+	} catch (_err) {
+		return c.json({ url: null });
+	}
+});
+
+// ─── Batch Cover URLs ────────────────────────────────────────
+
+app.post('/api/v1/library/cover-urls', async (c) => {
+	const { paths } = await c.req.json();
+	if (!paths?.length) return c.json({ urls: {} });
+
+	try {
+		const { createMukkeStorage } = await import('@manacore/shared-storage');
+		const storage = createMukkeStorage();
+		const urls: Record<string, string> = {};
+
+		for (const path of paths.slice(0, 50)) {
+			try {
+				urls[path] = await storage.getDownloadUrl(path, { expiresIn: 3600 });
+			} catch {
+				// Skip failed URLs
+			}
+		}
+
+		return c.json({ urls });
+	} catch (_err) {
+		return c.json({ urls: {} });
+	}
+});
+
+export default { port: PORT, fetch: app.fetch };
diff --git a/apps/mukke/apps/server/tsconfig.json b/apps/mukke/apps/server/tsconfig.json
new file mode 100644
index 000000000..9c7e5fa56
--- /dev/null
+++ b/apps/mukke/apps/server/tsconfig.json
@@ -0,0 +1,11 @@
+{
+	"compilerOptions": {
+		"target": "ESNext",
+		"module": "ESNext",
+		"moduleResolution": "bundler",
+		"strict": true,
+		"esModuleInterop": true,
+		"skipLibCheck": true
+	},
+	"include": ["src/**/*.ts"]
+}
diff --git a/apps/mukke/apps/web/package.json b/apps/mukke/apps/web/package.json
index 5d796b8f6..525080d00 100644
--- a/apps/mukke/apps/web/package.json
+++ b/apps/mukke/apps/web/package.json
@@ -42,8 +42,7 @@
 		"@manacore/local-store": "workspace:*",
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:^",
-		"@manacore/shared-feedback-ui": "workspace:^",
+		"@manacore/feedback": "workspace:^",
 		"@manacore/shared-i18n": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
diff --git a/apps/mukke/apps/web/src/lib/services/feedback.ts b/apps/mukke/apps/web/src/lib/services/feedback.ts
index 143ad1ae9..23d7bd595 100644
--- a/apps/mukke/apps/web/src/lib/services/feedback.ts
+++ b/apps/mukke/apps/web/src/lib/services/feedback.ts
@@ -1,5 +1,5 @@
 import { browser } from '$app/environment';
-import { createFeedbackService } from '@manacore/shared-feedback-service';
+import { createFeedbackService } from '@manacore/feedback';
 import { authStore } from '$lib/stores/auth.svelte';
 
 function getAuthUrl(): string {
diff --git a/apps/mukke/apps/web/src/routes/(app)/feedback/+page.svelte b/apps/mukke/apps/web/src/routes/(app)/feedback/+page.svelte
index 7ff699b5a..a19b4ed39 100644
--- a/apps/mukke/apps/web/src/routes/(app)/feedback/+page.svelte
+++ b/apps/mukke/apps/web/src/routes/(app)/feedback/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { FeedbackPage } from '@manacore/shared-feedback-ui';
+	import { FeedbackPage } from '@manacore/feedback';
 	import { feedbackService } from '$lib/services/feedback';
 	import { authStore } from '$lib/stores/auth.svelte';
 </script>
diff --git a/apps/nutriphi/apps/web/package.json b/apps/nutriphi/apps/web/package.json
index 03e9438b5..0dfbcb32b 100644
--- a/apps/nutriphi/apps/web/package.json
+++ b/apps/nutriphi/apps/web/package.json
@@ -44,8 +44,7 @@
 		"@manacore/shared-auth-ui": "workspace:*",
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
-		"@manacore/shared-feedback-ui": "workspace:*",
+		"@manacore/feedback": "workspace:*",
 		"@manacore/shared-i18n": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
diff --git a/apps/photos/apps/web/package.json b/apps/photos/apps/web/package.json
index b045a5a95..18d5a9bbd 100644
--- a/apps/photos/apps/web/package.json
+++ b/apps/photos/apps/web/package.json
@@ -36,8 +36,7 @@
 		"@manacore/local-store": "workspace:*",
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
-		"@manacore/shared-feedback-ui": "workspace:*",
+		"@manacore/feedback": "workspace:*",
 		"@manacore/shared-help-content": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
diff --git a/apps/photos/apps/web/src/routes/(app)/feedback/+page.svelte b/apps/photos/apps/web/src/routes/(app)/feedback/+page.svelte
index af6af1fc9..fac5af3c5 100644
--- a/apps/photos/apps/web/src/routes/(app)/feedback/+page.svelte
+++ b/apps/photos/apps/web/src/routes/(app)/feedback/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { browser } from '$app/environment';
-	import { FeedbackPage } from '@manacore/shared-feedback-ui';
-	import { createFeedbackService } from '@manacore/shared-feedback-service';
+	import { FeedbackPage } from '@manacore/feedback';
+	import { createFeedbackService } from '@manacore/feedback';
 	import { authStore } from '$lib/stores/auth.svelte';
 	import '$lib/i18n';
 
diff --git a/apps/picture/apps/server/package.json b/apps/picture/apps/server/package.json
new file mode 100644
index 000000000..54eabea1b
--- /dev/null
+++ b/apps/picture/apps/server/package.json
@@ -0,0 +1,18 @@
+{
+	"name": "@picture/server",
+	"version": "0.1.0",
+	"private": true,
+	"type": "module",
+	"scripts": {
+		"dev": "bun run --watch src/index.ts",
+		"start": "bun run src/index.ts"
+	},
+	"dependencies": {
+		"@manacore/shared-hono": "workspace:*",
+		"@manacore/shared-storage": "workspace:*",
+		"hono": "^4.7.0"
+	},
+	"devDependencies": {
+		"typescript": "^5.9.3"
+	}
+}
diff --git a/apps/picture/apps/server/src/index.ts b/apps/picture/apps/server/src/index.ts
new file mode 100644
index 000000000..be4e306e4
--- /dev/null
+++ b/apps/picture/apps/server/src/index.ts
@@ -0,0 +1,144 @@
+/**
+ * Picture Hono Server — AI image generation + upload
+ *
+ * CRUD for images/boards/boardItems handled by mana-sync.
+ * This server handles Replicate API, S3 uploads, and explore.
+ */
+
+import { Hono } from 'hono';
+import { cors } from 'hono/cors';
+import { authMiddleware, healthRoute, errorHandler, notFoundHandler } from '@manacore/shared-hono';
+import { consumeCredits, validateCredits } from '@manacore/shared-hono/credits';
+
+const PORT = parseInt(process.env.PORT || '3006', 10);
+const REPLICATE_TOKEN = process.env.REPLICATE_API_TOKEN || '';
+const IMAGE_GEN_URL = process.env.MANA_IMAGE_GEN_URL || '';
+const CORS_ORIGINS = (process.env.CORS_ORIGINS || 'http://localhost:5173').split(',');
+
+const app = new Hono();
+
+app.onError(errorHandler);
+app.notFound(notFoundHandler);
+app.use('*', cors({ origin: CORS_ORIGINS, credentials: true }));
+app.route('/health', healthRoute('picture-server'));
+app.use('/api/*', authMiddleware());
+
+// ─── AI Image Generation (server-only: Replicate/local) ─────
+
+app.post('/api/v1/generate', async (c) => {
+	const userId = c.get('userId');
+	const { prompt, model, width, height, negativePrompt, steps, guidanceScale } = await c.req.json();
+
+	if (!prompt) return c.json({ error: 'prompt required' }, 400);
+
+	const cost = 10;
+	const validation = await validateCredits(userId, 'AI_IMAGE_GENERATION', cost);
+	if (!validation.hasCredits) {
+		return c.json({ error: 'Insufficient credits', required: cost }, 402);
+	}
+
+	try {
+		let imageUrl: string;
+
+		if (model?.startsWith('local/') && IMAGE_GEN_URL) {
+			// Local generation via mana-image-gen
+			const res = await fetch(`${IMAGE_GEN_URL}/generate`, {
+				method: 'POST',
+				headers: { 'Content-Type': 'application/json' },
+				body: JSON.stringify({
+					prompt,
+					negative_prompt: negativePrompt,
+					width: width || 1024,
+					height: height || 1024,
+					steps: steps || 20,
+					guidance_scale: guidanceScale || 7.5,
+				}),
+			});
+			if (!res.ok) return c.json({ error: 'Local generation failed' }, 502);
+			const data = await res.json();
+			imageUrl = data.image_url || data.url;
+		} else if (REPLICATE_TOKEN) {
+			// Cloud generation via Replicate
+			const res = await fetch('https://api.replicate.com/v1/predictions', {
+				method: 'POST',
+				headers: {
+					'Content-Type': 'application/json',
+					Authorization: `Bearer ${REPLICATE_TOKEN}`,
+				},
+				body: JSON.stringify({
+					model: model || 'black-forest-labs/flux-schnell',
+					input: {
+						prompt,
+						negative_prompt: negativePrompt,
+						width: width || 1024,
+						height: height || 1024,
+						num_inference_steps: steps || 4,
+						guidance_scale: guidanceScale || 0,
+					},
+				}),
+			});
+			if (!res.ok) return c.json({ error: 'Replicate API failed' }, 502);
+
+			const prediction = await res.json();
+
+			// Poll for completion
+			let output = prediction.output;
+			if (!output && prediction.urls?.get) {
+				for (let i = 0; i < 60; i++) {
+					await new Promise((r) => setTimeout(r, 2000));
+					const pollRes = await fetch(prediction.urls.get, {
+						headers: { Authorization: `Bearer ${REPLICATE_TOKEN}` },
+					});
+					const pollData = await pollRes.json();
+					if (pollData.status === 'succeeded') {
+						output = pollData.output;
+						break;
+					}
+					if (pollData.status === 'failed') {
+						return c.json({ error: 'Generation failed' }, 500);
+					}
+				}
+			}
+
+			imageUrl = Array.isArray(output) ? output[0] : output;
+		} else {
+			return c.json({ error: 'No image generation service configured' }, 503);
+		}
+
+		await consumeCredits(userId, 'AI_IMAGE_GENERATION', cost, `Image: ${prompt.slice(0, 50)}`);
+
+		return c.json({ imageUrl, prompt, model: model || 'flux-schnell' });
+	} catch (_err) {
+		return c.json({ error: 'Generation failed' }, 500);
+	}
+});
+
+// ─── Image Upload (server-only: S3) ─────────────────────────
+
+app.post('/api/v1/upload', async (c) => {
+	const userId = c.get('userId');
+	const formData = await c.req.formData();
+	const file = formData.get('file') as File | null;
+
+	if (!file) return c.json({ error: 'No file' }, 400);
+	if (file.size > 10 * 1024 * 1024) return c.json({ error: 'Max 10MB' }, 400);
+
+	try {
+		const { createPictureStorage, generateUserFileKey, getContentType } =
+			await import('@manacore/shared-storage');
+		const storage = createPictureStorage();
+		const key = generateUserFileKey(userId, file.name);
+		const buffer = Buffer.from(await file.arrayBuffer());
+
+		const result = await storage.upload(key, buffer, {
+			contentType: getContentType(file.name),
+			public: true,
+		});
+
+		return c.json({ storagePath: key, publicUrl: result.url }, 201);
+	} catch (_err) {
+		return c.json({ error: 'Upload failed' }, 500);
+	}
+});
+
+export default { port: PORT, fetch: app.fetch };
diff --git a/apps/picture/apps/server/tsconfig.json b/apps/picture/apps/server/tsconfig.json
new file mode 100644
index 000000000..9c7e5fa56
--- /dev/null
+++ b/apps/picture/apps/server/tsconfig.json
@@ -0,0 +1,11 @@
+{
+	"compilerOptions": {
+		"target": "ESNext",
+		"module": "ESNext",
+		"moduleResolution": "bundler",
+		"strict": true,
+		"esModuleInterop": true,
+		"skipLibCheck": true
+	},
+	"include": ["src/**/*.ts"]
+}
diff --git a/apps/picture/apps/web/package.json b/apps/picture/apps/web/package.json
index 4d307cef1..f5db44498 100644
--- a/apps/picture/apps/web/package.json
+++ b/apps/picture/apps/web/package.json
@@ -22,8 +22,7 @@
 		"@manacore/shared-auth-ui": "workspace:*",
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
-		"@manacore/shared-feedback-ui": "workspace:*",
+		"@manacore/feedback": "workspace:*",
 		"@manacore/shared-i18n": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
diff --git a/apps/picture/apps/web/src/lib/api/feedback.ts b/apps/picture/apps/web/src/lib/api/feedback.ts
index a7359d865..d7322e61b 100644
--- a/apps/picture/apps/web/src/lib/api/feedback.ts
+++ b/apps/picture/apps/web/src/lib/api/feedback.ts
@@ -2,7 +2,7 @@
  * Feedback Service Instance for Picture Web App
  */
 
-import { createFeedbackService } from '@manacore/shared-feedback-service';
+import { createFeedbackService } from '@manacore/feedback';
 import { authStore } from '$lib/stores/auth.svelte';
 import { env } from '$env/dynamic/public';
 
diff --git a/apps/picture/apps/web/src/routes/app/feedback/+page.svelte b/apps/picture/apps/web/src/routes/app/feedback/+page.svelte
index 60aa15a3c..ed2e476d1 100644
--- a/apps/picture/apps/web/src/routes/app/feedback/+page.svelte
+++ b/apps/picture/apps/web/src/routes/app/feedback/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { FeedbackPage } from '@manacore/shared-feedback-ui';
+	import { FeedbackPage } from '@manacore/feedback';
 	import { feedbackService } from '$lib/api/feedback';
 	import { authStore } from '$lib/stores/auth.svelte';
 </script>
diff --git a/apps/planta/apps/web/package.json b/apps/planta/apps/web/package.json
index aad05434a..bc684d12c 100644
--- a/apps/planta/apps/web/package.json
+++ b/apps/planta/apps/web/package.json
@@ -36,8 +36,7 @@
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
 		"@manacore/shared-i18n": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
-		"@manacore/shared-feedback-ui": "workspace:*",
+		"@manacore/feedback": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
 		"@manacore/shared-icons": "workspace:*",
diff --git a/apps/planta/apps/web/src/routes/(app)/feedback/+page.svelte b/apps/planta/apps/web/src/routes/(app)/feedback/+page.svelte
index fcac75ac3..1c8e42fa6 100644
--- a/apps/planta/apps/web/src/routes/(app)/feedback/+page.svelte
+++ b/apps/planta/apps/web/src/routes/(app)/feedback/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { browser } from '$app/environment';
-	import { FeedbackPage } from '@manacore/shared-feedback-ui';
-	import { createFeedbackService } from '@manacore/shared-feedback-service';
+	import { FeedbackPage } from '@manacore/feedback';
+	import { createFeedbackService } from '@manacore/feedback';
 	import { authStore } from '$lib/stores/auth.svelte';
 	import '$lib/i18n';
 
diff --git a/apps/presi/apps/web/package.json b/apps/presi/apps/web/package.json
index d87a20d25..577e946e7 100644
--- a/apps/presi/apps/web/package.json
+++ b/apps/presi/apps/web/package.json
@@ -36,8 +36,7 @@
 		"@manacore/shared-auth-ui": "workspace:*",
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
-		"@manacore/shared-feedback-ui": "workspace:*",
+		"@manacore/feedback": "workspace:*",
 		"@manacore/shared-i18n": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
diff --git a/apps/presi/apps/web/src/lib/api/feedback.ts b/apps/presi/apps/web/src/lib/api/feedback.ts
index ed4e35d69..ed3a1a223 100644
--- a/apps/presi/apps/web/src/lib/api/feedback.ts
+++ b/apps/presi/apps/web/src/lib/api/feedback.ts
@@ -2,7 +2,7 @@
  * Feedback Service Instance for Presi Web App
  */
 
-import { createFeedbackService } from '@manacore/shared-feedback-service';
+import { createFeedbackService } from '@manacore/feedback';
 import { auth } from '$lib/stores/auth.svelte';
 import { PUBLIC_MANA_CORE_AUTH_URL } from '$env/static/public';
 
diff --git a/apps/presi/apps/web/src/routes/(app)/feedback/+page.svelte b/apps/presi/apps/web/src/routes/(app)/feedback/+page.svelte
index 33a35694a..ede288b5d 100644
--- a/apps/presi/apps/web/src/routes/(app)/feedback/+page.svelte
+++ b/apps/presi/apps/web/src/routes/(app)/feedback/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { FeedbackPage } from '@manacore/shared-feedback-ui';
+	import { FeedbackPage } from '@manacore/feedback';
 	import { feedbackService } from '$lib/api/feedback';
 	import { auth } from '$lib/stores/auth.svelte';
 </script>
diff --git a/apps/questions/apps/web/package.json b/apps/questions/apps/web/package.json
index 3c9bf7b67..fb14da4bb 100644
--- a/apps/questions/apps/web/package.json
+++ b/apps/questions/apps/web/package.json
@@ -41,8 +41,7 @@
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
 		"@manacore/shared-i18n": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
-		"@manacore/shared-feedback-ui": "workspace:*",
+		"@manacore/feedback": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
 		"@manacore/shared-icons": "workspace:*",
diff --git a/apps/questions/apps/web/src/routes/(app)/feedback/+page.svelte b/apps/questions/apps/web/src/routes/(app)/feedback/+page.svelte
index 06b549efc..3983315d4 100644
--- a/apps/questions/apps/web/src/routes/(app)/feedback/+page.svelte
+++ b/apps/questions/apps/web/src/routes/(app)/feedback/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { browser } from '$app/environment';
-	import { FeedbackPage } from '@manacore/shared-feedback-ui';
-	import { createFeedbackService } from '@manacore/shared-feedback-service';
+	import { FeedbackPage } from '@manacore/feedback';
+	import { createFeedbackService } from '@manacore/feedback';
 	import { authStore } from '$lib/stores/auth.svelte';
 	import '$lib/i18n';
 
diff --git a/apps/storage/apps/web/package.json b/apps/storage/apps/web/package.json
index 747bd1440..f429c47a8 100644
--- a/apps/storage/apps/web/package.json
+++ b/apps/storage/apps/web/package.json
@@ -43,8 +43,7 @@
 		"@manacore/shared-auth-ui": "workspace:*",
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
-		"@manacore/shared-feedback-ui": "workspace:*",
+		"@manacore/feedback": "workspace:*",
 		"@manacore/shared-i18n": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
diff --git a/apps/todo/apps/web/package.json b/apps/todo/apps/web/package.json
index db13a7da2..d818a9c82 100644
--- a/apps/todo/apps/web/package.json
+++ b/apps/todo/apps/web/package.json
@@ -46,8 +46,7 @@
 		"@manacore/shared-auth-ui": "workspace:*",
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
-		"@manacore/shared-feedback-ui": "workspace:*",
+		"@manacore/feedback": "workspace:*",
 		"@manacore/shared-i18n": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
diff --git a/apps/todo/apps/web/src/lib/services/feedback.ts b/apps/todo/apps/web/src/lib/services/feedback.ts
index 54551cc3b..a3d0d8c1e 100644
--- a/apps/todo/apps/web/src/lib/services/feedback.ts
+++ b/apps/todo/apps/web/src/lib/services/feedback.ts
@@ -3,7 +3,7 @@
  */
 
 import { browser } from '$app/environment';
-import { createFeedbackService } from '@manacore/shared-feedback-service';
+import { createFeedbackService } from '@manacore/feedback';
 import { authStore } from '$lib/stores/auth.svelte';
 
 // Get auth URL dynamically at runtime
diff --git a/apps/todo/apps/web/src/routes/(app)/feedback/+page.svelte b/apps/todo/apps/web/src/routes/(app)/feedback/+page.svelte
index 13e82de6e..9086296f3 100644
--- a/apps/todo/apps/web/src/routes/(app)/feedback/+page.svelte
+++ b/apps/todo/apps/web/src/routes/(app)/feedback/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { FeedbackPage } from '@manacore/shared-feedback-ui';
+	import { FeedbackPage } from '@manacore/feedback';
 	import { feedbackService } from '$lib/services/feedback';
 	import { authStore } from '$lib/stores/auth.svelte';
 </script>
diff --git a/apps/zitare/apps/web/package.json b/apps/zitare/apps/web/package.json
index 81ac41dfd..ee8c913bc 100644
--- a/apps/zitare/apps/web/package.json
+++ b/apps/zitare/apps/web/package.json
@@ -38,8 +38,7 @@
 		"@manacore/shared-auth-ui": "workspace:*",
 		"@manacore/shared-branding": "workspace:*",
 		"@manacore/shared-error-tracking": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*",
-		"@manacore/shared-feedback-ui": "workspace:*",
+		"@manacore/feedback": "workspace:*",
 		"@manacore/shared-i18n": "workspace:*",
 		"@manacore/shared-help-types": "workspace:*",
 		"@manacore/shared-help-ui": "workspace:*",
diff --git a/apps/zitare/apps/web/src/routes/(app)/feedback/+page.svelte b/apps/zitare/apps/web/src/routes/(app)/feedback/+page.svelte
index 7714a43b7..b012b68e0 100644
--- a/apps/zitare/apps/web/src/routes/(app)/feedback/+page.svelte
+++ b/apps/zitare/apps/web/src/routes/(app)/feedback/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { _ } from 'svelte-i18n';
-	import { FeedbackPage } from '@manacore/shared-feedback-ui';
-	import { createFeedbackService } from '@manacore/shared-feedback-service';
+	import { FeedbackPage } from '@manacore/feedback';
+	import { createFeedbackService } from '@manacore/feedback';
 	import { authStore } from '$lib/stores/auth.svelte';
 
 	const feedbackService = createFeedbackService({
diff --git a/packages/feedback/package.json b/packages/feedback/package.json
new file mode 100644
index 000000000..a256160a2
--- /dev/null
+++ b/packages/feedback/package.json
@@ -0,0 +1,28 @@
+{
+	"name": "@manacore/feedback",
+	"version": "1.0.0",
+	"private": true,
+	"description": "Unified feedback package — types, service, and UI components",
+	"type": "module",
+	"svelte": "./src/index.ts",
+	"main": "./src/index.ts",
+	"types": "./src/index.ts",
+	"exports": {
+		".": {
+			"svelte": "./src/index.ts",
+			"types": "./src/index.ts",
+			"default": "./src/index.ts"
+		}
+	},
+	"scripts": {
+		"type-check": "svelte-check --tsconfig ./tsconfig.json"
+	},
+	"devDependencies": {
+		"svelte": "^5.0.0",
+		"svelte-check": "^4.0.0",
+		"typescript": "^5.9.3"
+	},
+	"peerDependencies": {
+		"svelte": "^5.0.0"
+	}
+}
diff --git a/packages/shared-feedback-ui/src/FeedbackCard.svelte b/packages/feedback/src/FeedbackCard.svelte
similarity index 98%
rename from packages/shared-feedback-ui/src/FeedbackCard.svelte
rename to packages/feedback/src/FeedbackCard.svelte
index a31f48496..1fae6faf6 100644
--- a/packages/shared-feedback-ui/src/FeedbackCard.svelte
+++ b/packages/feedback/src/FeedbackCard.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { Feedback } from '@manacore/shared-feedback-types';
+	import type { Feedback } from './feedback';
 	import StatusBadge from './StatusBadge.svelte';
 	import VoteButton from './VoteButton.svelte';
 
diff --git a/packages/shared-feedback-ui/src/FeedbackForm.svelte b/packages/feedback/src/FeedbackForm.svelte
similarity index 98%
rename from packages/shared-feedback-ui/src/FeedbackForm.svelte
rename to packages/feedback/src/FeedbackForm.svelte
index c701b4f88..3896316ea 100644
--- a/packages/shared-feedback-ui/src/FeedbackForm.svelte
+++ b/packages/feedback/src/FeedbackForm.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { CreateFeedbackInput } from '@manacore/shared-feedback-types';
+	import type { CreateFeedbackInput } from './feedback';
 
 	interface Props {
 		onSubmit: (input: CreateFeedbackInput) => Promise<void>;
diff --git a/packages/shared-feedback-ui/src/FeedbackList.svelte b/packages/feedback/src/FeedbackList.svelte
similarity index 94%
rename from packages/shared-feedback-ui/src/FeedbackList.svelte
rename to packages/feedback/src/FeedbackList.svelte
index 7b2a06c67..15d1fa93c 100644
--- a/packages/shared-feedback-ui/src/FeedbackList.svelte
+++ b/packages/feedback/src/FeedbackList.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { Feedback } from '@manacore/shared-feedback-types';
+	import type { Feedback } from './feedback';
 	import FeedbackCard from './FeedbackCard.svelte';
 
 	interface Props {
diff --git a/packages/shared-feedback-ui/src/FeedbackPage.svelte b/packages/feedback/src/FeedbackPage.svelte
similarity index 99%
rename from packages/shared-feedback-ui/src/FeedbackPage.svelte
rename to packages/feedback/src/FeedbackPage.svelte
index e9729b562..097c17ae2 100644
--- a/packages/shared-feedback-ui/src/FeedbackPage.svelte
+++ b/packages/feedback/src/FeedbackPage.svelte
@@ -3,7 +3,7 @@
 		FeedbackService,
 		Feedback,
 		CreateFeedbackInput,
-	} from '@manacore/shared-feedback-service';
+	} from './createFeedbackService';
 	import FeedbackForm from './FeedbackForm.svelte';
 	import FeedbackList from './FeedbackList.svelte';
 
diff --git a/packages/shared-feedback-ui/src/StatusBadge.svelte b/packages/feedback/src/StatusBadge.svelte
similarity index 79%
rename from packages/shared-feedback-ui/src/StatusBadge.svelte
rename to packages/feedback/src/StatusBadge.svelte
index b437c991d..6d95c6f46 100644
--- a/packages/shared-feedback-ui/src/StatusBadge.svelte
+++ b/packages/feedback/src/StatusBadge.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import type { FeedbackStatus } from '@manacore/shared-feedback-types';
-	import { FEEDBACK_STATUS_CONFIG } from '@manacore/shared-feedback-types';
+	import type { FeedbackStatus } from './feedback';
+	import { FEEDBACK_STATUS_CONFIG } from './feedback';
 
 	interface Props {
 		status: FeedbackStatus;
diff --git a/packages/shared-feedback-ui/src/VoteButton.svelte b/packages/feedback/src/VoteButton.svelte
similarity index 100%
rename from packages/shared-feedback-ui/src/VoteButton.svelte
rename to packages/feedback/src/VoteButton.svelte
diff --git a/packages/shared-feedback-types/src/api.ts b/packages/feedback/src/api.ts
similarity index 100%
rename from packages/shared-feedback-types/src/api.ts
rename to packages/feedback/src/api.ts
diff --git a/packages/shared-feedback-service/src/createFeedbackService.ts b/packages/feedback/src/createFeedbackService.ts
similarity index 96%
rename from packages/shared-feedback-service/src/createFeedbackService.ts
rename to packages/feedback/src/createFeedbackService.ts
index e5e629709..0f62b85fd 100644
--- a/packages/shared-feedback-service/src/createFeedbackService.ts
+++ b/packages/feedback/src/createFeedbackService.ts
@@ -6,7 +6,7 @@
  *
  * @example
  * ```ts
- * import { createFeedbackService } from '@manacore/shared-feedback-service';
+ * import { createFeedbackService } from '@manacore/feedback';
  * import { authStore } from '$lib/stores/auth.svelte';
  *
  * export const feedbackService = createFeedbackService({
@@ -23,7 +23,7 @@ import type {
 	FeedbackResponse,
 	FeedbackListResponse,
 	VoteResponse,
-} from '@manacore/shared-feedback-types';
+} from './feedback';
 import type { FeedbackServiceConfig } from './types';
 
 /**
diff --git a/packages/shared-feedback-types/src/feedback.ts b/packages/feedback/src/feedback.ts
similarity index 100%
rename from packages/shared-feedback-types/src/feedback.ts
rename to packages/feedback/src/feedback.ts
diff --git a/packages/feedback/src/index.ts b/packages/feedback/src/index.ts
new file mode 100644
index 000000000..7d24871fb
--- /dev/null
+++ b/packages/feedback/src/index.ts
@@ -0,0 +1,36 @@
+/**
+ * @manacore/feedback — Unified feedback package
+ *
+ * Consolidates shared-feedback-types + shared-feedback-service + shared-feedback-ui
+ * into a single package.
+ */
+
+// Types
+export {
+	type FeedbackCategory,
+	type FeedbackStatus,
+	type Feedback,
+	type FeedbackVote,
+	FEEDBACK_CATEGORY_LABELS,
+	FEEDBACK_STATUS_CONFIG,
+} from './feedback';
+
+export {
+	type CreateFeedbackInput,
+	type FeedbackQueryParams,
+	type FeedbackResponse,
+	type FeedbackListResponse,
+	type VoteResponse,
+} from './api';
+
+// Service
+export { createFeedbackService, type FeedbackService } from './createFeedbackService';
+export type { FeedbackServiceConfig } from './types';
+
+// UI Components
+export { default as FeedbackPage } from './FeedbackPage.svelte';
+export { default as FeedbackForm } from './FeedbackForm.svelte';
+export { default as FeedbackList } from './FeedbackList.svelte';
+export { default as FeedbackCard } from './FeedbackCard.svelte';
+export { default as VoteButton } from './VoteButton.svelte';
+export { default as StatusBadge } from './StatusBadge.svelte';
diff --git a/packages/feedback/tsconfig.json b/packages/feedback/tsconfig.json
new file mode 100644
index 000000000..fd4653f71
--- /dev/null
+++ b/packages/feedback/tsconfig.json
@@ -0,0 +1,13 @@
+{
+	"compilerOptions": {
+		"target": "ES2022",
+		"module": "ES2022",
+		"moduleResolution": "bundler",
+		"strict": true,
+		"esModuleInterop": true,
+		"skipLibCheck": true,
+		"outDir": "dist",
+		"declaration": true
+	},
+	"include": ["src/**/*.ts", "src/**/*.svelte"]
+}
diff --git a/packages/shared-feedback-service/package.json b/packages/shared-feedback-service/package.json
deleted file mode 100644
index 45ccb7fdd..000000000
--- a/packages/shared-feedback-service/package.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"name": "@manacore/shared-feedback-service",
-	"version": "1.0.0",
-	"private": true,
-	"type": "module",
-	"exports": {
-		".": {
-			"types": "./src/index.ts",
-			"default": "./src/index.ts"
-		}
-	},
-	"main": "./src/index.ts",
-	"types": "./src/index.ts",
-	"files": [
-		"src"
-	],
-	"scripts": {
-		"type-check": "tsc --noEmit",
-		"lint": "eslint ."
-	},
-	"dependencies": {
-		"@manacore/shared-feedback-types": "workspace:*"
-	},
-	"devDependencies": {
-		"typescript": "^5.7.3"
-	}
-}
diff --git a/packages/shared-feedback-service/src/index.ts b/packages/shared-feedback-service/src/index.ts
deleted file mode 100644
index b5ccc9b75..000000000
--- a/packages/shared-feedback-service/src/index.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Shared feedback service for Manacore monorepo
- *
- * This package provides a factory function to create feedback service
- * instances that can be used across all web and mobile apps.
- */
-
-export { createFeedbackService, type FeedbackService } from './createFeedbackService';
-export type { FeedbackServiceConfig } from './types';
-
-// Re-export types from shared-feedback-types for convenience
-export type {
-	Feedback,
-	FeedbackCategory,
-	FeedbackStatus,
-	FeedbackVote,
-	CreateFeedbackInput,
-	FeedbackQueryParams,
-	FeedbackResponse,
-	FeedbackListResponse,
-	VoteResponse,
-	FEEDBACK_CATEGORY_LABELS,
-	FEEDBACK_STATUS_CONFIG,
-} from '@manacore/shared-feedback-types';
diff --git a/packages/shared-feedback-service/src/types.ts b/packages/shared-feedback-service/src/types.ts
deleted file mode 100644
index 0dfaaf478..000000000
--- a/packages/shared-feedback-service/src/types.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Configuration for creating a feedback service instance
- */
-export interface FeedbackServiceConfig {
-	/** Base API URL for the feedback endpoints */
-	apiUrl: string;
-	/** App identifier for multi-app support */
-	appId: string;
-	/** Function to get the current auth token */
-	getAuthToken: () => Promise<string | null>;
-	/** Optional custom endpoint prefix (default: '/api/v1/feedback') */
-	feedbackEndpoint?: string;
-}
diff --git a/packages/shared-feedback-service/tsconfig.json b/packages/shared-feedback-service/tsconfig.json
deleted file mode 100644
index c423209ae..000000000
--- a/packages/shared-feedback-service/tsconfig.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"compilerOptions": {
-		"target": "ES2022",
-		"module": "ESNext",
-		"moduleResolution": "bundler",
-		"lib": ["ES2022", "DOM"],
-		"strict": true,
-		"esModuleInterop": true,
-		"skipLibCheck": true,
-		"forceConsistentCasingInFileNames": true,
-		"isolatedModules": true,
-		"verbatimModuleSyntax": true,
-		"noEmit": true
-	},
-	"include": ["src/**/*"],
-	"exclude": ["node_modules"]
-}
diff --git a/packages/shared-feedback-types/package.json b/packages/shared-feedback-types/package.json
deleted file mode 100644
index cfdda8538..000000000
--- a/packages/shared-feedback-types/package.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"name": "@manacore/shared-feedback-types",
-	"version": "1.0.0",
-	"private": true,
-	"type": "module",
-	"main": "./src/index.ts",
-	"types": "./src/index.ts",
-	"exports": {
-		".": "./src/index.ts",
-		"./feedback": "./src/feedback.ts",
-		"./api": "./src/api.ts"
-	},
-	"scripts": {
-		"type-check": "tsc --noEmit",
-		"lint": "eslint ."
-	},
-	"devDependencies": {
-		"typescript": "^5.7.3"
-	}
-}
diff --git a/packages/shared-feedback-types/src/index.ts b/packages/shared-feedback-types/src/index.ts
deleted file mode 100644
index 5b065b1e4..000000000
--- a/packages/shared-feedback-types/src/index.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Shared feedback types for Manacore monorepo
- *
- * This package contains TypeScript types for feedback submissions,
- * voting, and API contracts.
- */
-
-// Feedback types
-export {
-	type FeedbackCategory,
-	type FeedbackStatus,
-	type Feedback,
-	type FeedbackVote,
-	FEEDBACK_CATEGORY_LABELS,
-	FEEDBACK_STATUS_CONFIG,
-} from './feedback';
-
-// API types
-export {
-	type CreateFeedbackInput,
-	type FeedbackQueryParams,
-	type FeedbackResponse,
-	type FeedbackListResponse,
-	type VoteResponse,
-} from './api';
diff --git a/packages/shared-feedback-types/tsconfig.json b/packages/shared-feedback-types/tsconfig.json
deleted file mode 100644
index c828b6630..000000000
--- a/packages/shared-feedback-types/tsconfig.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"compilerOptions": {
-		"target": "ES2022",
-		"module": "ESNext",
-		"moduleResolution": "bundler",
-		"lib": ["ES2022"],
-		"strict": true,
-		"esModuleInterop": true,
-		"skipLibCheck": true,
-		"forceConsistentCasingInFileNames": true,
-		"isolatedModules": true,
-		"verbatimModuleSyntax": true,
-		"noEmit": true
-	},
-	"include": ["src/**/*"],
-	"exclude": ["node_modules"]
-}
diff --git a/packages/shared-feedback-ui/package.json b/packages/shared-feedback-ui/package.json
deleted file mode 100644
index 41909185a..000000000
--- a/packages/shared-feedback-ui/package.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-	"name": "@manacore/shared-feedback-ui",
-	"version": "1.0.0",
-	"private": true,
-	"type": "module",
-	"svelte": "./src/index.ts",
-	"main": "./src/index.ts",
-	"types": "./src/index.ts",
-	"exports": {
-		".": {
-			"svelte": "./src/index.ts",
-			"types": "./src/index.ts",
-			"default": "./src/index.ts"
-		},
-		"./FeedbackPage.svelte": {
-			"svelte": "./src/FeedbackPage.svelte",
-			"default": "./src/FeedbackPage.svelte"
-		},
-		"./FeedbackForm.svelte": {
-			"svelte": "./src/FeedbackForm.svelte",
-			"default": "./src/FeedbackForm.svelte"
-		},
-		"./FeedbackList.svelte": {
-			"svelte": "./src/FeedbackList.svelte",
-			"default": "./src/FeedbackList.svelte"
-		},
-		"./FeedbackCard.svelte": {
-			"svelte": "./src/FeedbackCard.svelte",
-			"default": "./src/FeedbackCard.svelte"
-		},
-		"./VoteButton.svelte": {
-			"svelte": "./src/VoteButton.svelte",
-			"default": "./src/VoteButton.svelte"
-		},
-		"./StatusBadge.svelte": {
-			"svelte": "./src/StatusBadge.svelte",
-			"default": "./src/StatusBadge.svelte"
-		}
-	},
-	"scripts": {
-		"check": "svelte-check --tsconfig ./tsconfig.json",
-		"lint": "eslint ."
-	},
-	"dependencies": {
-		"@manacore/shared-feedback-types": "workspace:*",
-		"@manacore/shared-feedback-service": "workspace:*"
-	},
-	"devDependencies": {
-		"svelte": "^5.0.0",
-		"svelte-check": "^4.0.0",
-		"typescript": "^5.7.3"
-	},
-	"peerDependencies": {
-		"svelte": "^5.0.0"
-	}
-}
diff --git a/packages/shared-feedback-ui/src/index.ts b/packages/shared-feedback-ui/src/index.ts
deleted file mode 100644
index 5dc05bc95..000000000
--- a/packages/shared-feedback-ui/src/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Shared feedback UI components for Manacore monorepo
- *
- * This package provides Svelte 5 components for feedback functionality
- * that can be used across all web apps.
- */
-
-// Page components
-export { default as FeedbackPage } from './FeedbackPage.svelte';
-
-// Form components
-export { default as FeedbackForm } from './FeedbackForm.svelte';
-
-// List components
-export { default as FeedbackList } from './FeedbackList.svelte';
-export { default as FeedbackCard } from './FeedbackCard.svelte';
-
-// Utility components
-export { default as VoteButton } from './VoteButton.svelte';
-export { default as StatusBadge } from './StatusBadge.svelte';
diff --git a/packages/shared-feedback-ui/tsconfig.json b/packages/shared-feedback-ui/tsconfig.json
deleted file mode 100644
index 1b9470b61..000000000
--- a/packages/shared-feedback-ui/tsconfig.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"compilerOptions": {
-		"target": "ES2022",
-		"module": "ESNext",
-		"moduleResolution": "bundler",
-		"lib": ["ES2022", "DOM", "DOM.Iterable"],
-		"strict": true,
-		"esModuleInterop": true,
-		"skipLibCheck": true,
-		"forceConsistentCasingInFileNames": true,
-		"verbatimModuleSyntax": true,
-		"noEmit": true
-	},
-	"include": ["src/**/*"],
-	"exclude": ["node_modules"]
-}