amalfa 1.0.33 → 1.0.35

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "amalfa",
-	"version": "1.0.33",
+	"version": "1.0.35",
 	"description": "Local-first knowledge graph engine for AI agents. Transforms markdown into searchable memory with MCP protocol.",
 	"license": "MIT",
 	"homepage": "https://github.com/pjsvis/amalfa#readme",

package/src/cli/sonar-chat.ts

@@ -4,19 +4,39 @@ import { DaemonManager } from "../utils/DaemonManager";
 
 export async function chatLoop() {
 	const manager = new DaemonManager();
-	const status = await manager.checkSonarAgent();
+	let status = await manager.checkSonarAgent();
 
 	if (!status.running) {
-		console.log(
-			"❌ Sonar Agent is not running. Start it with: amalfa sonar start",
-		);
-		process.exit(1);
+		console.log("🚀 Sonar Agent not running. Starting it now...");
+		await manager.startSonarAgent();
+		// Wait for it to be ready
+		await new Promise((resolve) => setTimeout(resolve, 2000));
+		status = await manager.checkSonarAgent();
+		if (!status.running) {
+			console.log(
+				"❌ Failed to start Sonar Agent. Check logs: .amalfa/logs/sonar.log",
+			);
+			process.exit(1);
+		}
+		console.log("✅ Sonar Agent started.\n");
 	}
 
 	const BASE_URL = `http://localhost:${status.port}`;
 	let sessionId: string | undefined;
 
-	console.log(`💬 AMALFA Corpus Assistant (${status.activeModel || "Sonar"})`);
+	// Fetch health to get provider info
+	let providerInfo = "";
+	try {
+		const health = (await fetch(`${BASE_URL}/health`).then((r) =>
+			r.json(),
+		)) as { provider?: string; model?: string };
+		const providerLabel = health.provider === "cloud" ? "☁️  Cloud" : "💻 Local";
+		providerInfo = ` [${providerLabel}: ${health.model || "unknown"}]`;
+	} catch {
+		providerInfo = "";
+	}
+
+	console.log(`💬 AMALFA Corpus Assistant${providerInfo}`);
 	console.log("   Type 'exit' or 'quit' to leave.\n");
 
 	const rl = createInterface({

package/src/daemon/sonar-agent.ts

@@ -149,8 +149,18 @@ function startServer(port: number) {
 
 			// Health check
 			if (url.pathname === "/health") {
+				const cfg = await loadConfig();
+				const provider = cfg.sonar.cloud?.enabled ? "cloud" : "local";
+				const model = cfg.sonar.cloud?.enabled
+					? cfg.sonar.cloud.model
+					: inferenceState.ollamaModel || cfg.sonar.model;
 				return Response.json(
-					{ status: "ok", ollama: inferenceState.ollamaAvailable },
+					{
+						status: "ok",
+						ollama: inferenceState.ollamaAvailable,
+						provider,
+						model,
+					},
 					{ headers: corsHeaders },
 				);
 			}

package/src/daemon/sonar-logic.ts

@@ -197,14 +197,22 @@ export async function handleSearchAnalysis(
 				{
 					role: "system",
 					content:
-						'Analyze search queries and extract intent, entities and suggested filters. Return JSON: { "intent": "", "entities": [], "filters": {} }',
+						'Analyze the user query. Extract the search intent, key entities, and any implicit filters. You MUST return valid JSON. Example: { "intent": "informational", "entities": ["vector"], "filters": {} }. Do not include any text outside the JSON object.',
 				},
 				{ role: "user", content: query },
 			],
 			{ temperature: 0.1, format: "json" },
 		);
 
-		return JSON.parse(response.message.content);
+		const parsed = safeJsonParse(response.message.content);
+		if (!parsed) {
+			log.warn(
+				{ content: response.message.content },
+				"Failed to parse JSON response, using fallback",
+			);
+			return { intent: "search", entities: [query], filters: {} };
+		}
+		return parsed;
 	} catch (error) {
 		log.error({ error, query }, "Query analysis failed");
 		throw error;
@@ -250,7 +258,10 @@ export async function handleResultReranking(
 
 		const content = response.message.content;
 		try {
-			const rankings = JSON.parse(content);
+			const rankings = safeJsonParse(content);
+			if (!rankings || !Array.isArray(rankings))
+				throw new Error("Invalid JSON");
+
 			return results.map((result, idx) => {
 				const ranking = rankings.find(
 					(r: { index: number }) => r.index === idx + 1,
@@ -283,19 +294,25 @@ export async function handleContextExtraction(
 				{
 					role: "system",
 					content:
-						"Extract the most relevant 200-300 character snippet from the document for the given query.",
+						"You are a helpful assistant. Extract the exact text snippet from the document that answers the query. Return ONLY the snippet text. If the answer is not found, return the most relevant paragraph.",
 				},
 				{
 					role: "user",
-					content: `Query: ${query}\nDocument [${result.id}]:\n${result.content.slice(0, 4000)}`,
+					content: `Query: ${query}\n\nDocument Text:\n${result.content.slice(0, 4000)}`,
 				},
 			],
-			{ temperature: 0 },
+			{ temperature: 0.1 },
 		);
 
+		const snippet = response.message.content.trim();
+
+		// Fallback if model refuses to extract or returns empty
+		const finalSnippet =
+			snippet.length > 5 ? snippet : result.content.slice(0, 300).trim();
+
 		return {
 			id: result.id,
-			snippet: response.message.content.trim(),
+			snippet: finalSnippet,
 		};
 	} catch (error) {
 		log.error({ error, docId: result.id }, "Context extraction failed");
@@ -520,17 +537,11 @@ Return JSON: { "action": "SEARCH"|"READ"|"EXPLORE"|"FINISH", "query": "...", "no
 				nodeId?: string;
 				reasoning: string;
 				answer?: string;
-			};
-			try {
-				decision = JSON.parse(content);
-			} catch {
-				// Try to extract JSON from markdown blocks
-				const match = content.match(/\{[\s\S]*\}/);
-				if (match) {
-					decision = JSON.parse(match[0]);
-				} else {
-					throw new Error("Could not parse JSON from response");
-				}
+			} | null = null;
+
+			decision = safeJsonParse(content);
+			if (!decision) {
+				throw new Error("Could not parse JSON from response");
 			}
 			output += `> **Reasoning:** ${decision.reasoning}\n\n`;
 
@@ -635,13 +646,7 @@ Return JSON: { "answered": true|false, "missing_info": "...", "final_answer": ".
 			missing_info: string;
 			final_answer: string;
 		};
-		let audit: AuditResult | null = null;
-		try {
-			audit = JSON.parse(resultSnippet);
-		} catch {
-			const match = resultSnippet.match(/\{[\s\S]*\}/);
-			audit = match ? JSON.parse(match[0]) : null;
-		}
+		const audit = safeJsonParse(resultSnippet) as AuditResult | null;
 
 		if (audit) {
 			if (!audit.answered) {
@@ -660,3 +665,23 @@ Return JSON: { "answered": true|false, "missing_info": "...", "final_answer": ".
 
 	return output;
 }
+
+/**
+ * Helper to safely parse JSON from LLM responses, handling markdown blocks
+ */
+function safeJsonParse(content: string): any {
+	try {
+		return JSON.parse(content);
+	} catch {
+		// Try to extract JSON from markdown blocks
+		const match = content.match(/\{[\s\S]*\}/);
+		if (match) {
+			try {
+				return JSON.parse(match[0]);
+			} catch {
+				return null;
+			}
+		}
+		return null;
+	}
+}