pi-hermes-memory 0.7.15 → 0.7.18

package/src/store/session-search.ts

@@ -1,5 +1,5 @@
 import { DatabaseManager } from './db.js';
-import { isFts5QueryError, normalizeFts5Query } from './fts-query.js';
+import { buildFallbackFts5Query, hasExplicitFts5Operator, isFts5QueryError, normalizeFts5Query } from './fts-query.js';
 
 /**
  * Search result from session history.
@@ -27,6 +27,52 @@ export interface SessionSearchOptions {
   since?: string;
 }
 
+type SearchMatch =
+  | { type: 'fts'; query: string }
+  | { type: 'like'; terms: string[] };
+
+const QUERY_TOKEN_PATTERN = /"([^"]*)"|(\S+)/g;
+const NATURAL_LANGUAGE_CONNECTORS = new Set(['and', 'or', 'not', 'near']);
+
+function escapeLikePattern(text: string): string {
+  return text.replace(/[\\%_]/g, '\\$&');
+}
+
+function collectLikeTerms(query: string): string[] {
+  const terms: string[] = [];
+
+  for (const match of query.matchAll(QUERY_TOKEN_PATTERN)) {
+    const phrase = match[1];
+    const term = match[2];
+    if (phrase === undefined && term && NATURAL_LANGUAGE_CONNECTORS.has(term.toLowerCase())) {
+      continue;
+    }
+
+    const rawValue = phrase ?? term ?? '';
+    if (rawValue.length > 0) terms.push(rawValue);
+  }
+
+  return terms;
+}
+
+function mapRows(rows: Array<{
+  session_id: string;
+  project: string;
+  role: string;
+  content: string;
+  timestamp: string;
+  snippet: string;
+}>): SessionSearchResult[] {
+  return rows.map(row => ({
+    sessionId: row.session_id,
+    project: row.project,
+    role: row.role,
+    content: row.content,
+    timestamp: row.timestamp,
+    snippet: row.snippet,
+  }));
+}
+
 /**
  * Search across indexed session messages using FTS5.
  *
@@ -47,79 +93,104 @@ export function searchSessions(
   const db = dbManager.getDb();
   const { limit = 10, project, role, since } = options;
 
-  // Build the query dynamically based on filters
-  const conditions: string[] = [];
-  const params: unknown[] = [];
+  const executeSearch = (match: SearchMatch): SessionSearchResult[] => {
+    const conditions: string[] = [];
+    const params: unknown[] = [];
+
+    if (match.type === 'fts') {
+      // FTS5 match condition — use subquery for reliable rowid matching
+      conditions.push('m.rowid IN (SELECT rowid FROM message_fts WHERE message_fts MATCH ?)');
+      params.push(match.query);
+    } else {
+      if (match.terms.length === 0) {
+        return [];
+      }
+      const likeConditions = match.terms.map(() => `m.content LIKE ? ESCAPE '\\'`);
+      conditions.push(`(${likeConditions.join(' OR ')})`);
+      for (const term of match.terms) {
+        params.push(`%${escapeLikePattern(term)}%`);
+      }
+    }
+
+    // Project filter
+    if (project) {
+      conditions.push('s.project = ?');
+      params.push(project);
+    }
+
+    // Role filter
+    if (role) {
+      conditions.push('m.role = ?');
+      params.push(role);
+    }
+
+    // Date filter
+    if (since) {
+      conditions.push('m.timestamp >= ?');
+      params.push(since);
+    }
+
+    const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(' AND ')}` : '';
+
+    const sql = `
+      SELECT
+        m.session_id,
+        s.project,
+        m.role,
+        m.content,
+        m.timestamp,
+        m.content as snippet
+      FROM messages m
+      JOIN sessions s ON s.id = m.session_id
+      ${whereClause}
+      ORDER BY m.timestamp DESC
+      LIMIT ?
+    `;
+
+    try {
+      const rows = db.prepare(sql).all(...params, limit) as Array<{
+        session_id: string;
+        project: string;
+        role: string;
+        content: string;
+        timestamp: string;
+        snippet: string;
+      }>;
+
+      return mapRows(rows);
+    } catch (err) {
+      if (match.type === 'fts' && isFts5QueryError(err)) {
+        return [];
+      }
+      throw err;
+    }
+  };
 
-  // FTS5 match condition — use subquery for reliable rowid matching
   const normalizedQuery = normalizeFts5Query(query);
   if (normalizedQuery.length === 0) {
     return [];
   }
-  conditions.push('m.rowid IN (SELECT rowid FROM message_fts WHERE message_fts MATCH ?)');
-  params.push(normalizedQuery);
-
-  // Project filter
-  if (project) {
-    conditions.push('s.project = ?');
-    params.push(project);
-  }
 
-  // Role filter
-  if (role) {
-    conditions.push('m.role = ?');
-    params.push(role);
+  const exactResults = executeSearch({ type: 'fts', query: normalizedQuery });
+  if (exactResults.length > 0) {
+    return exactResults;
   }
 
-  // Date filter
-  if (since) {
-    conditions.push('m.timestamp >= ?');
-    params.push(since);
+  const explicitOperatorQuery = hasExplicitFts5Operator(query);
+  if (explicitOperatorQuery) {
+    return exactResults;
   }
 
-  const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(' AND ')}` : '';
-
-  const sql = `
-    SELECT
-      m.session_id,
-      s.project,
-      m.role,
-      m.content,
-      m.timestamp,
-      m.content as snippet
-    FROM messages m
-    JOIN sessions s ON s.id = m.session_id
-    ${whereClause}
-    ORDER BY m.timestamp DESC
-    LIMIT ?
-  `;
-  params.push(limit);
-
-  try {
-    const rows = db.prepare(sql).all(...params) as Array<{
-      session_id: string;
-      project: string;
-      role: string;
-      content: string;
-      timestamp: string;
-      snippet: string;
-    }>;
-
-    // Map snake_case column names to camelCase
-    return rows.map(row => ({
-      sessionId: row.session_id,
-      project: row.project,
-      role: row.role,
-      content: row.content,
-      timestamp: row.timestamp,
-      snippet: row.snippet,
-    }));
-  } catch (err) {
-    if (isFts5QueryError(err)) {
-      return [];
+  const fallbackQuery = buildFallbackFts5Query(query);
+  if (fallbackQuery && fallbackQuery !== normalizedQuery) {
+    const fallbackResults = executeSearch({ type: 'fts', query: fallbackQuery });
+    if (fallbackResults.length > 0) {
+      return fallbackResults;
     }
-    throw err;
   }
+
+  const likeTerms = collectLikeTerms(query);
+  return executeSearch({ type: 'like', terms: likeTerms });
 }
 
 /**

package/src/store/skill-store.ts

@@ -7,7 +7,6 @@
 
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
-import * as os from "node:os";
 import { scanContent } from "./content-scanner.js";
 import {
   buildSkillId,
@@ -21,6 +20,7 @@ import {
   tokenizeForSimilarity,
 } from "./skill-utils.js";
 import type { SkillDocument, SkillIndex, SkillResult, SkillScope } from "../types.js";
+import { AGENT_ROOT } from "../paths.js";
 
 interface SkillStoreOptions {
   globalSkillsDir?: string;
@@ -55,7 +55,7 @@ export class SkillStore {
   private migrationSentinelPath: string;
 
   constructor(options: SkillStoreOptions = {}) {
-    const agentRoot = path.join(os.homedir(), ".pi", "agent");
+    const agentRoot = AGENT_ROOT;
     this.globalSkillsDir = options.globalSkillsDir ?? path.join(agentRoot, "skills");
     this.projectSkillsDir = options.projectSkillsDir ?? null;
     this.projectName = options.projectName ?? null;

package/src/tools/session-search-tool.ts

@@ -1,5 +1,4 @@
 import * as path from 'node:path';
-import * as os from 'node:os';
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { StringEnum } from "@earendil-works/pi-ai";
@@ -8,6 +7,7 @@ import { searchSessions, getIndexedMessageCount } from '../store/session-search.
 import { searchSessionAnchors } from '../store/session-anchor-search.js';
 import type { SessionAnchorRange, SessionAnchorSearchResult } from '../store/session-anchor-search.js';
 import type { SessionSearchConfig } from '../types.js';
+import { AGENT_ROOT } from '../paths.js';
 
 interface SearchResult {
   success: boolean;
@@ -21,7 +21,7 @@ interface SessionSearchToolOptions {
   sessionsDir?: string;
 }
 
-const DEFAULT_SESSIONS_DIR = path.join(os.homedir(), '.pi', 'agent', 'sessions');
+const DEFAULT_SESSIONS_DIR = path.join(AGENT_ROOT, 'sessions');
 
 export function registerSessionSearchTool(
   pi: ExtensionAPI,

package/src/tools/skill-tool.ts

@@ -1,5 +1,5 @@
 /**
- * Skill tool — registers the LLM-callable `skill` tool for procedural memory.
+ * Skill manager tool — registers the LLM-callable `skill_manage` tool for procedural memory.
  * Complements the `memory` tool (declarative knowledge) with procedural knowledge.
  */
 
