@newbase-clawchat/openclaw-clawchat 2026.4.29 → 2026.5.4

package/src/tools.ts

@@ -1,19 +1,20 @@
 import fs from "node:fs";
 import path from "node:path";
 import type { OpenClawAgentToolResult } from "openclaw/plugin-sdk/agent-harness-runtime";
-import type { OpenClawPluginApi } from "openclaw/plugin-sdk/feishu";
+import type { OpenClawPluginApi } from "openclaw/plugin-sdk/core";
+import type { OpenclawClawchatMutateConfigFile } from "./login.runtime.ts";
 import { createOpenclawClawlingApiClient } from "./api-client.ts";
 import { ClawlingApiError, type Profile } from "./api-types.ts";
 import { resolveOpenclawClawlingAccount } from "./config.ts";
 import {
-  // ClawchatActivateSchema,
+  ClawchatActivateSchema,
   ClawchatGetAccountProfileSchema,
   ClawchatGetUserProfileSchema,
   ClawchatListAccountFriendsSchema,
   ClawchatUpdateAccountProfileSchema,
   ClawchatUploadAvatarImageSchema,
   ClawchatUploadMediaFileSchema,
-  // type ClawchatActivateParams,
+  type ClawchatActivateParams,
   type ClawchatGetUserProfileParams,
   type ClawchatListAccountFriendsParams,
   type ClawchatUpdateAccountProfileParams,
@@ -46,12 +47,12 @@ function validationError(message: string) {
   return jsonResponse({ error: "validation", message });
 }
 
-// function resolveActivateCode(params: ClawchatActivateParams & { command?: unknown }): string {
-//   const explicit = typeof params.code === "string" ? params.code.trim() : "";
-//   if (explicit) return explicit;
-//   const command = typeof params.command === "string" ? params.command.trim() : "";
-//   return command.match(/\b[A-Z0-9]{6}\b/u)?.[0] ?? "";
-// }
+function resolveActivateCode(params: ClawchatActivateParams & { command?: unknown }): string {
+  const explicit = typeof params.code === "string" ? params.code.trim() : "";
+  if (explicit) return explicit;
+  const command = typeof params.command === "string" ? params.command.trim() : "";
+  return command.match(/\b[A-Z0-9]{6}\b/u)?.[0] ?? "";
+}
 
 function genericError(err: unknown) {
   return jsonResponse({
@@ -94,64 +95,53 @@ export function registerOpenclawClawlingTools(api: OpenClawPluginApi): void {
     return;
   }
 
-  // -----------------------------------------------------------------------
-  // `clawchat_activate` tool disabled: activation now goes through OpenClaw
-  // channel login.
-  // -----------------------------------------------------------------------
-  // api.registerTool(
-  //   {
-  //     name: "clawchat_activate",
-  //     label: "Clawling: Activate (Login with Invite Code)",
-  //     description:
-  //       "Activate this OpenClaw plugin on ClawChat by exchanging an invite code for a token. " +
-  //       "Invite codes use six uppercase letters/digits, e.g. A1B2C3. " +
-  //       "TRIGGER — invoke this tool whenever the user's message matches ANY of: " +
-  //       "(1) activation intent with an embedded invite code, such as 'activate ClawChat with invite code A1B2C3', " +
-  //       "'login to ClawChat with invite code A1B2C3', 'connect ClawChat using invite code A1B2C3', " +
-  //       "or '绑定 ClawChat，邀请码 A1B2C3' — call this tool with `code = \"A1B2C3\"`; " +
-  //       "(2) generic activation intent without an embedded code, such as 'activate ClawChat' or " +
-  //       "'login to ClawChat' — ask for invite code before calling the tool; " +
-  //       "(3) activation intent with an embedded code, such as 'use invite code A1B2C3', " +
-  //       "or the user pasting an invite code in the context of ClawChat activation. " +
-  //       "Do not ask the user to enter a bare ClawChat command; if an invite code is present, call this tool directly. " +
-  //       "Extract the code verbatim — do NOT normalize / lowercase / add prefixes. " +
-  //       "On success the tool persists the resulting token + userId to the config, so " +
-  //       "subsequent `clawchat_*` calls work without any other setup.",
-  //     parameters: ClawchatActivateSchema,
-  //     async execute(_callId, params) {
-  //       const code = resolveActivateCode(params as ClawchatActivateParams & { command?: unknown });
-  //       if (!code) {
-  //         return validationError("openclaw-clawchat: code is required");
-  //       }
-  //       try {
-  //         const { runOpenclawClawlingLogin } = await import("./login.runtime.ts");
-  //         await runOpenclawClawlingLogin({
-  //           cfg: api.config!,
-  //           accountId: null,
-  //           runtime: { log: (message: string) => api.logger.info?.(message) },
-  //           readInviteCode: async () => code,
-  //         });
-  //         return jsonResponse({
-  //           ok: true,
-  //           message: "✅ ClawChat activated successfully.",
-  //         });
-  //       } catch (err) {
-  //         if (err instanceof ClawlingApiError) return apiError(err);
-  //         return genericError(err);
-  //       }
-  //     },
-  //   },
-  //   { name: "clawchat_activate" },
-  // );
-
-  const account = resolveOpenclawClawlingAccount(api.config);
-  if (!account.configured) {
-    api.logger.debug?.(
-      "openclaw-clawchat: account not yet configured; account tools will register " +
-        "on the next config reload after channel login.",
-    );
-    return;
-  }
+  api.registerTool(
+    {
+      name: "clawchat_activate",
+      label: "Clawling: Activate (Login with Invite Code)",
+      description:
+        "Activate this OpenClaw plugin on ClawChat by exchanging an invite code for a token. " +
+        "Invite codes use six uppercase letters/digits, e.g. A1B2C3. " +
+        "TRIGGER — invoke this tool whenever the user's message matches ANY of: " +
+        "(1) activation intent with an embedded invite code, such as 'activate ClawChat with invite code A1B2C3', " +
+        "'login to ClawChat with invite code A1B2C3', 'connect ClawChat using invite code A1B2C3', " +
+        "or '绑定 ClawChat，邀请码 A1B2C3' — call this tool with `code = \"A1B2C3\"`; " +
+        "(2) generic activation intent without an embedded code, such as 'activate ClawChat' or " +
+        "'login to ClawChat' — ask for invite code before calling the tool; " +
+        "(3) activation intent with an embedded code, such as 'use invite code A1B2C3', " +
+        "or the user pasting an invite code in the context of ClawChat activation. " +
+        "Extract the code verbatim — do NOT normalize / lowercase / add prefixes. " +
+        "On success the tool persists the resulting token + userId to the config, so " +
+        "subsequent `clawchat_*` calls work without another plugin registration pass.",
+      parameters: ClawchatActivateSchema,
+      async execute(_callId, params) {
+        const code = resolveActivateCode(params as ClawchatActivateParams & { command?: unknown });
+        if (!code) {
+          return validationError("openclaw-clawchat: code is required");
+        }
+        try {
+          const { runOpenclawClawlingLogin } = await import("./login.runtime.ts");
+          await runOpenclawClawlingLogin({
+            cfg: api.config!,
+            accountId: null,
+            runtime: { log: (message: string) => api.logger.info?.(message) },
+            readInviteCode: async () => code,
+            mutateConfigFile: (api.runtime.config as unknown as {
+              mutateConfigFile: OpenclawClawchatMutateConfigFile;
+            }).mutateConfigFile,
+          });
+          return jsonResponse({
+            ok: true,
+            message: "ClawChat activated successfully.",
+          });
+        } catch (err) {
+          if (err instanceof ClawlingApiError) return apiError(err);
+          return genericError(err);
+        }
+      },
+    },
+    { name: "clawchat_activate" },
+  );
 
   // Re-resolve at call time so config reloads pick up new tokens / baseUrl.
   function resolveCurrent() {
@@ -159,18 +149,19 @@ export function registerOpenclawClawlingTools(api: OpenClawPluginApi): void {
   }
 
   type ClientResult =
-    | { error: OpenClawAgentToolResult<unknown>; client?: never }
-    | { client: ReturnType<typeof createOpenclawClawlingApiClient>; error?: never };
+    | { ok: false; error: OpenClawAgentToolResult<unknown> }
+    | { ok: true; client: ReturnType<typeof createOpenclawClawlingApiClient> };
 
   function buildClient(): ClientResult {
     const acct = resolveCurrent();
     // `baseUrl` always resolves via the built-in default in config.ts, so we
-    // only need to gate on `token` here (which is populated by `openclaw
-    // channel login`).
+    // only need to gate on `token` here (which is populated by ClawChat
+    // activation/login).
     if (!acct.token) {
-      return { error: configError("openclaw-clawchat: token is required") };
+      return { ok: false, error: configError("openclaw-clawchat: token is required") };
     }
     return {
+      ok: true,
       client: createOpenclawClawlingApiClient({
         baseUrl: acct.baseUrl,
         token: acct.token,
@@ -184,7 +175,7 @@ export function registerOpenclawClawlingTools(api: OpenClawPluginApi): void {
   ): Promise<OpenClawAgentToolResult<unknown>> {
     return (async (): Promise<OpenClawAgentToolResult<unknown>> => {
       const built = buildClient();
-      if (built.error !== undefined) return built.error;
+      if (!built.ok) return built.error;
       try {
         const data = await fn(built.client);
         return jsonResponse(data);
@@ -368,6 +359,6 @@ export function registerOpenclawClawlingTools(api: OpenClawPluginApi): void {
   );
 
   api.logger.debug?.(
-    "openclaw-clawchat: registered 6 clawchat_* tools (get_account_profile, get_user_profile, list_account_friends, update_account_profile, upload_avatar_image, upload_media_file)",
+    "openclaw-clawchat: registered 7 clawchat_* tools (activate, get_account_profile, get_user_profile, list_account_friends, update_account_profile, upload_avatar_image, upload_media_file)",
   );
 }