openclaw-server 0.1.0 → 0.2.0

package/src/routes/chat-completions.ts

@@ -1,18 +1,25 @@
-import type { Express } from "express";
+import type { Express } from "express";
 import { requireBearerAuth } from "../auth.js";
+import {
+  inspectBookmarkDigestMessage,
+  respondToBookmarkDigestMessage,
+} from "../bookmark-digest/chat-integration.js";
+import {
+  inspectBookmarkSearchMessage,
+  respondToBookmarkSearchMessage,
+} from "../bookmark-search/chat-integration.js";
 import { normalizeRequest } from "../core/normalizer.js";
 import { streamTextCompletion, streamToolCallCompletion } from "../core/stream-renderer.js";
 import {
+  logBookmarkDigestInspection,
+  logBookmarkSearchInspection,
   logRequestDebug,
   logResponseSelection,
-  logTaskInspection,
-  logWeatherInspection,
 } from "../debug-log.js";
 import { buildCompletionResponse, createChatCompletionId } from "../openai.js";
+import { resolveRequestUserId } from "../request-user.js";
 import type { AppContext } from "../server.js";
-import { buildTaskEngineResult, inspectTaskMessage } from "../tasks/chat-integration.js";
 import { ChatCompletionsRequestSchema } from "../types.js";
-import { inspectWeatherMessage, respondToWeatherMessage } from "../weather/chat-integration.js";
 import { validateToolChoice } from "./request-validation.js";
 
 export function registerChatCompletionsRoute(app: Express, context: AppContext): void {
@@ -52,6 +59,7 @@ export function registerChatCompletionsRoute(app: Express, context: AppContext):
       request: parsed.data,
       defaultModelId: context.config.defaultModelId,
     });
