@martian-engineering/lossless-claw 0.6.3 → 0.8.0

package/src/tools/lcm-expand-tool.ts

@@ -122,7 +122,8 @@ function buildOrchestrationObservability(input: {
  */
 export function createLcmExpandTool(input: {
   deps: LcmDependencies;
-  lcm: LcmContextEngine;
+  lcm?: LcmContextEngine;
+  getLcm?: () => Promise<LcmContextEngine>;
   /** Runtime session key (used for delegated expansion auth scoping). */
   sessionId?: string;
   sessionKey?: string;
@@ -136,10 +137,14 @@ export function createLcmExpandTool(input: {
       "Use this to drill into previously-compacted context when you need detail " +
       "that was summarised away. Provide either summaryIds (direct expansion) or " +
       "query (grep-first, then expand top matches). Returns a compact text payload " +
-      "with cited IDs for follow-up.",
+      "plus cited IDs in tool output for follow-up.",
     parameters: LcmExpandSchema,
     async execute(_toolCallId, params) {
-      const retrieval = input.lcm.getRetrieval();
+      const lcm = input.lcm ?? (await input.getLcm?.());
+      if (!lcm) {
+        throw new Error("LCM engine is unavailable.");
+      }
+      const retrieval = lcm.getRetrieval();
       const orchestrator = new ExpansionOrchestrator(retrieval);
       const runtimeAuthManager = getRuntimeExpansionAuthManager();
 
@@ -178,7 +183,7 @@ export function createLcmExpandTool(input: {
       }
 
       const conversationScope = await resolveLcmConversationScope({
-        lcm: input.lcm,
+        lcm,
         deps: input.deps,
         sessionId: input.sessionId,
         sessionKey: input.sessionKey,

package/src/tools/lcm-grep-tool.ts

@@ -25,7 +25,7 @@ function formatDisplayTime(
 const LcmGrepSchema = Type.Object({
   pattern: Type.String({
     description:
-      "Search pattern. Interpreted as regex when mode is 'regex', or as a text query for 'full_text' mode.",
+      'Search pattern. Interpreted as regex when mode is "regex", or as an FTS5 text query when mode is "full_text". In full_text mode, FTS5 defaults to AND matching, so prefer 1-3 distinctive terms or one quoted multi-word phrase instead of padding with synonyms or extra keywords.',
   }),
   mode: Type.Optional(
     Type.String({
@@ -70,6 +70,13 @@ const LcmGrepSchema = Type.Object({
       maximum: 200,
     }),
   ),
+  sort: Type.Optional(
+    Type.String({
+      description:
+        'Sort order: "recency" (newest first, default), "relevance" (best FTS5 match first, full_text mode only), or "hybrid" (full_text mode only; balances relevance with recency). Applied before limit is enforced.',
+      enum: ["recency", "relevance", "hybrid"],
+    }),
+  ),
 });
 
 function truncateSnippet(content: string, maxLen: number = 200): string {
@@ -82,7 +89,8 @@ function truncateSnippet(content: string, maxLen: number = 200): string {
 
 export function createLcmGrepTool(input: {
   deps: LcmDependencies;
-  lcm: LcmContextEngine;
+  lcm?: LcmContextEngine;
+  getLcm?: () => Promise<LcmContextEngine>;
   sessionId?: string;
   sessionKey?: string;
 }): AnyAgentTool {
@@ -93,18 +101,24 @@ export function createLcmGrepTool(input: {
       "Search compacted conversation history using regex or full-text search. " +
       "Searches across messages and/or summaries stored by LCM. " +
       "Use this to find specific content that may have been compacted away from " +
-      "active context. Returns matching snippets with their summary/message IDs " +
+      "active context. In full_text mode, queries use FTS5 AND semantics by default, so keep them short and focused; quoted phrases stay intact and optional sort modes can prioritize relevance for older topics. Returns matching snippets with their summary/message IDs " +
       "for follow-up with lcm_expand or lcm_describe.",
     parameters: LcmGrepSchema,
     async execute(_toolCallId, params) {
-      const retrieval = input.lcm.getRetrieval();
-      const timezone = input.lcm.timezone;
+      const lcm = input.lcm ?? (await input.getLcm?.());
+      if (!lcm) {
+        throw new Error("LCM engine is unavailable.");
+      }
+      const retrieval = lcm.getRetrieval();
+      const timezone = lcm.timezone;
 
       const p = params as Record<string, unknown>;
       const pattern = (p.pattern as string).trim();
       const mode = (p.mode as "regex" | "full_text") ?? "regex";
       const scope = (p.scope as "messages" | "summaries" | "both") ?? "both";
       const limit = typeof p.limit === "number" ? Math.trunc(p.limit) : 50;
+      const requestedSort = (p.sort as "recency" | "relevance" | "hybrid") ?? "recency";
+      const effectiveSort = mode === "full_text" ? requestedSort : "recency";
       let since: Date | undefined;
       let before: Date | undefined;
       try {
@@ -121,7 +135,7 @@ export function createLcmGrepTool(input: {
         });
       }
       const conversationScope = await resolveLcmConversationScope({
-        lcm: input.lcm,
+        lcm,
         deps: input.deps,
         sessionId: input.sessionId,
         sessionKey: input.sessionKey,
@@ -133,7 +147,6 @@ export function createLcmGrepTool(input: {
             "No LCM conversation found for this session. Provide conversationId or set allConversations=true.",
         });
       }
-
       const result = await retrieval.grep({
         query: pattern,
         mode,
@@ -142,12 +155,13 @@ export function createLcmGrepTool(input: {
         limit,
         since,
         before,
+        sort: effectiveSort,
       });
 
       const lines: string[] = [];
       lines.push("## LCM Grep Results");
       lines.push(`**Pattern:** \`${pattern}\``);
-      lines.push(`**Mode:** ${mode} | **Scope:** ${scope}`);
+      lines.push(`**Mode:** ${mode} | **Scope:** ${scope} | **Sort:** ${effectiveSort}`);
       if (conversationScope.allConversations) {
         lines.push("**Conversation scope:** all conversations");
       } else if (conversationScope.conversationId != null) {

package/src/types.ts

@@ -39,6 +39,7 @@ export type CompleteFn = (params: {
   authProfileId?: string;
   agentDir?: string;
   runtimeConfig?: unknown;
+  skipModelAuth?: boolean;
   messages: Array<{ role: string; content: unknown }>;
   system?: string;
   maxTokens: number;