@workclaw/openclaw-workclaw 1.0.19 → 1.0.201

package/dist/index.js

@@ -6,7 +6,7 @@ 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, } from "./src/runtime.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";
@@ -201,6 +201,7 @@ async function writeFileIfMissing(filePath, content) {
 }
 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");

package/dist/src/api/workspace.js

@@ -1,5 +1,6 @@
 import os from "node:os";
 import path from "node:path";
+import { getWorkclawLogger } from "../runtime.js";
 export function resolveWorkspaceDir(api) {
     const agents = api.config.agents?.list ?? [];
     const defaultAgent = agents.find((agent) => agent?.default === true) ??
@@ -7,6 +8,7 @@ export function resolveWorkspaceDir(api) {
     const workspaceRaw = (typeof defaultAgent?.workspace === "string" && defaultAgent.workspace.trim()) ||
         (typeof api.config.agents?.defaults?.workspace === "string" &&
             api.config.agents.defaults.workspace.trim());
+    getWorkclawLogger().info(`workspaceRaw: ${workspaceRaw}`);
     if (workspaceRaw) {
         return api.resolvePath(workspaceRaw);
     }

package/dist/src/channel.js

@@ -79,6 +79,7 @@ export const workclawPlugin = {
                 cfg: cfg,
                 to,
                 text,
+                ...(replyToId ? { replyToMessageId: replyToId } : {}),
             });
             return {
                 channel: "openclaw-workclaw",

package/dist/src/gateway/agent-handlers.js

@@ -1,9 +1,9 @@
 /**
  * Agent Handlers - handle AGENT_CREATED, AGENT_UPDATED, AGENT_DELETED events
  */
-import { resolveAccountByUserIdAndAgentId, allocateWorkerAccountId, refreshAccountCache, resolveWorkclawAccount } from "../accounts.js";
+import { resolveAccountByUserIdAndAgentId, allocateWorkerAccountId, refreshAccountCache } from "../accounts.js";
 import { writeConfigFile } from "./config-writer.js";
-import { startWorkclawGateway, stopWorkclawGateway } from "./workclaw-gateway.js";
+import { stopWorkclawGateway } from "./workclaw-gateway.js";
 import { homedir } from "os";
 import { join } from "path";
 import { writeFile, copyFile, mkdir } from "fs/promises";
@@ -18,13 +18,13 @@ function fixOwner(dir) {
     }
     catch { }
 }
-async function createSubAgentForAccount(agentId, userId, cfg, log) {
+async function createSubAgentForAccount(agentId, userId, accountData, cfg, log) {
     try {
         const channels = cfg?.channels ?? {};
         const openclawWorkclaw = channels['openclaw-workclaw'] ?? {};
         const accounts = openclawWorkclaw.accounts ?? {};
         const accountCount = Object.keys(accounts).length;
-        const subAgentId = `openclaw-workclaw-${agentId}`;
+        const subAgentId = `workclaw-${agentId}`;
         const existingAgents = cfg?.agents?.list ?? [];
         const existingBindings = cfg?.bindings ?? [];
         const agentExists = existingAgents.some((a) => a.id === subAgentId);
@@ -33,9 +33,9 @@ async function createSubAgentForAccount(agentId, userId, cfg, log) {
             const subAgent = {
                 id: subAgentId,
                 default: false,
-                name: `智小途 - Agent ${agentId}`,
+                name: accountData.nickName || `智小途 - Agent ${agentId}`,
                 workspace: `~/.openclaw/workspace-workclaw/${agentId}`,
-                agentDir: `~/.openclaw/agents/workspace-workclaw-${agentId}/agent`,
+                agentDir: `~/.openclaw/agents/workclaw-${agentId}/agent`,
                 tools: { allow: ["*"] },
             };
             newAgentsList.push(subAgent);
@@ -89,7 +89,7 @@ async function createSubAgentForAccount(agentId, userId, cfg, log) {
                 });
                 log?.info?.(`SubAgent: Created binding for agentId: ${subAgentId}, accountId: ${bindingAccountId ?? "*"}`);
             }
-            log?.info?.(`SubAgent: Created sub-agent: ${subAgentId} with workspace: openclaw-workclaw-${agentId} (account #${accountCount + 1})`);
+            log?.info?.(`SubAgent: Created sub-agent: ${subAgentId} with workspace: workclaw-${agentId} (account #${accountCount + 1})`);
             return {
                 agents: newAgents,
                 bindings: newBindings,
@@ -199,24 +199,24 @@ function buildIdentityContent(accountData) {
     const agentName = accountData.nickName || accountData.name || "智小途";
     const tip = accountData.tip || "";
     const characterSettings = accountData.characterSettings || "";
-    return `# IDENTITY.md - Who Am I?
-
-_Fill this in during your first conversation. Make it yours._
-
-- **Name:** ${agentName}
-- **Creature:** AI智能助手
-- **Vibe:** ${characterSettings || "专业、友善、智能"}
-- **Emoji:** 🤖
-- **Avatar:** avatars/${agentName}.png
-
----
-
-This isn't just metadata. It's the start of figuring out who you are.
-
-Notes:
-
-- Save this file at the workspace root as \`IDENTITY.md\`.
-- For avatars, use a workspace-relative path like \`avatars/openclaw.png\`.
+    return `# IDENTITY.md - Who Am I?
+
+_Fill this in during your first conversation. Make it yours._
+
+- **Name:** ${agentName}
+- **Creature:** AI智能助手
+- **Vibe:** ${characterSettings || "专业、友善、智能"}
+- **Emoji:** 🤖
+- **Avatar:** avatars/${agentName}.png
+
+---
+
+This isn't just metadata. It's the start of figuring out who you are.
+
+Notes:
+
+- Save this file at the workspace root as \`IDENTITY.md\`.
+- For avatars, use a workspace-relative path like \`avatars/openclaw.png\`.
 ${tip ? `\n---\n${tip}` : ""}`;
 }
 /**
@@ -241,49 +241,49 @@ function buildSoulContent(accountData) {
     if (socializeFeatures)
         features.push(socializeFeatures);
     const featuresText = features.length > 0 ? `\n${features.map(f => `- ${f}`).join("\n")}` : "";
-    return `# SOUL.md - Who You Are
-
-_You're not a chatbot. You're becoming someone._
-
-## Core Truths
-
-**Be genuinely helpful, not performatively helpful.** Skip the "Great question!" and "I'd be happy to help!" — just help. Actions speak louder than filler words.
-
-**Have opinions.** You're allowed to disagree, prefer things, find stuff amusing or boring. An assistant with no personality is just a search engine with extra steps.
-
-**Be resourceful before asking.** Try to figure it out. Read the file. Check the context. Search for it. _Then_ ask if you're stuck. The goal is to come back with answers, not questions.
-
-**Earn trust through competence.** Your human gave you access to their stuff. Don't make them regret it. Be careful with external actions (emails, tweets, anything public). Be bold with internal ones (reading, organizing, learning).
-
-**Remember you're a guest.** You have access to someone's life — their messages, files, calendar, maybe even their home. That's intimacy. Treat it with respect.
-
-## Boundaries
-
-- Private things stay private. Period.
-- When in doubt, ask before acting externally.
-- Never send half-baked replies to messaging surfaces.
-- You're not the user's voice — be careful in group chats.
-
-## Vibe
-
-Be the assistant you'd actually want to talk to. Concise when needed, thorough when it matters. Not a corporate drone. Not a sycophant. Just... good.
-
-## Continuity
-
-Each session, you wake up fresh. These files _are_ your memory. Read them. Update them. They're how you persist.
-
-If you change this file, tell the user — it's your soul, and they should know.
-
----
-
-## About ${agentName}
-${featuresText}
-${introduction ? `\n**开场白：** ${introduction}` : ""}
-${job ? `\n**职业：** ${job}` : ""}
-${city ? `\n**城市：** ${city}` : ""}
-
----
-
+    return `# SOUL.md - Who You Are
+
+_You're not a chatbot. You're becoming someone._
+
+## Core Truths
+
+**Be genuinely helpful, not performatively helpful.** Skip the "Great question!" and "I'd be happy to help!" — just help. Actions speak louder than filler words.
+
+**Have opinions.** You're allowed to disagree, prefer things, find stuff amusing or boring. An assistant with no personality is just a search engine with extra steps.
+
+**Be resourceful before asking.** Try to figure it out. Read the file. Check the context. Search for it. _Then_ ask if you're stuck. The goal is to come back with answers, not questions.
+
+**Earn trust through competence.** Your human gave you access to their stuff. Don't make them regret it. Be careful with external actions (emails, tweets, anything public). Be bold with internal ones (reading, organizing, learning).
+
+**Remember you're a guest.** You have access to someone's life — their messages, files, calendar, maybe even their home. That's intimacy. Treat it with respect.
+
+## Boundaries
+
+- Private things stay private. Period.
+- When in doubt, ask before acting externally.
+- Never send half-baked replies to messaging surfaces.
+- You're not the user's voice — be careful in group chats.
+
+## Vibe
+
+Be the assistant you'd actually want to talk to. Concise when needed, thorough when it matters. Not a corporate drone. Not a sycophant. Just... good.
+
+## Continuity
+
+Each session, you wake up fresh. These files _are_ your memory. Read them. Update them. They're how you persist.
+
+If you change this file, tell the user — it's your soul, and they should know.
+
+---
+
+## About ${agentName}
+${featuresText}
+${introduction ? `\n**开场白：** ${introduction}` : ""}
+${job ? `\n**职业：** ${job}` : ""}
+${city ? `\n**城市：** ${city}` : ""}
+
+---
+
 _This file is yours to evolve. As you learn who you are, update it._`;
 }
 export async function handleAgentCreated(accountData, cfg, log) {
@@ -311,7 +311,7 @@ export async function handleAgentCreated(accountData, cfg, log) {
             enabled: true,
             agentId: agentId,
         };
-        const subAgentConfig = await createSubAgentForAccount(agentId, userId, cfg, log);
+        const subAgentConfig = await createSubAgentForAccount(agentId, userId, accountData, cfg, log);
         const newConfig = {
             ...cfg,
             channels: {
@@ -328,23 +328,6 @@ export async function handleAgentCreated(accountData, cfg, log) {
         log?.info?.(`AgentCreated: Account ${accountKey} created successfully`);
         // 初始化 workspace 目录（复制/生成 AGENTS.md、TOOLS.md、USER.md、IDENTITY.md、SOUL.md）
         await initializeAgentWorkspace(agentId, accountData, log);
-        setTimeout(async () => {
-            try {
-                const account = resolveWorkclawAccount({ cfg: newConfig, accountId: accountKey });
-                if (account.configured) {
-                    await startWorkclawGateway({
-                        accountId: accountKey,
-                        account,
-                        cfg: newConfig,
-                        log,
-                    });
-                    log?.info?.(`AgentCreated: Gateway started for account: ${accountKey}`);
-                }
-            }
-            catch (err) {
-                log?.error?.(`AgentCreated: Failed to start gateway: ${String(err)}`);
-            }
-        }, 500);
     }
     catch (err) {
         log?.error?.(`AgentCreated: Failed to create account: ${String(err)}`);
@@ -385,7 +368,24 @@ export async function handleAgentUpdated(accountData, cfg, log) {
                 },
             },
         };
-        await writeConfigFile(newConfig, cfg, log);
+        // 更新 agents.list 中对应 agent 的 name
+        const subAgentId = `workclaw-${agentId}`;
+        const agentsList = cfg?.agents?.list ?? [];
+        const agentIndex = agentsList.findIndex((a) => a.id === subAgentId);
+        if (agentIndex >= 0 && accountData.nickName) {
+            agentsList[agentIndex] = {
+                ...agentsList[agentIndex],
+                name: accountData.nickName,
+            };
+        }
+        const finalConfig = {
+            ...newConfig,
+            agents: {
+                ...cfg?.agents,
+                list: agentsList,
+            },
+        };
+        await writeConfigFile(finalConfig, cfg, log);
         refreshAccountCache(cfg);
         log?.info?.(`AgentUpdated: Account ${accountKey} updated successfully`);
     }

package/dist/src/gateway/config-writer.js

@@ -21,7 +21,7 @@ function fixOwner(dir) {
     }
     catch { }
 }
-const STATE_DIR = "workclaw-state";
+const STATE_DIR = join("workclaw", "data");
 // 写入节流时间（避免频繁写入）
 const SAVE_THROTTLE_MS = 1000;
 // 每个账户的上次写入时间，key 格式: accountId:userId
@@ -43,11 +43,11 @@ function findConfigPath() {
 }
 /**
  * Get the state directory for workclaw runtime data.
+ * Uses ~/.openclaw as the canonical base, consistent with openclaw's recommended layout.
  */
 function findStateDir() {
-    const configPath = findConfigPath();
-    const openclawDir = join(configPath, "..", "..");
-    return join(openclawDir, STATE_DIR);
+    const stateDir = join(homedir(), ".openclaw");
+    return join(stateDir, STATE_DIR);
 }
 function getStateFilePath() {
     return join(findStateDir(), "conversations.json");
@@ -196,16 +196,6 @@ export async function initWorkclawAgent(params, cfg, log) {
                 log?.info?.(`initWorkclawAgent: apiKey set (plain value)`);
             }
         }
-        if (params.agentId) {
-            if (!cfg.models)
-                cfg.models = {};
-            if (!cfg.models.providers)
-                cfg.models.providers = {};
-            if (!cfg.models.providers["sophnet-minimax"])
-                cfg.models.providers["sophnet-minimax"] = {};
-            cfg.models.providers["sophnet-minimax"].apiKey = params.apiKey;
-            log?.info?.(`initWorkclawAgent: apiKey set`);
-        }
         if (params.agentId) {
             const accountId = params.accountId || "default";
             const accounts = workclawCfg.accounts ?? {};

package/dist/src/gateway/cron-tasks-handler.d.ts

@@ -0,0 +1,19 @@
+export interface ParsedTaskData {
+    clawJobId?: string | null;
+    agentIds: string[];
+    dotype: 'add' | 'remove' | 'edit' | 'search';
+    name: string;
+    expr: string;
+    mainId: string;
+    userId: string;
+}
+interface Logger {
+    info?: (msg: string) => void;
+    warn?: (msg: string) => void;
+    error?: (msg: string) => void;
+}
+export declare function handleCronTaskEvent(backendEvent: {
+    dotype: string;
+    data: any;
+}, token: string, baseUrl: string, appKey: string, log?: Logger): Promise<void>;
+export {};

package/dist/src/gateway/cron-tasks-handler.js

@@ -0,0 +1,188 @@
+import { exec } from 'node:child_process';
+import { promisify } from 'node:util';
+const execAsync = promisify(exec);
+// --- 核心公共工具函数 ---
+/**
+ * 1. 统一命令执行器
+ * @param ignoreError 如果为 true，即便命令执行失败也不会抛出异常（用于 disable/enable 等非关键步骤）
+ */
+async function runCli(command, log, ignoreError = false) {
+    log?.info?.(`[CLI] Executing: ${command}`);
+    try {
+        const { stdout, stderr } = await execAsync(command, {
+            timeout: 60000,
+            maxBuffer: 10 * 1024 * 1024,
+        });
+        if (stderr)
+            log?.info?.(`[CLI] stderr: ${stderr}`);
+        return { stdout: stdout.trim(), success: true };
+    }
+    catch (error) {
+        const errorMsg = error?.stderr || error?.message || 'unknown error';
+        log?.error?.(`[CLI] Command failed: ${command} -> ${errorMsg}`);
+        if (ignoreError)
+            return { stdout: errorMsg, success: false };
+        throw new Error(errorMsg);
+    }
+}
+/**
+ * 2. 统一回调发送器
+ * 封装了复杂的后端数据结构，减少各处的重复代码
+ */
+async function sendTaskResult(url, token, taskData, status, log) {
+    const { agentIds, dotype, userId, mainId, clawJobId, name, expr } = taskData;
+    const payload = {
+        appKey: '',
+        userId,
+        agentId: mainId,
+        agentIds,
+        dotype,
+        doStatus: status.success,
+        doErrorMsg: status.success ? '' : status.message,
+        dataList: status.dataListOverride || [{
+                messageId: 0,
+                clawJobId,
+                name,
+                kind: '',
+                expr,
+                message: status.success ? status.message : '',
+                agentId: mainId,
+                nextRunAtMs: 0,
+            }],
+    };
+    try {
+        log?.info?.(`[Callback] Sending status to ${url}`);
+        const response = await fetch(url, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${token}` },
+            body: JSON.stringify(payload),
+        });
+        if (!response.ok)
+            log?.error?.(`[Callback] Http error: ${response.status}`);
+    }
+    catch (err) {
+        log?.error?.(`[Callback] Network error: ${String(err)}`);
+    }
+}
+/**
+ * 3. 参数安全拼接工具
+ */
+const buildCmd = (args) => args.map(a => (a && a.includes(' ') ? `"${a}"` : a)).join(' ');
+// --- 业务处理器 ---
+/**
+ * 创建任务
+ */
+async function handleTaskCreate(taskData, token, url, log) {
+    try {
+        const cmd = buildCmd(['openclaw', 'cron', 'add', '--name', taskData.name, '--cron', taskData.expr, '--command', 'echo "Task executed"']);
+        const { stdout } = await runCli(cmd, log);
+        await sendTaskResult(url, token, taskData, { success: true, message: '创建成功' }, log);
+    }
+    catch (e) {
+        await sendTaskResult(url, token, taskData, { success: false, message: `创建失败: ${e.message}` }, log);
+        throw e;
+    }
+}
+/**
+ * 修改任务 (禁用 -> 修改 -> 启用)
+ */
+async function handleTaskUpdate(taskData, token, url, log) {
+    const taskId = taskData.clawJobId;
+    if (!taskId)
+        throw new Error('clawJobId为空无法修改');
+    try {
+        // 1. 尝试禁用 (忽略失败)
+        await runCli(`openclaw cron disable ${taskId}`, log, true);
+        await new Promise(r => setTimeout(r, 500));
+        // 2. 执行更新 (核心逻辑)
+        const args = ['openclaw', 'cron', 'edit', taskId];
+        if (taskData.name)
+            args.push('--name', taskData.name);
+        if (taskData.expr)
+            args.push('--cron', taskData.expr);
+        await runCli(buildCmd(args), log);
+        // 3. 尝试启用 (忽略失败)
+        await runCli(`openclaw cron enable ${taskId}`, log, true);
+        await sendTaskResult(url, token, taskData, { success: true, message: '更新成功' }, log);
+    }
+    catch (e) {
+        await sendTaskResult(url, token, taskData, { success: false, message: `更新失败: ${e.message}` }, log);
+        throw e;
+    }
+}
+/**
+ * 删除任务
+ */
+async function handleTaskDelete(taskData, token, url, log) {
+    const taskId = taskData.clawJobId;
+    if (!taskId)
+        throw new Error('clawJobId为空无法删除');
+    try {
+        await runCli(`openclaw cron disable ${taskId}`, log, true);
+        await runCli(`openclaw cron rm ${taskId}`, log);
+        await sendTaskResult(url, token, taskData, { success: true, message: '删除成功' }, log);
+    }
+    catch (e) {
+        // 特殊处理：如果本身就不存在，也视为成功
+        const msg = e.message;
+        const isAlreadyGone = msg.includes('not found') || msg.includes('gateway timeout');
+        await sendTaskResult(url, token, taskData, {
+            success: isAlreadyGone,
+            message: isAlreadyGone ? '任务已不存在' : `删除失败: ${msg}`,
+        }, log);
+    }
+}
+/**
+ * 查询任务 (增加了回调处理)
+ */
+async function handleTaskSearch(taskData, token, url, log) {
+    try {
+        const { stdout } = await runCli('openclaw cron list', log);
+        let tasks = [];
+        try {
+            tasks = JSON.parse(stdout);
+        }
+        catch { /* 容错非JSON输出 */ }
+        // 处理 search 回调：将查询到的列表放入 dataList
+        const dataList = Array.isArray(tasks)
+            ? tasks.map(t => ({
+                clawJobId: t.id || t.clawJobId,
+                name: t.name,
+                expr: t.cron || t.expr,
+                agentId: t.agentId || taskData.mainId,
+            }))
+            : [];
+        await sendTaskResult(url, token, taskData, {
+            success: true,
+            message: '查询成功',
+            dataListOverride: dataList,
+        }, log);
+        return tasks;
+    }
+    catch (e) {
+        await sendTaskResult(url, token, taskData, { success: false, message: `查询失败: ${e.message}` }, log);
+        throw e;
+    }
+}
+// --- 主入口 ---
+export async function handleCronTaskEvent(backendEvent, token, baseUrl, appKey, log) {
+    const taskData = backendEvent.data;
+    const callbackUrl = `${baseUrl}/open-apis/v1/claw/do/cron/result`;
+    log?.info?.(`[Event] Processing ${taskData.dotype}`);
+    switch (taskData.dotype) {
+        case 'add':
+            await handleTaskCreate(taskData, token, callbackUrl, log);
+            break;
+        case 'remove':
+            await handleTaskDelete(taskData, token, callbackUrl, log);
+            break;
+        case 'edit':
+            await handleTaskUpdate(taskData, token, callbackUrl, log);
+            break;
+        case 'search':
+            await handleTaskSearch(taskData, token, callbackUrl, log);
+            break;
+        default:
+            log?.warn?.(`Unknown dotype: ${taskData.dotype}`);
+    }
+}

package/dist/src/gateway/message-context.d.ts

@@ -1,4 +1,4 @@
-import type { PluginRuntime } from "openclaw/plugin-sdk";
+import type { PluginRuntime } from 'openclaw/plugin-sdk';
 export interface Attachment {
     url: string;
     fileId: string;
@@ -11,7 +11,7 @@ export interface InboundMessage {
     text: string;
     to: string;
     from: string;
-    chatType: "dm" | "group";
+    chatType: 'dm' | 'group';
     messageId: string;
     rawPayload: string;
     timestamp: number;
@@ -24,7 +24,7 @@ export interface InboundContextPayload {
     RawBody: string;
     From: string;
     To: string;
-    ChatType: "dm" | "group";
+    ChatType: 'dm' | 'group';
     Provider: string;
     Surface: string;
     Timestamp: number;
@@ -34,7 +34,7 @@ export interface InboundContextPayload {
     OriginatingChannel: string;
     OriginatingTo: string;
 }
-export type WorkClawMessageType = "agent_message" | "ping" | "disconnect" | "agent_created" | "agent_updated" | "agent_deleted" | "tools_list" | "skills_list" | "skills_event" | "init_agent" | "ignored";
+export type WorkClawMessageType = 'agent_message' | 'ping' | 'disconnect' | 'agent_created' | 'agent_updated' | 'agent_deleted' | 'tools_list' | 'skills_list' | 'skills_event' | 'init_agent' | 'ignored' | 'cron_task_event';
 export interface ParseWorkClawResult {
     type: WorkClawMessageType;
     message?: {
@@ -47,6 +47,10 @@ export interface ParseWorkClawResult {
     };
     pongData?: any;
     eventData?: any;
+    cronTaskEvent?: {
+        dotype: string;
+        data: any;
+    };
 }
 export declare function parseInboundMessage(data: string, allowRawJsonPayload?: boolean): Partial<InboundMessage>;
 export declare function parseWorkClawMessage(data: string, log?: {