+    const resolvedUserId = resolveRequestUserId(parsed.data) ?? turn.sessionId;
     logRequestDebug({
       enabled: context.config.debugLoggingEnabled,
       route: "/v1/chat/completions",
@@ -78,63 +86,51 @@ export function registerChatCompletionsRoute(app: Express, context: AppContext):
     }
 
     const completionId = createChatCompletionId();
-    const now = typeof req.body?.now === "string" ? req.body.now : undefined;
-    const taskMatch = inspectTaskMessage({
-      taskService: context.taskService,
+    const digestInspection = inspectBookmarkDigestMessage({
+      bookmarkDigestService: context.bookmarkDigestService,
       turn,
-      explicitUser: parsed.data.user,
-      now,
     });
-    logTaskInspection({
+    logBookmarkDigestInspection({
       enabled: context.config.debugLoggingEnabled,
       route: "/v1/chat/completions",
-      userId: taskMatch.userId,
+      userId: resolvedUserId,
       text: turn.userText,
-      inspection: taskMatch.inspection,
+      inspection: digestInspection,
       previewChars: context.config.debugPreviewChars,
     });
-
-    const taskResult = taskMatch.inspection.shouldHandle
-      ? buildTaskEngineResult({
+    const digestResult = digestInspection.shouldHandle
+      ? respondToBookmarkDigestMessage({
+          bookmarkDigestService: context.bookmarkDigestService,
           turn,
-          taskResult: context.taskService.processMessage({
-            userId: taskMatch.userId,
-            text: turn.userText,
-            now,
-          }),
+          userId: resolvedUserId,
         })
       : undefined;
-    const weatherMatch = !taskResult
-      ? inspectWeatherMessage({
-          weatherService: context.weatherService,
+    const searchMatch = inspectBookmarkSearchMessage({
+      bookmarkSearchService: context.bookmarkSearchService,
+      turn,
+      explicitUser: resolvedUserId,
+    });
+    logBookmarkSearchInspection({
+      enabled: context.config.debugLoggingEnabled,
+      route: "/v1/chat/completions",
+      userId: searchMatch.userId,
+      text: turn.userText,
+      inspection: searchMatch.inspection,
+      previewChars: context.config.debugPreviewChars,
+    });
+
+    const searchResult = !digestResult && searchMatch.inspection.shouldHandle
+      ? await respondToBookmarkSearchMessage({
+          bookmarkSearchService: context.bookmarkSearchService,
           turn,
-          explicitUser: parsed.data.user,
+          explicitUser: resolvedUserId,
         })
       : undefined;
-    if (weatherMatch) {
-      logWeatherInspection({
-        enabled: context.config.debugLoggingEnabled,
-        route: "/v1/chat/completions",
-        userId: weatherMatch.userId,
-        text: turn.userText,
-        inspection: weatherMatch.inspection,
-        previewChars: context.config.debugPreviewChars,
-      });
-    }
-
-    const weatherResult =
-      !taskResult && weatherMatch?.inspection.shouldHandle
-        ? await respondToWeatherMessage({
-            weatherService: context.weatherService,
-            turn,
-            explicitUser: parsed.data.user,
-          })
-        : undefined;
-    const result = taskResult ?? weatherResult ?? context.replyEngine.respond(turn);
+    const result = digestResult ?? searchResult ?? context.replyEngine.respond(turn);
     logResponseSelection({
       enabled: context.config.debugLoggingEnabled,
       route: "/v1/chat/completions",
-      source: taskResult ? "task" : weatherResult ? "weather" : "reply",
+      source: digestResult ? "reply" : searchResult ? "search" : "reply",
       finishReason: result.finishReason,
       matchedIntentId: result.matchedIntentId,
       templateId: result.templateId,

package/src/routes/responses.ts

@@ -1,23 +1,30 @@
-import type { Express } from "express";
+import type { Express } from "express";
 import { requireBearerAuth } from "../auth.js";
+import {
+  inspectBookmarkDigestMessage,
+  respondToBookmarkDigestMessage,
+} from "../bookmark-digest/chat-integration.js";
+import {
+  inspectBookmarkSearchMessage,
+  respondToBookmarkSearchMessage,
+} from "../bookmark-search/chat-integration.js";
 import { normalizeRequest } from "../core/normalizer.js";
 import { responseRequestToChatRequest } from "../core/request-adapter.js";
 import { streamResponsesText, streamResponsesToolCall } from "../core/stream-renderer.js";
 import {
+  logBookmarkDigestInspection,
+  logBookmarkSearchInspection,
   logRequestDebug,
   logResponseSelection,
-  logTaskInspection,
-  logWeatherInspection,
 } from "../debug-log.js";
 import {
   buildResponsesResponse,
   createResponseId,
   createResponseOutputId,
 } from "../response-api.js";
+import { resolveRequestUserId } from "../request-user.js";
 import type { AppContext } from "../server.js";
-import { buildTaskEngineResult, inspectTaskMessage } from "../tasks/chat-integration.js";
 import { ResponsesRequestSchema } from "../types.js";
-import { inspectWeatherMessage, respondToWeatherMessage } from "../weather/chat-integration.js";
 import { validateToolChoice } from "./request-validation.js";
 
 export function registerResponsesRoute(app: Express, context: AppContext): void {
@@ -53,10 +60,12 @@ export function registerResponsesRoute(app: Express, context: AppContext): void
       return;
     }
 
+    const request = responseRequestToChatRequest(parsed.data);
     const turn = normalizeRequest({
-      request: responseRequestToChatRequest(parsed.data),
+      request,
       defaultModelId: context.config.defaultModelId,
     });
+    const resolvedUserId = resolveRequestUserId(request) ?? turn.sessionId;
     logRequestDebug({
       enabled: context.config.debugLoggingEnabled,
       route: "/v1/responses",
@@ -83,63 +92,51 @@ export function registerResponsesRoute(app: Express, context: AppContext): void
     }
 
     const responseId = createResponseId();
-    const now = typeof req.body?.now === "string" ? req.body.now : undefined;
-    const taskMatch = inspectTaskMessage({
-      taskService: context.taskService,
+    const digestInspection = inspectBookmarkDigestMessage({
+      bookmarkDigestService: context.bookmarkDigestService,
       turn,
-      explicitUser: parsed.data.user,
-      now,
     });
-    logTaskInspection({
+    logBookmarkDigestInspection({
       enabled: context.config.debugLoggingEnabled,
       route: "/v1/responses",
-      userId: taskMatch.userId,
+      userId: resolvedUserId,
       text: turn.userText,
-      inspection: taskMatch.inspection,
+      inspection: digestInspection,
       previewChars: context.config.debugPreviewChars,
     });
-
-    const taskResult = taskMatch.inspection.shouldHandle
-      ? buildTaskEngineResult({
+    const digestResult = digestInspection.shouldHandle
+      ? respondToBookmarkDigestMessage({
+          bookmarkDigestService: context.bookmarkDigestService,
           turn,
-          taskResult: context.taskService.processMessage({
-            userId: taskMatch.userId,
-            text: turn.userText,
-            now,
-          }),
+          userId: resolvedUserId,
         })
       : undefined;
-    const weatherMatch = !taskResult
-      ? inspectWeatherMessage({
-          weatherService: context.weatherService,
+    const searchMatch = inspectBookmarkSearchMessage({
+      bookmarkSearchService: context.bookmarkSearchService,
+      turn,
+      explicitUser: resolvedUserId,
+    });
+    logBookmarkSearchInspection({
+      enabled: context.config.debugLoggingEnabled,
+      route: "/v1/responses",
+      userId: searchMatch.userId,
+      text: turn.userText,
+      inspection: searchMatch.inspection,
+      previewChars: context.config.debugPreviewChars,
+    });
+
+    const searchResult = !digestResult && searchMatch.inspection.shouldHandle
+      ? await respondToBookmarkSearchMessage({
+          bookmarkSearchService: context.bookmarkSearchService,
           turn,
-          explicitUser: parsed.data.user,
+          explicitUser: resolvedUserId,
         })
       : undefined;
-    if (weatherMatch) {
-      logWeatherInspection({
-        enabled: context.config.debugLoggingEnabled,
-        route: "/v1/responses",
-        userId: weatherMatch.userId,
-        text: turn.userText,
-        inspection: weatherMatch.inspection,
-        previewChars: context.config.debugPreviewChars,
-      });
-    }
-
-    const weatherResult =
-      !taskResult && weatherMatch?.inspection.shouldHandle
-        ? await respondToWeatherMessage({
-            weatherService: context.weatherService,
-            turn,
-            explicitUser: parsed.data.user,
-          })
-        : undefined;
-    const result = taskResult ?? weatherResult ?? context.replyEngine.respond(turn);
+    const result = digestResult ?? searchResult ?? context.replyEngine.respond(turn);
     logResponseSelection({
       enabled: context.config.debugLoggingEnabled,
       route: "/v1/responses",
-      source: taskResult ? "task" : weatherResult ? "weather" : "reply",
+      source: digestResult ? "reply" : searchResult ? "search" : "reply",
       finishReason: result.finishReason,
       matchedIntentId: result.matchedIntentId,
       templateId: result.templateId,