@twsxtd/hapi-openclaw 0.1.5 → 0.1.7

package/dist/index.js

@@ -302,11 +302,13 @@ class RealOpenClawAdapter {
   namespace;
   runtime;
   callbackClient;
+  logger;
   supportsApprovals = false;
-  constructor(namespace, runtime, callbackClient) {
+  constructor(namespace, runtime, callbackClient, logger) {
     this.namespace = namespace;
     this.runtime = runtime;
     this.callbackClient = callbackClient;
+    this.logger = logger;
   }
   async ensureDefaultConversation(externalUserKey) {
     return {
@@ -322,6 +324,7 @@ class RealOpenClawAdapter {
       throw new ConversationBusyError;
     }
     const namespace = getStateNamespace(action.conversationId, this.namespace);
+    this.logger.info(`[${namespace}] hapi-openclaw send-message start conversation=${action.conversationId}`);
     await this.callbackClient.postEvent(createStateEvent({
       namespace,
       conversationId: action.conversationId,
@@ -331,14 +334,19 @@ class RealOpenClawAdapter {
     try {
       const config = this.runtime.config.loadConfig();
       const agentId = parseHapiSessionKey(action.conversationId)?.agentId ?? getDefaultAgentId();
-      const workspaceDir = this.runtime.agent.resolveAgentWorkspaceDir(config, agentId);
-      await this.runtime.agent.ensureAgentWorkspace({ dir: workspaceDir });
+      const workspaceDir = (await this.runtime.agent.ensureAgentWorkspace({
+        dir: this.runtime.agent.resolveAgentWorkspaceDir(config, agentId)
+      })).dir;
+      const agentDir = this.runtime.agent.resolveAgentDir(config, agentId);
       const { sessionId, sessionFile } = await ensureSessionBinding(this.runtime, action.conversationId, agentId);
-      const result = await this.runtime.agent.runEmbeddedAgent({
+      this.logger.info(`[${namespace}] hapi-openclaw runEmbeddedPiAgent sessionId=${sessionId} agentId=${agentId}`);
+      const result = await this.runtime.agent.runEmbeddedPiAgent({
         sessionId,
         sessionKey: action.conversationId,
         sessionFile,
         workspaceDir,
+        agentDir,
+        config,
         agentId,
         prompt: action.text,
         timeoutMs: this.runtime.agent.resolveAgentTimeoutMs({ cfg: config }),
@@ -347,6 +355,7 @@ class RealOpenClawAdapter {
       });
       const runError = result.meta.error?.message?.trim() || null;
       if (runError) {
+        this.logger.warn(`[${namespace}] hapi-openclaw run failed conversation=${action.conversationId}: ${runError}`);
         if (adapterState.finishRun(action.conversationId)) {
           await this.callbackClient.postEvent(createStateEvent({
             namespace,
@@ -357,6 +366,7 @@ class RealOpenClawAdapter {
         }
         return;
       }
+      this.logger.info(`[${namespace}] hapi-openclaw run completed conversation=${action.conversationId}` + (result.meta.finalAssistantVisibleText ? ` finalText=${JSON.stringify(result.meta.finalAssistantVisibleText)}` : ""));
       if (result.meta.finalAssistantVisibleText) {
         await delay(RUN_COMPLETION_SETTLE_MS);
       }
@@ -370,6 +380,7 @@ class RealOpenClawAdapter {
       }
     } catch (error2) {
       const message = error2 instanceof Error ? error2.message : "OpenClaw embedded run failed";
+      this.logger.error(`[${namespace}] hapi-openclaw send-message error conversation=${action.conversationId}: ${message}`);
       if (adapterState.finishRun(action.conversationId)) {
         await this.callbackClient.postEvent(createStateEvent({
           namespace,
@@ -2201,6 +2212,7 @@ function createPluginApp(deps) {
       retryAfterMs: null
     };
     deps.idempotencyCache.set(idempotencyKey, ack);
+    deps.logger.info(`[${deps.namespace}] hapi-openclaw accepted send-message conversation=${body.conversationId} localMessageId=${body.localMessageId}`);
     queueMicrotask(() => {
       deps.runtime.sendMessage({
         kind: "send-message",
@@ -2211,8 +2223,10 @@ function createPluginApp(deps) {
         await dispatchMaybeEvents(deps.callbackClient, events);
       }).catch((error2) => {
         if (error2 instanceof ConversationBusyError) {
+          deps.logger.warn(`[${deps.namespace}] hapi-openclaw conversation busy conversation=${body.conversationId}`);
           return;
         }
+        deps.logger.error(`[${deps.namespace}] hapi-openclaw send-message task failed conversation=${body.conversationId}: ` + (error2 instanceof Error ? error2.message : String(error2)));
       });
     });
     return c.json(ack);
@@ -2307,7 +2321,7 @@ function resolveRegisteredPluginConfig(api) {
 function registerPluginRoutes(api) {
   const config = resolveRegisteredPluginConfig(api);
   const callbackClient = new HapiCallbackClient(config.hapiBaseUrl, config.sharedSecret);
-  const runtime = new RealOpenClawAdapter(config.namespace, api.runtime, callbackClient);
+  const runtime = new RealOpenClawAdapter(config.namespace, api.runtime, callbackClient, api.logger);
   const app = createPluginApp({
     sharedSecret: config.sharedSecret,
     namespace: config.namespace,
@@ -2315,7 +2329,8 @@ function registerPluginRoutes(api) {
     runtime,
     idempotencyCache: new Map,
     prototypeCaptureSessionKey: config.prototypeCaptureSessionKey,
-    prototypeCaptureFileName: config.prototypeCaptureFileName
+    prototypeCaptureFileName: config.prototypeCaptureFileName,
+    logger: api.logger
   });
   api.registerHttpRoute({
     path: "/hapi",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@twsxtd/hapi-openclaw",
-    "version": "0.1.5",
+    "version": "0.1.7",
     "description": "Native OpenClaw plugin that bridges HAPI to the OpenClaw Gateway route surface.",
     "license": "AGPL-3.0-only",
     "type": "module",