@twsxtd/hapi-openclaw 0.1.6 → 0.1.8

package/dist/index.js

@@ -251,6 +251,8 @@ function stripReplyToCurrentPrefix(text) {
 // src/openclawAdapter.ts
 var CONVERSATION_TITLE = "OpenClaw";
 var RUN_COMPLETION_SETTLE_MS = 50;
+var DEFAULT_PROVIDER = "openai";
+var DEFAULT_MODEL = "gpt-5.4";
 
 class ConversationBusyError extends Error {
   constructor() {
@@ -275,6 +277,42 @@ function getStateNamespace(sessionKey, fallbackNamespace) {
 function delay(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
+function readPrimaryModelRef(value) {
+  if (typeof value === "string" && value.trim().length > 0) {
+    return value.trim();
+  }
+  if (typeof value === "object" && value !== null && !Array.isArray(value)) {
+    const primary = value.primary;
+    return typeof primary === "string" && primary.trim().length > 0 ? primary.trim() : null;
+  }
+  return null;
+}
+function resolvePreferredModelRef(config, agentId) {
+  const agents = typeof config.agents === "object" && config.agents !== null ? config.agents : null;
+  const list = Array.isArray(agents?.list) ? agents.list : [];
+  const matchedAgent = list.find((entry) => {
+    return typeof entry === "object" && entry !== null && entry.id === agentId;
+  });
+  const defaults = typeof agents?.defaults === "object" && agents.defaults !== null ? agents.defaults : null;
+  const rawRef = readPrimaryModelRef(matchedAgent?.model) ?? readPrimaryModelRef(defaults?.model);
+  if (!rawRef) {
+    return {
+      provider: DEFAULT_PROVIDER,
+      model: DEFAULT_MODEL
+    };
+  }
+  const separatorIndex = rawRef.indexOf("/");
+  if (separatorIndex <= 0 || separatorIndex === rawRef.length - 1) {
+    return {
+      provider: DEFAULT_PROVIDER,
+      model: rawRef
+    };
+  }
+  return {
+    provider: rawRef.slice(0, separatorIndex).trim() || DEFAULT_PROVIDER,
+    model: rawRef.slice(separatorIndex + 1).trim() || DEFAULT_MODEL
+  };
+}
 async function ensureSessionBinding(runtime, sessionKey, agentId) {
   const storePath = runtime.agent.session.resolveStorePath(undefined, { agentId });
   const store = runtime.agent.session.loadSessionStore(storePath);
@@ -302,11 +340,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 +362,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,
@@ -335,7 +376,9 @@ class RealOpenClawAdapter {
         dir: this.runtime.agent.resolveAgentWorkspaceDir(config, agentId)
       })).dir;
       const agentDir = this.runtime.agent.resolveAgentDir(config, agentId);
+      const modelRef = resolvePreferredModelRef(config, agentId);
       const { sessionId, sessionFile } = await ensureSessionBinding(this.runtime, action.conversationId, agentId);
+      this.logger.info(`[${namespace}] hapi-openclaw runEmbeddedPiAgent sessionId=${sessionId} agentId=${agentId} ` + `provider=${modelRef.provider} model=${modelRef.model}`);
       const result = await this.runtime.agent.runEmbeddedPiAgent({
         sessionId,
         sessionKey: action.conversationId,
@@ -345,12 +388,15 @@ class RealOpenClawAdapter {
         config,
         agentId,
         prompt: action.text,
+        provider: modelRef.provider,
+        model: modelRef.model,
         timeoutMs: this.runtime.agent.resolveAgentTimeoutMs({ cfg: config }),
         runId: randomUUID(),
         trigger: "user"
       });
       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,
@@ -361,6 +407,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);
       }
@@ -374,6 +421,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,
@@ -2205,6 +2253,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",
@@ -2215,8 +2264,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);
@@ -2311,7 +2362,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,
@@ -2319,7 +2370,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.6",
+    "version": "0.1.8",
     "description": "Native OpenClaw plugin that bridges HAPI to the OpenClaw Gateway route surface.",
     "license": "AGPL-3.0-only",
     "type": "module",