@@ -85,14 +85,16 @@ const SKILL_TOOL_PARAMETERS = Type.Object({
   })),
 }, { additionalProperties: false });
 
+export const SKILL_MANAGE_TOOL_NAME = "skill_manage";
+
 export function registerSkillTool(pi: ExtensionAPI, store: SkillStore): void {
   pi.registerTool({
-    name: "skill",
-    label: "Skill",
+    name: SKILL_MANAGE_TOOL_NAME,
+    label: "Skill Manager",
     description: SKILL_TOOL_DESCRIPTION,
-    promptSnippet: "Save or manage reusable procedures and patterns",
+    promptSnippet: "Create, inspect, and update reusable procedures and patterns",
     promptGuidelines: [
-      "Use the skill tool after completing complex tasks that required trial and error or multiple tool calls.",
+      "Use the skill_manage tool after completing complex tasks that required trial and error or multiple tool calls.",
       "Use 'create' to save a new reusable procedure, 'patch' to update a section of an existing skill by skill_id, and 'update' for a full rewrite.",
       "Scope is required on create: choose scope='global' for transferable procedures and scope='project' when the workflow depends on this repo's paths, scripts, conventions, or deploy steps.",
       "Prefer structured fields for create/update: when_to_use, procedure_steps, pitfalls, and verification_steps. The tool will render valid SKILL.md sections for you.",