feat(chat): add direct Live badge and harden Live monitor backend (#138)
* feat(chat): add direct live badge to session rows * fix(live): use session DB for conversations monitor * docs: add chat vs live monitor direction plan * fix(search): avoid numeric session search 500 without FTS table
This commit is contained in:
@@ -159,6 +159,38 @@ function containsCjk(text: string): boolean {
|
||||
return false
|
||||
}
|
||||
|
||||
function isNumericQuery(text: string): boolean {
|
||||
return /^\d+(?:\s+\d+)*$/.test(text.trim())
|
||||
}
|
||||
|
||||
function runLikeContentSearch(
|
||||
db: { prepare: (sql: string) => { all: (...params: any[]) => Record<string, unknown>[] } },
|
||||
source: string | undefined,
|
||||
query: string,
|
||||
): Record<string, unknown>[] {
|
||||
const likeBase = buildBaseSessionSql(source)
|
||||
const likeSql = `
|
||||
WITH base AS (
|
||||
${likeBase.sql}
|
||||
)
|
||||
SELECT
|
||||
base.*,
|
||||
m.id AS matched_message_id,
|
||||
substr(
|
||||
m.content,
|
||||
max(1, instr(m.content, ?) - 40),
|
||||
120
|
||||
) AS snippet,
|
||||
0 AS rank
|
||||
FROM base
|
||||
JOIN messages m ON m.session_id = base.id
|
||||
WHERE m.content LIKE ?
|
||||
ORDER BY base.last_active DESC, m.timestamp DESC
|
||||
`
|
||||
const likeStatement = db.prepare(likeSql)
|
||||
return likeStatement.all(...likeBase.params, query, `%${query}%`) as Record<string, unknown>[]
|
||||
}
|
||||
|
||||
function sanitizeFtsQuery(query: string): string {
|
||||
const quotedParts: string[] = []
|
||||
|
||||
@@ -246,6 +278,7 @@ export async function searchSessionSummaries(
|
||||
const db = new DatabaseSync(sessionDbPath(), { open: true, readOnly: true })
|
||||
const normalized = sanitizeFtsQuery(trimmed)
|
||||
const prefixQuery = toPrefixQuery(normalized)
|
||||
let titleRows: Record<string, unknown>[] = []
|
||||
|
||||
try {
|
||||
const titleBase = buildBaseSessionSql(source)
|
||||
@@ -270,7 +303,7 @@ export async function searchSessionSummaries(
|
||||
`
|
||||
|
||||
const titleStatement = db.prepare(titleSql)
|
||||
const titleRows = titleStatement.all(...titleBase.params, `%${trimmed.toLowerCase()}%`, limit) as Record<string, unknown>[]
|
||||
titleRows = titleStatement.all(...titleBase.params, `%${trimmed.toLowerCase()}%`, limit) as Record<string, unknown>[]
|
||||
|
||||
const contentSql = `
|
||||
WITH base AS (
|
||||
@@ -312,28 +345,9 @@ export async function searchSessionSummaries(
|
||||
})
|
||||
return items.slice(0, limit)
|
||||
} catch (err) {
|
||||
const message = err instanceof Error ? err.message : String(err)
|
||||
if (containsCjk(normalized)) {
|
||||
const likeBase = buildBaseSessionSql(source)
|
||||
const likeSql = `
|
||||
WITH base AS (
|
||||
${likeBase.sql}
|
||||
)
|
||||
SELECT
|
||||
base.*,
|
||||
m.id AS matched_message_id,
|
||||
substr(
|
||||
m.content,
|
||||
max(1, instr(m.content, ?) - 40),
|
||||
120
|
||||
) AS snippet,
|
||||
0 AS rank
|
||||
FROM base
|
||||
JOIN messages m ON m.session_id = base.id
|
||||
WHERE m.content LIKE ?
|
||||
ORDER BY base.last_active DESC, m.timestamp DESC
|
||||
`
|
||||
const likeStatement = db.prepare(likeSql)
|
||||
const likeRows = likeStatement.all(...likeBase.params, trimmed, `%${trimmed}%`) as Record<string, unknown>[]
|
||||
const likeRows = runLikeContentSearch(db, source, trimmed)
|
||||
const merged = new Map<string, HermesSessionSearchRow>()
|
||||
for (const row of likeRows) {
|
||||
const mapped = mapSearchRow(row)
|
||||
@@ -344,7 +358,22 @@ export async function searchSessionSummaries(
|
||||
return [...merged.values()].slice(0, limit)
|
||||
}
|
||||
|
||||
const message = err instanceof Error ? err.message : String(err)
|
||||
if (message.includes('no such table: messages_fts') && isNumericQuery(trimmed)) {
|
||||
const likeRows = runLikeContentSearch(db, source, trimmed)
|
||||
const merged = new Map<string, HermesSessionSearchRow>()
|
||||
for (const row of titleRows) {
|
||||
const mapped = mapSearchRow(row)
|
||||
merged.set(mapped.id, mapped)
|
||||
}
|
||||
for (const row of likeRows) {
|
||||
const mapped = mapSearchRow(row)
|
||||
if (!merged.has(mapped.id)) {
|
||||
merged.set(mapped.id, mapped)
|
||||
}
|
||||
}
|
||||
return [...merged.values()].slice(0, limit)
|
||||
}
|
||||
|
||||
throw new Error(`Failed to search sessions: ${message}`)
|
||||
} finally {
|
||||
db.close()
|
||||
|
||||
Reference in New Issue
Block a user