adp-openclaw 0.0.68 → 0.0.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adp-openclaw",
-  "version": "0.0.68",
+  "version": "0.0.70",
   "description": "ADP-OpenClaw demo channel plugin (Go WebSocket backend)",
   "type": "module",
   "dependencies": {

package/src/channel.ts

@@ -3,10 +3,10 @@
 
 import {
   type ChannelPlugin,
-  type ClawdbotConfig,
-  DEFAULT_ACCOUNT_ID,
+  type OpenClawConfig,
 } from "openclaw/plugin-sdk";
-import { adpOpenclawOnboardingAdapter } from "./onboarding.js";
+import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/core";
+import { adpOpenclawSetupWizard } from "./onboarding.js";
 import { getActiveWebSocket } from "./runtime.js";
 
 // Default WebSocket URL for ADP OpenClaw
@@ -61,7 +61,7 @@ function resolveAdpOpenclawCredentials(channelCfg?: AdpOpenclawChannelConfig): {
   return { wsUrl, clientToken, signKey };
 }
 
-function resolveAccount(cfg: ClawdbotConfig, accountId?: string): ResolvedAdpOpenclawAccount {
+function resolveAccount(cfg: OpenClawConfig, accountId?: string): ResolvedAdpOpenclawAccount {
   const channelCfg = cfg.channels?.["adp-openclaw"] as AdpOpenclawChannelConfig | undefined;
   const enabled = channelCfg?.enabled !== false;
   const creds = resolveAdpOpenclawCredentials(channelCfg);
@@ -87,7 +87,7 @@ export const adpOpenclawPlugin: ChannelPlugin<ResolvedAdpOpenclawAccount> = {
     blurb: "ADP channel backed by a Go WebSocket server.",
     order: 999,
   },
-  onboarding: adpOpenclawOnboardingAdapter,
+  setupWizard: adpOpenclawSetupWizard,
   capabilities: {
     chatTypes: ["direct"],
     polls: false,
@@ -128,7 +128,7 @@ export const adpOpenclawPlugin: ChannelPlugin<ResolvedAdpOpenclawAccount> = {
       },
     }),
     deleteAccount: ({ cfg }) => {
-      const next = { ...cfg } as ClawdbotConfig;
+      const next = { ...cfg } as OpenClawConfig;
       const nextChannels = { ...cfg.channels };
       delete (nextChannels as Record<string, unknown>)["adp-openclaw"];
       if (Object.keys(nextChannels).length > 0) {

package/src/monitor.ts

@@ -1,7 +1,7 @@
 // Monitor: WebSocket connection to Go server for real-time message handling
 // Supports: API Token auth, conversation tracking for multi-turn dialogues
 
-import type { PluginLogger, ClawdbotConfig } from "openclaw/plugin-sdk";
+import type { PluginLogger, OpenClawConfig } from "openclaw/plugin-sdk";
 import { getAdpOpenclawRuntime, setActiveWebSocket } from "./runtime.js";
 import {
   getChatHistory,
@@ -40,7 +40,7 @@ export type MonitorParams = {
   signKey?: string; // HMAC key for signature generation
   abortSignal?: AbortSignal;
   log?: PluginLogger;
-  cfg?: ClawdbotConfig; // OpenClaw config for model settings
+  cfg?: OpenClawConfig; // OpenClaw config for model settings
   setStatus?: (next: Record<string, unknown>) => void; // SDK health-monitor status reporter
 };
 
@@ -127,7 +127,7 @@ function generateRequestId(): string {
 async function markSessionAborted(params: {
   sessionKey: string;
   runtime: ReturnType<typeof getAdpOpenclawRuntime>;
-  cfg?: ClawdbotConfig;
+  cfg?: OpenClawConfig;
   log?: PluginLogger;
 }): Promise<void> {
   const { sessionKey, runtime, cfg, log } = params;
@@ -206,7 +206,7 @@ type ConnectParams = {
   abortSignal?: AbortSignal;
   log?: PluginLogger;
   runtime: ReturnType<typeof getAdpOpenclawRuntime>;
-  cfg?: ClawdbotConfig;
+  cfg?: OpenClawConfig;
   setStatus?: (next: Record<string, unknown>) => void;
 };
 

package/src/onboarding.ts

@@ -1,10 +1,9 @@
-// Onboarding adapter for ADP OpenClaw channel plugin
+// Setup wizard adapter for ADP OpenClaw channel plugin
+// Migrated from ChannelOnboardingAdapter to ChannelSetupWizard for openclaw >= 2026.3.22
 import type {
-  ChannelOnboardingAdapter,
+  ChannelSetupWizard,
   OpenClawConfig,
-  WizardPrompter,
 } from "openclaw/plugin-sdk";
-import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk";
 
 const channel = "adp-openclaw" as const;
 
@@ -42,81 +41,89 @@ function updateAdpOpenclawConfig(
   };
 }
 
-async function noteAdpOpenclawSetup(prompter: WizardPrompter): Promise<void> {
-  await prompter.note(
-    [
-      "ADP OpenClaw connects to a WebSocket server for real-time messaging.",
-      "You need a clientToken to authenticate with the server.",
-      "The signKey is used for HMAC signature generation (default: ADPOpenClaw).",
-    ].join("\n"),
-    "ADP OpenClaw setup",
-  );
-}
-
-export const adpOpenclawOnboardingAdapter: ChannelOnboardingAdapter = {
+export const adpOpenclawSetupWizard: ChannelSetupWizard = {
   channel,
-  getStatus: async ({ cfg }) => {
-    const channelCfg = getChannelConfig(cfg);
-    const configured = isConfigured(channelCfg);
 
-    return {
-      channel,
-      configured,
-      statusLines: [`ADP OpenClaw: ${configured ? "configured" : "needs clientToken"}`],
-      selectionHint: configured ? "configured" : "requires clientToken",
-      quickstartScore: configured ? 1 : 10,
-    };
+  status: {
+    configuredLabel: "configured",
+    unconfiguredLabel: "needs clientToken",
+    configuredHint: "configured",
+    unconfiguredHint: "requires clientToken",
+    configuredScore: 1,
+    unconfiguredScore: 10,
+    resolveConfigured: ({ cfg }) => {
+      const channelCfg = getChannelConfig(cfg);
+      return isConfigured(channelCfg);
+    },
+    resolveStatusLines: ({ cfg, configured }) => {
+      return [`ADP OpenClaw: ${configured ? "configured" : "needs clientToken"}`];
+    },
   },
-  configure: async ({ cfg, prompter }) => {
-    let next = cfg;
-    const accountId = DEFAULT_ACCOUNT_ID;
-
-    await noteAdpOpenclawSetup(prompter);
 
-    const channelCfg = getChannelConfig(next);
-    const existingClientToken = channelCfg?.clientToken?.trim();
-    const existingSignKey = channelCfg?.signKey?.trim();
-
-    // Check for env vars
-    const envClientToken = process.env.ADP_OPENCLAW_CLIENT_TOKEN?.trim();
-    const envSignKey = process.env.ADP_OPENCLAW_SIGN_KEY?.trim();
+  introNote: {
+    title: "ADP OpenClaw setup",
+    lines: [
+      "ADP OpenClaw connects to a WebSocket server for real-time messaging.",
+      "You need a clientToken to authenticate with the server.",
+      "The signKey is used for HMAC signature generation (default: ADPOpenClaw).",
+    ],
+  },
 
-    if (envClientToken) {
-      const useEnv = await prompter.confirm({
-        message: "ADP_OPENCLAW_CLIENT_TOKEN detected in env. Use environment variables?",
-        initialValue: true,
-      });
-      if (useEnv) {
-        next = updateAdpOpenclawConfig(next, { enabled: true });
-        return { cfg: next, accountId };
-      }
-    }
+  envShortcut: {
+    prompt: "ADP_OPENCLAW_CLIENT_TOKEN detected in env. Use environment variables?",
+    preferredEnvVar: "ADP_OPENCLAW_CLIENT_TOKEN",
+    isAvailable: () => Boolean(process.env.ADP_OPENCLAW_CLIENT_TOKEN?.trim()),
+    apply: ({ cfg }) => updateAdpOpenclawConfig(cfg, { enabled: true }),
+  },
 
-    // Prompt for clientToken (required)
-    const clientTokenInput = await prompter.text({
-      message: "Client Token",
-      placeholder: "your-client-token",
-      initialValue: existingClientToken || undefined,
-      validate: (value) => (String(value ?? "").trim() ? undefined : "Required"),
-    });
-    const clientToken = String(clientTokenInput).trim();
+  credentials: [
+    {
+      inputKey: "token",
+      providerHint: "ADP OpenClaw",
+      credentialLabel: "Client Token",
+      preferredEnvVar: "ADP_OPENCLAW_CLIENT_TOKEN",
+      envPrompt: "ADP_OPENCLAW_CLIENT_TOKEN detected. Use it?",
+      keepPrompt: "Client Token already set. Keep it?",
+      inputPrompt: "Client Token",
+      inspect: ({ cfg }) => {
+        const channelCfg = getChannelConfig(cfg);
+        const configuredValue = channelCfg?.clientToken?.trim();
+        const envValue = process.env.ADP_OPENCLAW_CLIENT_TOKEN?.trim();
+        return {
+          accountConfigured: Boolean(configuredValue || envValue),
+          hasConfiguredValue: Boolean(configuredValue),
+          resolvedValue: configuredValue || envValue,
+          envValue,
+        };
+      },
+      applySet: ({ cfg, resolvedValue }) => {
+        return updateAdpOpenclawConfig(cfg, { clientToken: resolvedValue, enabled: true });
+      },
+      applyUseEnv: ({ cfg }) => {
+        return updateAdpOpenclawConfig(cfg, { enabled: true });
+      },
+    },
+  ],
 
-    // Prompt for signKey (optional, has default)
-    const signKeyInput = await prompter.text({
+  textInputs: [
+    {
+      inputKey: "name",
       message: "Sign Key (press Enter for default: ADPOpenClaw)",
       placeholder: "ADPOpenClaw",
-      initialValue: existingSignKey || envSignKey || undefined,
-    });
-    const signKey = String(signKeyInput ?? "").trim() || undefined;
-
-    next = updateAdpOpenclawConfig(next, {
-      clientToken,
-      ...(signKey ? { signKey } : {}),
-      enabled: true,
-    });
+      required: false,
+      currentValue: ({ cfg }) => {
+        const channelCfg = getChannelConfig(cfg);
+        return channelCfg?.signKey?.trim() || process.env.ADP_OPENCLAW_SIGN_KEY?.trim();
+      },
+      applySet: ({ cfg, value }) => {
+        return updateAdpOpenclawConfig(cfg, {
+          ...(value ? { signKey: value } : {}),
+          enabled: true,
+        });
+      },
+    },
+  ],
 
-    return { cfg: next, accountId };
-  },
   disable: (cfg) => {
     return {
       ...cfg,

package/src/session-history.ts

@@ -498,9 +498,10 @@ export async function getMergedChatHistory(
   options?: {
     limit?: number;
     log?: PluginLogger;
+    filterAfterNewSession?: boolean;  // Default true: filter out messages before last /new
   },
 ): Promise<ChatHistoryResponse> {
-  const { limit = 200, log } = options ?? {};
+  const { limit = 200, log, filterAfterNewSession = true } = options ?? {};
   
   // Build both old and new session key formats
   const oldSessionKey = `agent:main:direct:${conversationId}`;
@@ -511,6 +512,7 @@ export async function getMergedChatHistory(
   log?.info?.(`[session-history] New sessionKey: ${newSessionKey}`);
   
   // Fetch history from both session keys in parallel
+  // Note: getChatHistory already applies filterAfterNewSession for each session individually
   const [oldResult, newResult] = await Promise.all([
     getChatHistory(oldSessionKey, { limit, log }).catch((err) => {
       log?.debug?.(`[session-history] Failed to fetch old session history: ${err}`);
@@ -537,7 +539,7 @@ export async function getMergedChatHistory(
   
   // Deduplicate by message id (if available) or content+timestamp
   const seen = new Set<string>();
-  const dedupedMessages = allMessages.filter((msg) => {
+  let dedupedMessages = allMessages.filter((msg) => {
     // Create a unique key for deduplication
     const key = msg.id || `${msg.role}:${msg.timestamp}:${msg.content.slice(0, 100)}`;
     if (seen.has(key)) {
@@ -547,6 +549,13 @@ export async function getMergedChatHistory(
     return true;
   });
   
+  // Filter out messages before the last /new session on the MERGED result
+  // This is important because the /new might be in the old sessionKey but we still
+  // want to filter the combined history based on the latest /new across both sessions
+  if (filterAfterNewSession) {
+    dedupedMessages = filterMessagesAfterLastNewSession(dedupedMessages, log);
+  }
+  
   // Apply limit (return last N messages if exceeds limit)
   const limitedMessages = dedupedMessages.length > limit
     ? dedupedMessages.slice(-limit)