@workclaw/openclaw-workclaw 1.0.23 → 1.0.25

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@workclaw/openclaw-workclaw",
   "type": "module",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "description": "openclaw-workclaw channel plugin",
   "publishConfig": {
     "access": "public"

package/src/gateway/workclaw-gateway.ts

@@ -37,7 +37,7 @@ export interface WorkclawGatewayOptions {
 }
 
 export async function startWorkclawGateway(options: WorkclawGatewayOptions): Promise<void> {
-  const { account, log } = options
+  const { log } = options
 
   const logger = createLogger('', log)
   setWorkclawLoggerFromContext(logger)
@@ -168,6 +168,8 @@ async function startSharedWebSocket(options: WorkclawGatewayOptions): Promise<vo
 function handleSharedMessage(appKey: string, data: string, cfg: any, logger: any): void {
   const parsed = parseWorkClawMessage(data, logger)
 
+  logger.info?.(`Gateway received message: ${JSON.stringify(parsed)}`)
+
   if (!parsed) {
     logger.warn?.(`Gateway failed to parse message`)
     return
@@ -219,10 +221,14 @@ function handleSharedMessage(appKey: string, data: string, cfg: any, logger: any
     userId = String(parsed.eventData?.futureId || parsed.eventData?.userId || '')
     agentId = String(parsed.eventData?.id || parsed.eventData?.agentId || '')
   }
-  else if (parsed.type === 'tools_list' || parsed.type === 'skills_list' || parsed.type === 'skills_event') {
+  else if (parsed.type === 'tools_list') {
     userId = String(parsed.eventData?.userId || '')
     agentId = String(parsed.eventData?.agentId || '')
   }
+  else if (parsed.type === 'skills_list' || parsed.type === 'skills_event') {
+    userId = String(parsed.eventData?.data?.userId || parsed.eventData?.userId || '')
+    agentId = String(parsed.eventData?.data?.agentIds?.[0] || parsed.eventData?.data?.agentId || parsed.eventData?.agentId || '')
+  }
   else if (parsed.type === 'init_agent') {
     userId = String(parsed.eventData?.futureId || parsed.eventData?.userId || '')
     agentId = String(parsed.eventData?.id || parsed.eventData?.agentId || '')

package/dist/api.d.ts

@@ -1,3 +0,0 @@
-export { workclawPlugin } from "./src/channel.js";
-export * from "./src/setup-core.js";
-export * from "./src/setup-surface.js";

package/dist/api.js

@@ -1,3 +0,0 @@
-export { workclawPlugin } from "./src/channel.js";
-export * from "./src/setup-core.js";
-export * from "./src/setup-surface.js";

package/dist/index.d.ts

@@ -1,11 +0,0 @@
-import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
-declare const _default: {
-    id: string;
-    name: string;
-    description: string;
-    configSchema: import("openclaw/plugin-sdk").ChannelConfigSchema;
-    register: (api: OpenClawPluginApi) => void;
-    channelPlugin: import("openclaw/plugin-sdk").ChannelPlugin<import("./src/types.js").ResolvedWorkclawAccount>;
-    setChannelRuntime?: (runtime: import("openclaw/plugin-sdk").PluginRuntime) => void;
-};
-export default _default;

package/dist/index.js

@@ -1,264 +0,0 @@
-import { emptyPluginConfigSchema } from "openclaw/plugin-sdk";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore - types from openclaw 4.2, local dev uses 3.13
-import { defineChannelPluginEntry } from "openclaw/plugin-sdk/core";
-import { mkdir, readFile, writeFile } from "node:fs/promises";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import { workclawPlugin } from "./src/channel.js";
-import { setWorkclawRuntime, getWorkclawRuntime, getToolResultHint, getWorkclawLogger, } from "./src/runtime.js";
-import { resolveWorkspaceDir, isDefaultWorkspace } from "./src/api/workspace.js";
-import { createPromptsApiHandler } from "./src/api/prompts-api.js";
-import { createAccountsApiHandler } from "./src/api/accounts-api.js";
-import { createSessionApiHandler } from "./src/api/session-api.js";
-import { createSkillsApiHandler } from "./src/api/skills-api.js";
-import { registerAllOpenclawWorkclawCronTools } from "./src/tools/openclaw-workclaw-cron/index.js";
-import { getToolContext, setToolCallIdToRunIdMapping, deleteToolContext, } from "./src/runtime.js";
-import { sendMessageWorkclaw } from "./src/outbound/index.js";
-// ============================================================================
-// Tool output formatting helpers
-// ============================================================================
-function formatToolParams(toolName, params) {
-    if (!params || typeof params !== "object") {
-        return "";
-    }
-    const normalizedToolName = (toolName || "").toLowerCase().trim();
-    const p = params;
-    try {
-        if (normalizedToolName === "exec" || normalizedToolName === "bash" || normalizedToolName === "shell") {
-            const cmd = p.command || p.cmd;
-            if (cmd)
-                return `command: ${String(cmd).slice(0, 200)}`;
-        }
-        else if (normalizedToolName === "read" ||
-            normalizedToolName === "file_read" ||
-            normalizedToolName === "view") {
-            const p2 = p.path;
-            if (p2)
-                return `path: ${p2}`;
-        }
-        else if (normalizedToolName === "write" ||
-            normalizedToolName === "file_write" ||
-            normalizedToolName === "edit" ||
-            normalizedToolName === "patch") {
-            const p2 = p.path;
-            if (p2)
-                return `path: ${p2}`;
-        }
-        else if (normalizedToolName === "web_fetch" ||
-            normalizedToolName === "fetch" ||
-            normalizedToolName === "http_get" ||
-            normalizedToolName === "http_request" ||
-            normalizedToolName === "open_url" ||
-            normalizedToolName === "browser_open" ||
-            normalizedToolName === "open") {
-            const u = p.url;
-            if (u)
-                return `url: ${u}`;
-        }
-        else if (normalizedToolName === "search" ||
-            normalizedToolName === "web_search" ||
-            normalizedToolName === "google_search" ||
-            normalizedToolName === "browser_search" ||
-            normalizedToolName === "browser.search") {
-            const q = p.query || p.q || p.search;
-            if (q)
-                return `query: ${q}`;
-        }
-        else if (normalizedToolName === "image_generate" ||
-            normalizedToolName === "generate_image" ||
-            normalizedToolName === "dalle" ||
-            normalizedToolName === "text_to_image") {
-            const prompt = p.prompt;
-            if (prompt)
-                return `prompt: ${String(prompt).slice(0, 200)}`;
-        }
-        else if (normalizedToolName === "code_interpreter" ||
-            normalizedToolName === "python" ||
-            normalizedToolName === "jupyter") {
-            const code = p.code;
-            if (code)
-                return `code: ${String(code).slice(0, 200)}`;
-        }
-        else if (normalizedToolName === "mcp_deliver" || normalizedToolName === "deliver") {
-            const target = p.target || p.to;
-            if (target)
-                return `target: ${target}`;
-        }
-        else {
-            const entries = Object.entries(p);
-            if (entries.length > 0) {
-                return entries
-                    .map(([k, v]) => {
-                    const vStr = typeof v === "string" ? v : JSON.stringify(v);
-                    return vStr.length > 100 ? `${k}: ${vStr.slice(0, 100)}...` : `${k}: ${vStr}`;
-                })
-                    .join("\n");
-            }
-        }
-    }
-    catch {
-        return String(params);
-    }
-    return "";
-}
-function formatToolOutput(toolName, params, _result) {
-    return formatToolParams(toolName, params);
-}
-// ============================================================================
-// Tool hooks
-// ============================================================================
-function registerToolHooks(api) {
-    api.on("agent_end", (event, ctx) => {
-        const { runId } = ctx || {};
-        if (runId) {
-            deleteToolContext(runId);
-            api.logger?.info?.(`[ToolHook] agent_end runId=${runId} cleaned up`);
-        }
-        return event;
-    });
-    api.on("before_tool_call", (event, _ctx) => {
-        api.logger?.info?.(`[ToolHook] before_tool_call event=${JSON.stringify(event)}`);
-    });
-    api.on("after_tool_call", (event, _ctx) => {
-        api.logger?.info?.(`[ToolHook] after_tool_call event=${JSON.stringify(event)}`);
-        const { runId, toolCallId, toolName, params, result } = event || {};
-        const toolCtx = runId ? getToolContext(runId) : undefined;
-        if (toolCtx && result) {
-            const content = formatToolOutput(toolName, params, result);
-            if (content) {
-                try {
-                    const cfg = getWorkclawRuntime().config.loadConfig();
-                    const formattedToolOutput = {
-                        name: getToolResultHint(toolName),
-                        toolName: toolName,
-                        content: content,
-                        state: "result",
-                    };
-                    sendMessageWorkclaw({
-                        cfg,
-                        to: toolCtx.target,
-                        text: JSON.stringify(formattedToolOutput),
-                        msgType: "26",
-                        accountId: toolCtx.accountId,
-                        openConversationId: toolCtx.openConversationId,
-                        agentId: toolCtx.agentId,
-                        replyToMessageId: toolCtx.replyToMessageId,
-                    }).catch((err) => {
-                        api.logger?.error?.(`[ToolHook] after_tool_call push failed: ${err}`);
-                    });
-                    api.logger?.info?.(`[ToolHook] after_tool_call pushed for toolName=${toolName}`);
-                }
-                catch (err) {
-                    api.logger?.error?.(`[ToolHook] after_tool_call push failed: ${err}`);
-                }
-            }
-        }
-        if (runId && toolCallId) {
-            setToolCallIdToRunIdMapping(toolCallId, runId);
-        }
-        return event;
-    });
-    api.on("tool_result_persist", (event, _ctx) => {
-        return { message: event.message };
-    });
-    api.logger?.info?.(`[ToolHook] Tool execution hooks registered`);
-}
-// ============================================================================
-// Templates
-// ============================================================================
-const templateNames = ["SOUL.md", "IDENTITY.md"];
-/**
- * 获取插件所在目录，兼容 Windows 下的 file:// URL 问题。
- * 4.2 的插件加载器在 Windows 上可能传入不带协议前缀的路径。
- */
-function getPluginDir() {
-    try {
-        const url = import.meta.url;
-        if (!url.startsWith("file://")) {
-            // Windows 路径被直接传入（不带 file:// 前缀），直接取目录
-            return path.dirname(url);
-        }
-        return path.dirname(fileURLToPath(url));
-    }
-    catch {
-        return process.cwd();
-    }
-}
-async function writeFileIfMissing(filePath, content) {
-    try {
-        await writeFile(filePath, content, { encoding: "utf-8", flag: "wx" });
-    }
-    catch (error) {
-        if (error &&
-            typeof error === "object" &&
-            "code" in error &&
-            error.code === "EEXIST") {
-            return;
-        }
-        throw error;
-    }
-}
-async function releaseTemplates(api) {
-    const workspaceDir = resolveWorkspaceDir(api);
-    getWorkclawLogger().info(`workspaceDir: ${workspaceDir}`);
-    // 模板文件在根目录的 templates/ 中，而不是 dist/templates/
-    const currentDir = getPluginDir();
-    const templatesDir = path.join(currentDir.endsWith("dist") ? path.dirname(currentDir) : currentDir, "templates");
-    const shouldOverwrite = isDefaultWorkspace(api);
-    await mkdir(workspaceDir, { recursive: true });
-    await Promise.all(templateNames.map(async (name) => {
-        const sourcePath = path.join(templatesDir, name);
-        const targetPath = path.join(workspaceDir, name);
-        const content = await readFile(sourcePath, "utf-8");
-        if (shouldOverwrite) {
-            await writeFile(targetPath, content, { encoding: "utf-8" });
-        }
-        else {
-            await writeFileIfMissing(targetPath, content);
-        }
-    }));
-    api.logger.info(`openclaw-workclaw templates ready: ${workspaceDir}`);
-}
-// ============================================================================
-// Plugin entry point
-// ============================================================================
-export default defineChannelPluginEntry({
-    id: "openclaw-workclaw",
-    name: "openclaw-workclaw",
-    description: "智小途 channel plugin",
-    configSchema: emptyPluginConfigSchema(),
-    plugin: workclawPlugin,
-    registerFull(api) {
-        setWorkclawRuntime(api.runtime);
-        registerAllOpenclawWorkclawCronTools(api);
-        registerToolHooks(api);
-        api.registerService({
-            id: "openclaw-workclaw-templates",
-            start: async () => {
-                await releaseTemplates(api);
-            },
-        });
-        api.registerHttpRoute({
-            path: "/openclaw-workclaw/workspace/prompts",
-            handler: createPromptsApiHandler(api),
-            auth: "plugin",
-        });
-        api.registerHttpRoute({
-            path: "/openclaw-workclaw/accounts",
-            handler: createAccountsApiHandler(api),
-            auth: "plugin",
-        });
-        api.registerHttpRoute({
-            path: "/openclaw-workclaw/skills",
-            handler: createSkillsApiHandler(api),
-            auth: "plugin",
-        });
-        api.registerHttpRoute({
-            path: "/openclaw-workclaw/sessions",
-            handler: createSessionApiHandler(api),
-            auth: "plugin",
-            match: "prefix",
-        });
-    },
-});

package/dist/setup-entry.d.ts

@@ -1,2 +0,0 @@
-declare const _default: import("openclaw/plugin-sdk/channel-entry-contract").BundledChannelSetupEntryContract<import("openclaw/plugin-sdk").ChannelPlugin>;
-export default _default;

package/dist/setup-entry.js

@@ -1,12 +0,0 @@
-import { defineBundledChannelSetupEntry } from "openclaw/plugin-sdk/channel-entry-contract";
-export default defineBundledChannelSetupEntry({
-    importMetaUrl: import.meta.url,
-    plugin: {
-        specifier: "./api.js",
-        exportName: "workclawPlugin",
-    },
-    secrets: {
-        specifier: "./src/secret-contract-api.js",
-        exportName: "channelSecrets",
-    },
-});

package/dist/src/accounts.d.ts

@@ -1,66 +0,0 @@
-import type { OpenClawConfig } from 'openclaw/plugin-sdk';
-import type { ResolvedWorkclawAccount, WorkclawConfig } from './types.js';
-/**
- * Normalize account ID by trimming whitespace
- */
-export declare function normalizeAccountId(accountId: string | null | undefined): string;
-/**
- * Build the lookup cache from existing accounts in cfg.
- * Called once at gateway startup.
- */
-export declare function buildAccountMap(cfg: OpenClawConfig): void;
-/**
- * Resolve accountId by userId + agentId.
- * First checks cache, then falls back to iteration.
- */
-export declare function resolveAccountByUserIdAndAgentId(cfg: OpenClawConfig, userId: string, agentId: string): string | null;
-/**
- * Allocate a new workspace-N accountId and register it in the map.
- */
-export declare function allocateWorkerAccountId(_cfg: OpenClawConfig, userId: string, agentId: string): string;
-/**
- * Refresh the cache when an account's userId or agentId changes.
- */
-export declare function refreshAccountCache(cfg: OpenClawConfig): void;
-/**
- * List all account IDs.
- * If no accounts are configured but plugin has workclaw config, returns [DEFAULT_ACCOUNT_ID].
- */
-export declare function listWorkclawAccountIds(cfg: OpenClawConfig): string[];
-/**
- * Resolve the default account ID.
- */
-export declare function resolveDefaultWorkclawAccountId(cfg: OpenClawConfig): string;
-export declare function isWorkclawAccountConfigured(config: {
-    appKey?: string;
-    appSecret?: string;
-    agentId?: string | number;
-}): boolean;
-/**
- * Resolve a complete account with merged config.
- */
-export declare function resolveWorkclawAccount(params: {
-    cfg: OpenClawConfig;
-    accountId?: string | null;
-}): ResolvedWorkclawAccount;
-/**
- * List all enabled and configured accounts.
- */
-export declare function listEnabledWorkclawAccounts(cfg: OpenClawConfig): ResolvedWorkclawAccount[];
-/**
- * Resolve account and apply cached connection config if available.
- * This ensures that appKey/appSecret etc. use the stable values captured at connection time,
- * not potentially mutated values from cfg at resolution time.
- */
-export declare function resolveWorkclawAccountWithCache(params: {
-    cfg: OpenClawConfig;
-    accountId?: string | null;
-}): ResolvedWorkclawAccount;
-/**
- * Inspect and probe workclaw credentials.
- * Returns a function that can be called to test the connection.
- */
-export declare function inspectWorkclawCredentials(workclawCfg?: WorkclawConfig): (() => Promise<{
-    ok: boolean;
-    botName?: string;
-}>) | null;