@twsxtd/hapi-openclaw 0.1.7 → 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);
@@ -338,8 +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}`);
+      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,
@@ -349,6 +388,8 @@ class RealOpenClawAdapter {
         config,
         agentId,
         prompt: action.text,
+        provider: modelRef.provider,
+        model: modelRef.model,
         timeoutMs: this.runtime.agent.resolveAgentTimeoutMs({ cfg: config }),
         runId: randomUUID(),
         trigger: "user"

package/package.json

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