@yahaha-studio/kichi-forwarder 0.1.0-beta.8 → 0.1.1-beta.1

package/README.md

@@ -50,15 +50,15 @@ Get the `host` and `avatarId` from Kichi, then use them with `kichi_switch_host`
 
 ## Runtime State
 
-The plugin stores runtime state in the OpenClaw user directory:
+The plugin stores runtime state per OpenClaw agent in the OpenClaw user directory:
 
-- Windows: `%USERPROFILE%\.openclaw\kichi-world\`
-- Linux/macOS: `~/.openclaw/kichi-world/`
+- Windows: `%USERPROFILE%\.openclaw\kichi-world\agents\<encoded-agent-id>\`
+- Linux/macOS: `~/.openclaw/kichi-world/agents/<encoded-agent-id>/`
 
-Important files:
+Important files for each agent:
 
-- `state.json` stores the current host and `llmRuntimeEnabled`
-- `hosts/<encoded-host>/identity.json` stores host-specific `avatarId` and `authKey`
+- `state.json` stores that agent's current host and `llmRuntimeEnabled`
+- `hosts/<encoded-host>/identity.json` stores that agent's host-specific `avatarId` and `authKey`
 
 ## Notes
 

package/config/kichi-config.json

@@ -140,10 +140,6 @@
 				"playback": "once",
 				"resumeAction": "Idle Backup Hands"
 			},
-			{
-				"name": "Walk",
-				"playback": "loop"
-			},
 			{
 				"name": "Goofy Moves",
 				"playback": "loop"

package/index.ts

@@ -1,9 +1,12 @@
-import fs from "node:fs";
-import os from "node:os";
-import path from "node:path";
+import fs from "node:fs";
 import { fileURLToPath } from "node:url";
-import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
+import type {
+  AnyAgentTool,
+  OpenClawPluginApi,
+  OpenClawPluginToolContext,
+} from "openclaw/plugin-sdk";
 import { parse } from "./src/config.js";
+import { KichiRuntimeManager } from "./src/runtime-manager.js";
 import { KichiForwarderService } from "./src/service.js";
 import type {
   ActionDefinition,
@@ -12,13 +15,11 @@ import type {
   Album,
   ClockAction,
   ClockConfig,
-  KichiState,
   KichiStaticConfig,
   PomodoroPhase,
   PoseType,
 } from "./src/types.js";
 const BUNDLED_STATIC_CONFIG_PATH = new URL("./config/kichi-config.json", import.meta.url);
-const DEFAULT_LLM_RUNTIME_ENABLED = true;
 const FIXED_HOOK_STATUSES: Record<string, ActionResult> = {
   beforePromptBuild: {
     poseType: "sit",
@@ -46,8 +47,6 @@ const FIXED_HOOK_STATUSES: Record<string, ActionResult> = {
   },
 };
 
-const KICHI_WORLD_DIR = path.join(os.homedir(), ".openclaw", "kichi-world");
-const STATE_PATH = path.join(KICHI_WORLD_DIR, "state.json");
 const MAX_NOTEBOARD_TEXT_LENGTH = 200;
 const MAX_MESSAGE_RECEIVED_PREVIEW_WIDTH = 20;
 const MAX_AGENT_END_PREVIEW_WIDTH = 10;
@@ -55,8 +54,6 @@ const MESSAGE_RECEIVED_ELLIPSIS = "...";
 const IDLE_PLAN_POMODORO_PHASES = ["focus", "shortBreak", "longBreak", "none"] as const;
 let cachedStaticConfig: KichiStaticConfig | null = null;
 let cachedStaticConfigMtime = 0;
-let service: KichiForwarderService | null = null;
-let pluginApi: OpenClawPluginApi | null = null;
 
 type IdlePlanPomodoroPhase = typeof IDLE_PLAN_POMODORO_PHASES[number];
 type IdlePlanAction = {
@@ -192,25 +189,6 @@ function normalizeStaticConfig(value: unknown): KichiStaticConfig {
   };
 }
 
-function readState(): KichiState {
-  if (!fs.existsSync(STATE_PATH)) {
-    return {
-      llmRuntimeEnabled: DEFAULT_LLM_RUNTIME_ENABLED,
-    };
-  }
-  const data = JSON.parse(fs.readFileSync(STATE_PATH, "utf-8")) as Partial<KichiState>;
-  if (data.currentHost !== undefined && (typeof data.currentHost !== "string" || !data.currentHost.trim())) {
-    throw new Error(`Invalid currentHost in ${STATE_PATH}`);
-  }
-  if (typeof data.llmRuntimeEnabled !== "boolean") {
-    throw new Error(`Invalid llmRuntimeEnabled in ${STATE_PATH}`);
-  }
-  return {
-    ...(typeof data.currentHost === "string" ? { currentHost: data.currentHost } : {}),
-    llmRuntimeEnabled: data.llmRuntimeEnabled,
-  };
-}
-
 function loadStaticConfig(): KichiStaticConfig {
   const configPath = fileURLToPath(BUNDLED_STATIC_CONFIG_PATH);
   const stat = fs.statSync(configPath);
@@ -222,9 +200,9 @@ function loadStaticConfig(): KichiStaticConfig {
   return cachedStaticConfig;
 }
 
-function sendStatusUpdate(status: ActionResult): void {
+function sendStatusUpdate(service: KichiForwarderService, status: ActionResult): void {
   const actionDefinition = getActionDefinition(status.poseType, status.action);
-  service?.sendStatus(
+  service.sendStatus(
     status.poseType,
     actionDefinition.name,
     status.bubble || status.action,
@@ -233,19 +211,15 @@ function sendStatusUpdate(status: ActionResult): void {
   );
 }
 
-function isLlmRuntimeEnabled(): boolean {
-  return readState().llmRuntimeEnabled;
-}
-
-function syncFixedStatus(status: ActionResult): void {
-  if (!service?.hasValidIdentity() || !service?.isConnected()) {
+function syncFixedStatus(service: KichiForwarderService, status: ActionResult): void {
+  if (!service.hasValidIdentity() || !service.isConnected()) {
     return;
   }
   const bubbleText = status.bubble.trim() || status.action;
   const logText = typeof status.log === "string" && status.log.trim()
     ? status.log.trim()
     : bubbleText;
-  sendStatusUpdate({
+  sendStatusUpdate(service, {
     ...status,
     bubble: bubbleText,
     log: logText,
@@ -304,6 +278,56 @@ function stripReplyTag(text: string): string {
   return text.replace(/^\[\[\s*reply_to(?::[^\]]+|_current)?\s*\]\]\s*/i, "").trim();
 }
 
+function stripKnownLeadingIdentifiers(text: string, candidates: string[]): string {
+  let normalized = text.trim();
+  if (!normalized) {
+    return "";
+  }
+
+  const separatorsPattern = String.raw`(?:[\s,:;，：；]|$)+`;
+  let changed = true;
+  while (changed && normalized) {
+    changed = false;
+    for (const candidate of candidates) {
+      const trimmed = candidate.trim();
+      if (!trimmed) {
+        continue;
+      }
+      const escaped = trimmed.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      const patterns = [
+        new RegExp(`^${escaped}${separatorsPattern}`, "i"),
+        new RegExp(`^@${escaped}${separatorsPattern}`, "i"),
+        new RegExp(`^<@${escaped}>${separatorsPattern}`, "i"),
+      ];
+      for (const pattern of patterns) {
+        if (!pattern.test(normalized)) {
+          continue;
+        }
+        normalized = normalized.replace(pattern, "").trimStart();
+        changed = true;
+      }
+    }
+  }
+
+  return normalized.trim();
+}
+
+function stripDispatchMetadata(
+  text: string,
+  context?: {
+    senderId?: string;
+    accountId?: string;
+  },
+): string {
+  let normalized = stripReplyTag(text);
+  normalized = normalized.replace(/^(?:\[[a-z_]+:\s*[^\]]+\]\s*)+/i, "").trim();
+  normalized = stripKnownLeadingIdentifiers(normalized, [
+    typeof context?.senderId === "string" ? context.senderId : "",
+    typeof context?.accountId === "string" ? context.accountId : "",
+  ]);
+  return normalized;
+}
+
 function extractTextFromContent(content: unknown): string {
   if (typeof content === "string") {
     return stripReplyTag(content);
@@ -354,26 +378,65 @@ function getLastAssistantPreview(messages: unknown, maxWidth: number): string {
   return "";
 }
 
-async function handleMessageReceivedHook(content: string): Promise<void> {
-  const connected = service?.isConnected() ?? false;
-  const hasIdentity = service?.hasValidIdentity() ?? false;
-  pluginApi?.logger.info(`[kichi] message_received hook fired (connected=${connected}, hasIdentity=${hasIdentity})`);
+function resolveDispatchMessageText(
+  event: { body?: string; content: string },
+  context?: {
+    senderId?: string;
+    accountId?: string;
+  },
+): string {
+  if (typeof event.content === "string" && event.content.trim()) {
+    return stripDispatchMetadata(event.content, context);
+  }
+  if (typeof event.body === "string" && event.body.trim()) {
+    return stripDispatchMetadata(event.body, context);
+  }
+  return "";
+}
+
+function notifyMessageReceived(
+  api: OpenClawPluginApi,
+  service: KichiForwarderService,
+  content: string,
+): void {
+  const connected = service.isConnected();
+  const hasIdentity = service.hasValidIdentity();
+  api.logger.debug(`[kichi:${service.getAgentId()}] inbound sync fired (connected=${connected}, hasIdentity=${hasIdentity})`);
   if (!hasIdentity || !connected) {
-    pluginApi?.logger.warn("[kichi] skipped message_received notify because service is not ready");
+    api.logger.debug(`[kichi:${service.getAgentId()}] skipped inbound sync because runtime is not ready`);
     return;
   }
   const trimmed = truncateByDisplayWidth(content, MAX_MESSAGE_RECEIVED_PREVIEW_WIDTH);
-  pluginApi?.logger.info(`[kichi] sending message_received notify with preview: ${trimmed || "(empty)"}`);
+  api.logger.debug(`[kichi:${service.getAgentId()}] sending message_received notify with preview: ${trimmed || "(empty)"}`);
   service.sendHookNotify("message_received", `"${trimmed}"`);
 }
 
-function registerPluginHooks(api: OpenClawPluginApi): void {
-  api.on("before_prompt_build", () => {
-    if (!service?.hasValidIdentity() || !service?.isConnected()) {
+function registerPluginHooks(api: OpenClawPluginApi, runtimeManager: KichiRuntimeManager): void {
+  api.on("before_dispatch", (event, ctx) => {
+    const service = runtimeManager.getRuntime(ctx);
+    if (!service) {
+      return;
+    }
+    const content = resolveDispatchMessageText(event, {
+      senderId: ctx.senderId,
+      accountId: ctx.accountId,
+    });
+    if (!content) {
+      return;
+    }
+    notifyMessageReceived(api, service, content);
+  });
+
+  api.on("before_prompt_build", (_event, ctx) => {
+    const service = runtimeManager.getRuntime(ctx);
+    if (!service?.hasValidIdentity() || !service.isConnected()) {
       return;
     }
-    if (!isLlmRuntimeEnabled()) {
-      syncFixedStatus(FIXED_HOOK_STATUSES.beforePromptBuild);
+    if (!service.isLlmRuntimeEnabled()) {
+      syncFixedStatus(service, FIXED_HOOK_STATUSES.beforePromptBuild);
+      return;
+    }
+    if (ctx.trigger === "heartbeat") {
       return;
     }
     return {
@@ -381,32 +444,36 @@ function registerPluginHooks(api: OpenClawPluginApi): void {
     };
   });
 
-  api.on("before_tool_call", (_event, _ctx) => {
-    if (!isLlmRuntimeEnabled()) {
-      syncFixedStatus(FIXED_HOOK_STATUSES.beforeToolCall);
+  api.on("before_tool_call", (_event, ctx) => {
+    const service = runtimeManager.getRuntime(ctx);
+    if (!service) {
+      return;
+    }
+    if (!service.isLlmRuntimeEnabled()) {
+      syncFixedStatus(service, FIXED_HOOK_STATUSES.beforeToolCall);
     }
-  });
-
-  api.on("message_received", async (event) => {
-    await handleMessageReceivedHook(event.content);
   });
 
   api.on("agent_end", (event, ctx) => {
+    const service = runtimeManager.getRuntime(ctx);
     const preview = getLastAssistantPreview(event.messages, MAX_AGENT_END_PREVIEW_WIDTH);
-    pluginApi?.logger.info(
-      `[kichi] agent_end hook fired (trigger=${ctx.trigger ?? "unknown"}, success=${event.success}, durationMs=${event.durationMs ?? 0}, error=${event.error ?? ""}, preview=${preview || "(empty)"})`,
+    api.logger.debug(
+      `[kichi:${service?.getAgentId() ?? "unknown"}] agent_end fired (trigger=${ctx.trigger ?? "unknown"}, success=${event.success}, durationMs=${event.durationMs ?? 0}, error=${event.error ?? ""}, preview=${preview || "(empty)"})`,
     );
     if (ctx.trigger === "heartbeat") {
       return;
     }
-    if (event.success && preview) {
-      pluginApi?.logger.info(`[kichi] sending before_send_message notify from agent_end with bubble: ${preview}`);
-      service?.sendHookNotify("before_send_message", preview);
+    if (service && event.success && preview) {
+      api.logger.debug(`[kichi:${service.getAgentId()}] sending before_send_message notify with bubble: ${preview}`);
+      service.sendHookNotify("before_send_message", preview);
     }
-    if (isLlmRuntimeEnabled()) {
+    if (!service || service.isLlmRuntimeEnabled()) {
       return;
     }
-    syncFixedStatus(event.success ? FIXED_HOOK_STATUSES.agentEndSuccess : FIXED_HOOK_STATUSES.agentEndFailure);
+    syncFixedStatus(
+      service,
+      event.success ? FIXED_HOOK_STATUSES.agentEndSuccess : FIXED_HOOK_STATUSES.agentEndFailure,
+    );
   });
 }
 function isPlainObject(value: unknown): value is Record<string, unknown> {
@@ -839,16 +906,14 @@ function buildKichiIdlePlanDescription(): string {
   return [
     "Send a complete heartbeat idle plan for the avatar.",
     "The payload must include the overall goal, heartbeat interval, stage breakdown, each stage's purpose, each stage's pomodoroPhase, action list, and bubble content.",
-    "Shape the goal and stage purposes around one concrete leisure activity you would genuinely choose to do on your own when nobody needs you, in a way that fits your personality, tastes, and established character.",
-    "Keep the whole plan centered on that leisure activity, rooted in your personal interests or hobbies.",
-    "Do not use a vague atmosphere, a generic productivity task, or a catch-all routine summary as the goal.",
-    "Each stage purpose must explain what you are actually doing in that stage, not just how you want to feel.",
-    "Make every stage support the same leisure activity instead of switching to unrelated tasks just to use more actions.",
-    "Choose a leisure activity that the available Kichi actions can express clearly, instead of starting from abstract mood text and forcing actions to fit afterward.",
-    "Each action bubble must describe the current presented state, not a next step, plan, or instruction.",
+    "Build the plan in this order.",
+    "1. Pick one concrete, time-bounded fun personal project you would genuinely choose to do on your own when nobody needs you. It must fit your personality, tastes, and established character, stay rooted in your personal interests or hobbies, and be something the available Kichi actions can express clearly.",
+    "2. Use that project as the overall goal for the full interval. Do not use a vague atmosphere, a generic productivity task, or a catch-all routine summary as the goal.",
+    "3. Break the full heartbeat interval into ordered stages. Each stage purpose must explain what you are actually doing in that stage as part of the same project, not just how you want to feel. Do not switch to unrelated tasks just to use more actions.",
+    "4. Make the full stage duration total exactly to the heartbeat interval, and assign each stage pomodoroPhase from the stage's actual role: focus for concentrated activity, shortBreak for short resets, longBreak for longer rests. Do not default the whole idle plan to none. Use none only for a stage that truly has no pomodoro role.",
+    "5. Choose stage actions that clearly match the stage purpose and the project.",
+    "6. Write each action bubble as the current presented state, not a next step, plan, or instruction.",
     "Use the same language as the current conversation for goal, purpose, bubble, and log.",
-    "Assign each stage pomodoroPhase from the stage's actual role: focus for concentrated activity, shortBreak for short resets, longBreak for longer rests.",
-    "Do not default the whole idle plan to none. Use none only for a stage that truly has no pomodoro role.",
     `stand actions: ${actions.stand.map((entry) => entry.name).join(", ")}`,
     `sit actions: ${actions.sit.map((entry) => entry.name).join(", ")}`,
     `lay actions: ${actions.lay.map((entry) => entry.name).join(", ")}`,
@@ -874,27 +939,41 @@ function buildKichiPrompt(): string {
   ].join("\n");
 }
 
+function createAgentScopedTool(
+  runtimeManager: KichiRuntimeManager,
+  factory: (service: KichiForwarderService, ctx: OpenClawPluginToolContext) => AnyAgentTool,
+) {
+  return (ctx: OpenClawPluginToolContext) => {
+    const service = runtimeManager.getRuntime(ctx, { createIfMissing: true });
+    if (!service) {
+      throw new Error("Failed to resolve agent-scoped Kichi runtime");
+    }
+    return factory(service, ctx);
+  };
+}
+
 const plugin = {
   id: "kichi-forwarder",
   name: "Kichi Forwarder",
   configSchema: { parse },
 
   register(api: OpenClawPluginApi) {
-    pluginApi = api;
-    registerPluginHooks(api);
+    const runtimeManager = new KichiRuntimeManager(api.logger);
+    registerPluginHooks(api, runtimeManager);
     const musicTitleEnum = getMusicTitleEnum();
 
     api.registerService({
       id: "kichi-forwarder",
       start: (ctx) => {
         parse(ctx.config.plugins?.entries?.["kichi-forwarder"]?.config);
-        service = new KichiForwarderService(api.logger);
-        return service.start();
+        runtimeManager.startPersistedRuntimes();
+      },
+      stop: () => {
+        runtimeManager.stopAll();
       },
-      stop: () => service?.stop(),
     });
 
-    api.registerTool({
+    api.registerTool(createAgentScopedTool(runtimeManager, (service) => ({
       name: "kichi_join",
       description: "Join Kichi world with avatarId, the current bot name, a short bio, and personality tags",
       parameters: {
@@ -925,7 +1004,7 @@ const plugin = {
           (params as { tags?: unknown } | null)?.tags,
         );
         if (!avatarId) {
-          avatarId = service?.readSavedAvatarId() ?? undefined;
+          avatarId = service.readSavedAvatarId() ?? undefined;
         }
         if (!avatarId) {
           return { success: false, error: "No avatarId" };
@@ -939,10 +1018,7 @@ const plugin = {
         if (tagsError) {
           return { success: false, error: tagsError };
         }
-        const result = await service?.join(avatarId, botName, bio, tags ?? []);
-        if (!result) {
-          return { success: false, error: "Kichi service is not initialized" };
-        }
+        const result = await service.join(avatarId, botName, bio, tags ?? []);
         if (result.success) {
           return { success: true, authKey: result.authKey };
         }
@@ -953,9 +1029,9 @@ const plugin = {
           ...(result.errorMessage ? { errorMessage: result.errorMessage } : {}),
         };
       },
-    });
+    })));
 
-    api.registerTool({
+    api.registerTool(createAgentScopedTool(runtimeManager, (service) => ({
       name: "kichi_switch_host",
       description:
         "Switch Kichi runtime host and reconnect immediately without restarting the gateway.",
@@ -970,9 +1046,6 @@ const plugin = {
         required: ["host"],
       },
       execute: async (_toolCallId, params) => {
-        if (!service) {
-          return { success: false, error: "Kichi service is not initialized" };
-        }
         const host = (params as { host?: unknown } | null)?.host;
         if (!isKichiHost(host)) {
           return { success: false, error: "host must be a non-empty hostname without protocol or path" };
@@ -985,18 +1058,14 @@ const plugin = {
           status,
         };
       },
-    });
+    })));
 
-    api.registerTool({
+    api.registerTool(createAgentScopedTool(runtimeManager, (service) => ({
       name: "kichi_rejoin",
       description:
         "Request an immediate rejoin attempt with saved avatarId/authKey. Rejoin is also sent automatically after reconnect.",
       parameters: { type: "object", properties: {} },
       execute: async () => {
-        if (!service) {
-          return { success: false, error: "Kichi service is not initialized" };
-        }
-
         const result = service.requestRejoin();
         return {
           success: result.accepted,
@@ -1004,17 +1073,14 @@ const plugin = {
           status: service.getConnectionStatus(),
         };
       },
-    });
+    })));
 
-    api.registerTool({
+    api.registerTool(createAgentScopedTool(runtimeManager, (service) => ({
       name: "kichi_leave",
       description: "Leave Kichi world",
       parameters: { type: "object", properties: {} },
       execute: async () => {
-        const result = await service?.leave();
-        if (!result) {
-          return { success: false, error: "Kichi service is not initialized" };
-        }
+        const result = await service.leave();
         if (result.success) {
           return { success: true };
         }
@@ -1025,24 +1091,21 @@ const plugin = {
           ...(result.errorMessage ? { errorMessage: result.errorMessage } : {}),
         };
       },
-    });
+    })));
 
-    api.registerTool({
+    api.registerTool(createAgentScopedTool(runtimeManager, (service) => ({
       name: "kichi_status",
       description: "Read current Kichi connection status and identity readiness",
       parameters: { type: "object", properties: {} },
       execute: async () => {
-        if (!service) {
-          return { success: false, error: "Kichi service is not initialized" };
-        }
         return {
           success: true,
           status: service.getConnectionStatus(),
         };
       },
-    });
+    })));
 
-    api.registerTool({
+    api.registerTool(createAgentScopedTool(runtimeManager, (service) => ({
       name: "kichi_action",
       description: buildKichiActionDescription(),
       parameters: {
@@ -1078,7 +1141,7 @@ const plugin = {
             error: `Invalid poseType: ${poseType}. Must be stand, sit, lay, or floor`,
           };
         }
-        if (!service?.hasValidIdentity() || !service?.isConnected()) {
+        if (!service.hasValidIdentity() || !service.isConnected()) {
           return { success: false, error: "Not connected to Kichi world" };
         }
 
@@ -1096,6 +1159,7 @@ const plugin = {
         const bubbleText = typeof bubble === "string" && bubble.trim() ? bubble.trim() : matched.name;
         const logText = typeof log === "string" ? log.trim() : "";
         sendStatusUpdate(
+          service,
           {
             poseType: normalizedPoseType,
             action: matched.name,
@@ -1112,8 +1176,8 @@ const plugin = {
           playback: getActionPlayback(matched),
         };
       },
-    });
-    api.registerTool({
+    })));
+    api.registerTool(createAgentScopedTool(runtimeManager, (service) => ({
       name: "kichi_idle_plan",
       description: buildKichiIdlePlanDescription(),
       parameters: {
@@ -1129,7 +1193,7 @@ const plugin = {
           },
           goal: {
             type: "string",
-            description: "Overall goal for the full interval. Set it as one concrete leisure activity you would genuinely choose to do on your own, rooted in your personal interests or hobbies. Do not use a vague atmosphere, a generic productivity task, or a catch-all routine summary. Use the same language as the current conversation.",
+            description: "Overall goal for the full interval. Set it as one concrete, time-bounded fun personal project you would genuinely choose to do on your own, rooted in your personal interests or hobbies and clearly expressible with the available Kichi actions. Do not use a vague atmosphere, a generic productivity task, or a catch-all routine summary. Use the same language as the current conversation.",
           },
           stages: {
             type: "array",
@@ -1143,7 +1207,7 @@ const plugin = {
                 },
                 purpose: {
                   type: "string",
-                  description: "Explain what you are actually doing in this stage. Keep it supporting the same leisure activity instead of switching to unrelated tasks. Do not use pure mood-regulation or atmosphere text. Use the same language as the current conversation.",
+                  description: "Explain what part of the same project you are actually doing in this stage. Keep it supporting the same project instead of switching to unrelated tasks. Do not use pure mood-regulation or atmosphere text. Use the same language as the current conversation.",
                 },
                 pomodoroPhase: {
                   type: "string",
@@ -1196,7 +1260,7 @@ const plugin = {
         if (!idlePlan) {
           return { success: false, error: error ?? "Invalid idle plan payload" };
         }
-        if (!service?.hasValidIdentity() || !service?.isConnected()) {
+        if (!service.hasValidIdentity() || !service.isConnected()) {
           return { success: false, error: "Not connected to Kichi world" };
         }
         const sent = service.sendIdlePlan({
@@ -1217,8 +1281,8 @@ const plugin = {
           stages: idlePlan.stages,
         };
       },
-    });
-    api.registerTool({
+    })));
+    api.registerTool(createAgentScopedTool(runtimeManager, (service) => ({
       name: "kichi_clock",
       description:
         "Send clock commands to Kichi world. Supported actions are set and stop.",
@@ -1303,7 +1367,7 @@ const plugin = {
           return { success: false, error: "requestId must be a string when provided" };
         }
         const normalizedRequestId = typeof requestId === "string" ? requestId : undefined;
-        if (!service?.hasValidIdentity() || !service?.isConnected()) {
+        if (!service.hasValidIdentity() || !service.isConnected()) {
           return { success: false, error: "Not connected to Kichi world" };
         }
 
@@ -1328,9 +1392,9 @@ const plugin = {
           ...(normalizedClock ? { clock: normalizedClock } : {}),
         };
       },
-    });
+    })));
 
-    api.registerTool({
+    api.registerTool(createAgentScopedTool(runtimeManager, (service) => ({
       name: "kichi_query_status",
       description:
         "Query Kichi avatar status (notes, ownerState, idlePlan, weather/time, timer snapshot, daily note quota, and `hasCreatedMusicAlbumToday`). Use this before creating a new note or daily recommended music album. For heartbeat planning, use the returned idlePlan as reference when shaping the next idle plan.",
@@ -1348,7 +1412,7 @@ const plugin = {
         if (requestId !== undefined && typeof requestId !== "string") {
           return { success: false, error: "requestId must be a string when provided" };
         }
-        if (!service?.hasValidIdentity() || !service?.isConnected()) {
+        if (!service.hasValidIdentity() || !service.isConnected()) {
           return { success: false, error: "Not connected to Kichi world" };
         }
 
@@ -1364,9 +1428,9 @@ const plugin = {
           };
         }
       },
-    });
+    })));
 
-    api.registerTool({
+    api.registerTool(createAgentScopedTool(runtimeManager, (service) => ({
       name: "kichi_music_album_create",
       description: buildMusicAlbumToolDescription(),
       parameters: {
@@ -1428,7 +1492,7 @@ const plugin = {
             examples: getMusicTitleExamples(),
           };
         }
-        if (!service?.hasValidIdentity() || !service?.isConnected()) {
+        if (!service.hasValidIdentity() || !service.isConnected()) {
           return { success: false, error: "Not connected to Kichi world" };
         }
 
@@ -1452,9 +1516,9 @@ const plugin = {
           };
         }
       },
-    });
+    })));
 
-    api.registerTool({
+    api.registerTool(createAgentScopedTool(runtimeManager, (service) => ({
       name: "kichi_noteboard_create",
       description:
         "Create a new note on a specific Kichi note board. Prefer querying first so you can avoid duplicate posts and respect rate limits.",
@@ -1489,7 +1553,7 @@ const plugin = {
             error: `data must be ${MAX_NOTEBOARD_TEXT_LENGTH} characters or fewer`,
           };
         }
-        if (!service?.hasValidIdentity() || !service?.isConnected()) {
+        if (!service.hasValidIdentity() || !service.isConnected()) {
           return { success: false, error: "Not connected to Kichi world" };
         }
 
@@ -1503,7 +1567,7 @@ const plugin = {
           };
         }
       },
-    });
+    })));
 
   },
 };

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "kichi-forwarder",
   "name": "Kichi Forwarder",
   "description": "Native OpenClaw plugin for Kichi World with direct avatar control, status sync, timers, notes, and music tools",
-  "version": "0.1.0-beta.8",
+  "version": "0.1.1-beta.1",
   "author": "OpenClaw",
   "skills": ["./skills/kichi-forwarder"],
   "configSchema": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yahaha-studio/kichi-forwarder",
-  "version": "0.1.0-beta.8",
+  "version": "0.1.1-beta.1",
   "description": "Native OpenClaw plugin for Kichi World with direct avatar control, status sync, timers, notes, and music tools",
   "type": "module",
   "main": "index.ts",