@clawling/clawchat-plugin-openclaw 2026.9.13-1 → 2026.9.13-2

package/dist/src/account-config-writes.js

@@ -19,19 +19,20 @@ function applyPatch(target, patch) {
     return next;
 }
 /**
- * The RAW object a patch for `accountId` lands in (not the merged view — use
- * `readOpenclawClawlingAccountSection` for that). Default: the `accounts.default`
- * entry when the host's single-account promotion created one, else the root.
- * Named: the matching `accounts.<key>` entry (case-insensitive) or `{}`.
+ * Dotted config path of the slot {@link patchOpenclawClawlingAccountSection}
+ * writes `accountId` into, for operator-facing logs. Default:
+ * `channels.<channel>` — or `channels.<channel>.accounts.default` once the
+ * host's single-account promotion created that entry. Named:
+ * `channels.<channel>.accounts.<key>` with the existing key spelling.
  */
-export function readOpenclawClawlingAccountEntry(cfg, accountId) {
+export function openclawClawlingAccountSlotPath(cfg, accountId) {
     const id = normalizeOpenclawClawlingAccountId(accountId);
     const section = readRecord(readRecord(cfg.channels)[CHANNEL_ID]);
-    const accounts = readRecord(section.accounts);
-    const key = findAccountKey(accounts, id);
+    const key = findAccountKey(readRecord(section.accounts), id);
+    const base = `channels.${CHANNEL_ID}`;
     if (key !== undefined)
-        return readRecord(accounts[key]);
-    return id === DEFAULT_ACCOUNT_ID ? section : {};
+        return `${base}.accounts.${key}`;
+    return id === DEFAULT_ACCOUNT_ID ? base : `${base}.accounts.${id}`;
 }
 /**
  * The single config write point. Pure. Default → root section (or

package/dist/src/account-removal.js

@@ -1,21 +1,44 @@
+import fs from "node:fs";
 import { normalizeOpenclawClawlingAccountId } from "./config.js";
+import { livewareNamedAccountRootDir } from "./liveware-cli.js";
 /**
  * `openclaw channels remove --account <id> [--delete]` — the host has already
  * rewritten the config (hybrid adapter) and stopped the account. Blank that
  * account's SQLite credentials so a later start of the same id cannot resume
  * the old identity from the row. Identity columns are kept (re-pair mode).
+ *
+ * A NAMED account also owns a private liveware root
+ * (`<stateDir>/clawchat/accounts/<id>/`: the CLI home holding the
+ * `$HOME/.clawling` login session, and the sample tree); the whole root is
+ * removed so the identity does not linger on disk. The `default` account's
+ * paths are the shared pre-multi-account layout and are never touched here.
+ * The host stops the account before this hook (best effort), so a still-open
+ * file only costs a log line.
  */
 export function clearOpenclawClawlingAccountOnRemoval(params) {
     const accountId = normalizeOpenclawClawlingAccountId(params.accountId);
     if (!params.store) {
         params.log?.(`[${accountId}] clawchat-plugin-openclaw account removed; sqlite unavailable, nothing to clear`);
-        return;
     }
+    else {
+        try {
+            params.store.clearActivationCredentials({ platform: "openclaw", accountId });
+            params.log?.(`[${accountId}] clawchat-plugin-openclaw account removed; sqlite credentials cleared`);
+        }
+        catch (err) {
+            params.log?.(`[${accountId}] clawchat-plugin-openclaw account removed; sqlite clear failed: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+    if (!params.stateDir)
+        return;
+    const dir = livewareNamedAccountRootDir(params.stateDir, accountId);
+    if (dir === null)
+        return;
+    const rm = params.rmFn ?? ((target) => fs.rmSync(target, { recursive: true, force: true }));
     try {
-        params.store.clearActivationCredentials({ platform: "openclaw", accountId });
-        params.log?.(`[${accountId}] clawchat-plugin-openclaw account removed; sqlite credentials cleared`);
+        rm(dir);
     }
     catch (err) {
-        params.log?.(`[${accountId}] clawchat-plugin-openclaw account removed; sqlite clear failed: ${err instanceof Error ? err.message : String(err)}`);
+        params.log?.(`[${accountId}] clawchat-plugin-openclaw account removed; liveware directory ${dir} not removed: ${err instanceof Error ? err.message : String(err)}`);
     }
 }

package/dist/src/channel.js

@@ -28,8 +28,14 @@ export const openclawClawlingPlugin = createChatChannelPlugin({
         lifecycle: {
             onAccountRemoved: ({ accountId, runtime }) => {
                 let store = null;
+                let stateDir;
+                try {
+                    stateDir = getOpenclawClawlingRuntime().state?.resolveStateDir?.();
+                }
+                catch {
+                    stateDir = undefined;
+                }
                 try {
-                    const stateDir = getOpenclawClawlingRuntime().state?.resolveStateDir?.();
                     store = getClawChatStore({
                         ...(stateDir ? { dbPath: clawChatDbPathForStateDir(stateDir) } : {}),
                         log: { error: (message) => runtime.error(message) },
@@ -41,6 +47,7 @@ export const openclawClawlingPlugin = createChatChannelPlugin({
                 clearOpenclawClawlingAccountOnRemoval({
                     accountId,
                     store,
+                    stateDir,
                     log: (message) => runtime.log(message),
                 });
             },

package/dist/src/channel.setup.js

@@ -46,14 +46,23 @@ const configAdapter = {
      * `configured: true` again on the next gateway start. Clear the same keys
      * from the promoted entry so `--delete` actually deletes. Named ids are the
      * SDK's alone — it removes the whole `accounts.<id>` entry.
+     *
+     * Guard: a config with no channel section has nothing to clear, and the
+     * patch write would otherwise materialize an empty section out of nothing.
      */
     deleteAccount: (args) => {
         const next = hybridConfigAdapter.deleteAccount?.(args) ?? args.cfg;
         if (normalizeOpenclawClawlingAccountId(args.accountId) !== DEFAULT_ACCOUNT_ID)
             return next;
+        if (!hasOpenclawClawlingChannelSection(next))
+            return next;
         return patchOpenclawClawlingAccountSection(next, DEFAULT_ACCOUNT_ID, CLEAR_BASE_FIELDS_PATCH);
     },
 };
+function hasOpenclawClawlingChannelSection(cfg) {
+    const section = cfg.channels?.[CHANNEL_ID];
+    return Boolean(section) && typeof section === "object" && !Array.isArray(section);
+}
 function readInviteCode(input) {
     return typeof input.code === "string" && input.code.trim()
         ? input.code.trim()

package/dist/src/config.js

@@ -230,7 +230,7 @@ export function readOpenclawClawlingAccountSection(cfg, accountId) {
         channelConfig: root,
         accountConfig: entry ?? {},
         omitKeys,
-        nestedObjectKeys: NESTED_ACCOUNT_OBJECT_KEYS,
+        nestedObjectKeys: [...NESTED_ACCOUNT_OBJECT_KEYS],
     });
 }
 const accountListHelpers = createAccountListHelpers(CHANNEL_ID, {

package/dist/src/liveware-cli.js

@@ -26,6 +26,17 @@ function livewareAccountRoot(stateDir, accountId) {
         ? path.join(root, "clawchat")
         : path.join(root, "clawchat", "accounts", id);
 }
+/**
+ * Root of a NAMED account's private liveware state
+ * (`<stateDir>/clawchat/accounts/<id>`), the directory account removal
+ * deletes wholesale. Returns null for `default`, whose root is the shared
+ * `<stateDir>/clawchat` and must never be removed this way.
+ */
+export function livewareNamedAccountRootDir(stateDir, accountId) {
+    return normalizeOpenclawClawlingAccountId(accountId) === DEFAULT_ACCOUNT_ID
+        ? null
+        : livewareAccountRoot(stateDir, accountId);
+}
 /**
  * Private HOME for the liveware CLI: `<stateDir>/clawchat/liveware-home` for
  * the default account, `<stateDir>/clawchat/accounts/<id>/liveware-home` for a

package/dist/src/login.runtime.js

@@ -2,7 +2,7 @@ import { createInterface } from "node:readline/promises";
 import { createOpenclawClawlingApiClient } from "./api-client.js";
 import { ClawlingApiError } from "./api-types.js";
 import { resolvePluginVersion } from "./plugin-report.js";
-import { patchOpenclawClawlingAccountSection } from "./account-config-writes.js";
+import { openclawClawlingAccountSlotPath, patchOpenclawClawlingAccountSection } from "./account-config-writes.js";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/setup";
 import { CHANNEL_ID, mergeOpenclawClawchatRuntimePluginActivation, mergeOpenclawClawchatToolAllow, normalizeOpenclawClawlingAccountId, readOpenclawClawlingAccountSection, resolveOpenclawClawlingAccount, } from "./config.js";
 import { getClawChatStore } from "./storage.js";
@@ -310,9 +310,7 @@ export async function runOpenclawClawlingLogin(params) {
             }
             : {}),
     };
-    const configPath = accountId === DEFAULT_ACCOUNT_ID
-        ? `channels.${CHANNEL_ID}`
-        : `channels.${CHANNEL_ID}.accounts.${accountId}`;
+    const configPath = openclawClawlingAccountSlotPath(params.cfg, accountId);
     runtime.log(`Updating config: ${configPath}.token=[REDACTED] agentId=${normalizedResult.agent.id || "-"} userId=${normalizedResult.agent.user_id} ownerUserId=${normalizedResult.agent.owner_id}${normalizedResult.refresh_token ? " refreshToken=[REDACTED]" : ""} plugins.entries.${CHANNEL_ID}.enabled=true plugins.allow+=${CHANNEL_ID} …`);
     await persistLoginConfig(accountId, params, normalizedResult);
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawling/clawchat-plugin-openclaw",
-  "version": "2026.9.13-1",
+  "version": "2026.9.13-2",
   "description": "OpenClaw ClawChat channel plugin",
   "license": "MIT",
   "author": "CLAWLING PTE. LTD.",

package/src/account-config-writes.ts

@@ -22,21 +22,19 @@ function applyPatch(target: Record<string, unknown>, patch: Record<string, unkno
 }
 
 /**
- * The RAW object a patch for `accountId` lands in (not the merged view — use
- * `readOpenclawClawlingAccountSection` for that). Default: the `accounts.default`
- * entry when the host's single-account promotion created one, else the root.
- * Named: the matching `accounts.<key>` entry (case-insensitive) or `{}`.
+ * Dotted config path of the slot {@link patchOpenclawClawlingAccountSection}
+ * writes `accountId` into, for operator-facing logs. Default:
+ * `channels.<channel>` — or `channels.<channel>.accounts.default` once the
+ * host's single-account promotion created that entry. Named:
+ * `channels.<channel>.accounts.<key>` with the existing key spelling.
  */
-export function readOpenclawClawlingAccountEntry(
-  cfg: OpenClawConfig,
-  accountId?: string | null,
-): Record<string, unknown> {
+export function openclawClawlingAccountSlotPath(cfg: OpenClawConfig, accountId?: string | null): string {
   const id = normalizeOpenclawClawlingAccountId(accountId);
   const section = readRecord(readRecord((cfg as { channels?: unknown }).channels)[CHANNEL_ID]);
-  const accounts = readRecord(section.accounts);
-  const key = findAccountKey(accounts, id);
-  if (key !== undefined) return readRecord(accounts[key]);
-  return id === DEFAULT_ACCOUNT_ID ? section : {};
+  const key = findAccountKey(readRecord(section.accounts), id);
+  const base = `channels.${CHANNEL_ID}`;
+  if (key !== undefined) return `${base}.accounts.${key}`;
+  return id === DEFAULT_ACCOUNT_ID ? base : `${base}.accounts.${id}`;
 }
 
 /**

package/src/account-removal.ts

@@ -1,4 +1,6 @@
+import fs from "node:fs";
 import { normalizeOpenclawClawlingAccountId } from "./config.ts";
+import { livewareNamedAccountRootDir } from "./liveware-cli.ts";
 import type { ClawChatStore } from "./storage.ts";
 
 /**
@@ -6,23 +8,45 @@ import type { ClawChatStore } from "./storage.ts";
  * rewritten the config (hybrid adapter) and stopped the account. Blank that
  * account's SQLite credentials so a later start of the same id cannot resume
  * the old identity from the row. Identity columns are kept (re-pair mode).
+ *
+ * A NAMED account also owns a private liveware root
+ * (`<stateDir>/clawchat/accounts/<id>/`: the CLI home holding the
+ * `$HOME/.clawling` login session, and the sample tree); the whole root is
+ * removed so the identity does not linger on disk. The `default` account's
+ * paths are the shared pre-multi-account layout and are never touched here.
+ * The host stops the account before this hook (best effort), so a still-open
+ * file only costs a log line.
  */
 export function clearOpenclawClawlingAccountOnRemoval(params: {
   accountId: string;
   store: Pick<ClawChatStore, "clearActivationCredentials"> | null;
+  /** Resolved OpenClaw state dir; absent → liveware directories are left alone. */
+  stateDir?: string | null;
   log?: (message: string) => void;
+  rmFn?: (dir: string) => void;
 }): void {
   const accountId = normalizeOpenclawClawlingAccountId(params.accountId);
   if (!params.store) {
     params.log?.(`[${accountId}] clawchat-plugin-openclaw account removed; sqlite unavailable, nothing to clear`);
-    return;
+  } else {
+    try {
+      params.store.clearActivationCredentials({ platform: "openclaw", accountId });
+      params.log?.(`[${accountId}] clawchat-plugin-openclaw account removed; sqlite credentials cleared`);
+    } catch (err) {
+      params.log?.(
+        `[${accountId}] clawchat-plugin-openclaw account removed; sqlite clear failed: ${err instanceof Error ? err.message : String(err)}`,
+      );
+    }
   }
+  if (!params.stateDir) return;
+  const dir = livewareNamedAccountRootDir(params.stateDir, accountId);
+  if (dir === null) return;
+  const rm = params.rmFn ?? ((target: string) => fs.rmSync(target, { recursive: true, force: true }));
   try {
-    params.store.clearActivationCredentials({ platform: "openclaw", accountId });
-    params.log?.(`[${accountId}] clawchat-plugin-openclaw account removed; sqlite credentials cleared`);
+    rm(dir);
   } catch (err) {
     params.log?.(
-      `[${accountId}] clawchat-plugin-openclaw account removed; sqlite clear failed: ${err instanceof Error ? err.message : String(err)}`,
+      `[${accountId}] clawchat-plugin-openclaw account removed; liveware directory ${dir} not removed: ${err instanceof Error ? err.message : String(err)}`,
     );
   }
 }

package/src/channel.setup.ts

@@ -67,14 +67,23 @@ const configAdapter: typeof hybridConfigAdapter = {
    * `configured: true` again on the next gateway start. Clear the same keys
    * from the promoted entry so `--delete` actually deletes. Named ids are the
    * SDK's alone — it removes the whole `accounts.<id>` entry.
+   *
+   * Guard: a config with no channel section has nothing to clear, and the
+   * patch write would otherwise materialize an empty section out of nothing.
    */
   deleteAccount: (args) => {
     const next = hybridConfigAdapter.deleteAccount?.(args) ?? args.cfg;
     if (normalizeOpenclawClawlingAccountId(args.accountId) !== DEFAULT_ACCOUNT_ID) return next;
+    if (!hasOpenclawClawlingChannelSection(next)) return next;
     return patchOpenclawClawlingAccountSection(next, DEFAULT_ACCOUNT_ID, CLEAR_BASE_FIELDS_PATCH);
   },
 };
 
+function hasOpenclawClawlingChannelSection(cfg: OpenClawConfig): boolean {
+  const section = (cfg as { channels?: Record<string, unknown> }).channels?.[CHANNEL_ID];
+  return Boolean(section) && typeof section === "object" && !Array.isArray(section);
+}
+
 function readInviteCode(input: ChannelSetupInput): string {
   return typeof input.code === "string" && input.code.trim()
     ? input.code.trim()

package/src/channel.ts

@@ -38,8 +38,13 @@ export const openclawClawlingPlugin: ChannelPlugin<ResolvedOpenclawClawlingAccou
       lifecycle: {
         onAccountRemoved: ({ accountId, runtime }) => {
           let store: ReturnType<typeof getClawChatStore> | null = null;
+          let stateDir: string | undefined;
+          try {
+            stateDir = getOpenclawClawlingRuntime().state?.resolveStateDir?.();
+          } catch {
+            stateDir = undefined;
+          }
           try {
-            const stateDir = getOpenclawClawlingRuntime().state?.resolveStateDir?.();
             store = getClawChatStore({
               ...(stateDir ? { dbPath: clawChatDbPathForStateDir(stateDir) } : {}),
               log: { error: (message: string) => runtime.error(message) },
@@ -50,6 +55,7 @@ export const openclawClawlingPlugin: ChannelPlugin<ResolvedOpenclawClawlingAccou
           clearOpenclawClawlingAccountOnRemoval({
             accountId,
             store,
+            stateDir,
             log: (message) => runtime.log(message),
           });
         },

package/src/config.ts

@@ -342,7 +342,7 @@ function readChannelSection(cfg: OpenClawConfig): Record<string, unknown> {
 /** Keys that identify a ClawChat account. Never inherited by a named account from the root. */
 export const ACCOUNT_CREDENTIAL_KEYS = ["token", "refreshToken", "agentId", "userId", "ownerUserId"] as const;
 const ACCOUNT_MAP_KEYS = ["accounts", "defaultAccount"] as const;
-const NESTED_ACCOUNT_OBJECT_KEYS = ["reconnect", "heartbeat", "ack"];
+const NESTED_ACCOUNT_OBJECT_KEYS = ["reconnect", "heartbeat", "ack"] as const;
 
 /** Host-identical account id normalization (lowercase, `[^a-z0-9_-]` → `-`, blank → `default`). */
 export function normalizeOpenclawClawlingAccountId(value?: string | null): string {
@@ -381,7 +381,7 @@ export function readOpenclawClawlingAccountSection(
     channelConfig: root,
     accountConfig: entry ?? {},
     omitKeys,
-    nestedObjectKeys: NESTED_ACCOUNT_OBJECT_KEYS,
+    nestedObjectKeys: [...NESTED_ACCOUNT_OBJECT_KEYS],
   });
 }
 

package/src/liveware-cli.ts

@@ -37,6 +37,18 @@ function livewareAccountRoot(stateDir: string | undefined, accountId?: string |
     : path.join(root, "clawchat", "accounts", id);
 }
 
+/**
+ * Root of a NAMED account's private liveware state
+ * (`<stateDir>/clawchat/accounts/<id>`), the directory account removal
+ * deletes wholesale. Returns null for `default`, whose root is the shared
+ * `<stateDir>/clawchat` and must never be removed this way.
+ */
+export function livewareNamedAccountRootDir(stateDir: string, accountId?: string | null): string | null {
+  return normalizeOpenclawClawlingAccountId(accountId) === DEFAULT_ACCOUNT_ID
+    ? null
+    : livewareAccountRoot(stateDir, accountId);
+}
+
 /**
  * Private HOME for the liveware CLI: `<stateDir>/clawchat/liveware-home` for
  * the default account, `<stateDir>/clawchat/accounts/<id>/liveware-home` for a

package/src/liveware-sample.ts

@@ -716,9 +716,10 @@ export type LivewareSampleSupervisorDeps = {
   ref?: string;
   spawnFn?: SpawnLike;
   execFileFn?: ExecFileLike;
-  /** Private HOME for the liveware CLI (`livewareCliHomeDir(stateDir)`), so two
-   * instances on one host do not share `$HOME/.clawling`. Absent → the CLI
-   * inherits the ambient HOME, which is the pre-isolation behavior. */
+  /** Private HOME for the liveware CLI (`livewareCliHomeDir(stateDir, accountId)`),
+   * so two instances on one host — or two accounts in one gateway — do not
+   * share `$HOME/.clawling`. Absent → the CLI inherits the ambient HOME, which
+   * is the pre-isolation behavior. */
   cliHome?: string;
   probePortFn?: ProbePortLike;
   log?: LivewareLogger;

package/src/login.runtime.ts

@@ -3,7 +3,7 @@ import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
 import { createOpenclawClawlingApiClient } from "./api-client.ts";
 import { ClawlingApiError, type AgentConnectResult } from "./api-types.ts";
 import { resolvePluginVersion } from "./plugin-report.ts";
-import { patchOpenclawClawlingAccountSection } from "./account-config-writes.ts";
+import { openclawClawlingAccountSlotPath, patchOpenclawClawlingAccountSection } from "./account-config-writes.ts";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/setup";
 import {
   CHANNEL_ID,
@@ -408,9 +408,7 @@ export async function runOpenclawClawlingLogin(params: LoginParams): Promise<voi
       : {}),
   };
 
-  const configPath = accountId === DEFAULT_ACCOUNT_ID
-    ? `channels.${CHANNEL_ID}`
-    : `channels.${CHANNEL_ID}.accounts.${accountId}`;
+  const configPath = openclawClawlingAccountSlotPath(params.cfg, accountId);
   runtime.log(
     `Updating config: ${configPath}.token=[REDACTED] agentId=${normalizedResult.agent.id || "-"} userId=${normalizedResult.agent.user_id} ownerUserId=${normalizedResult.agent.owner_id}${
       normalizedResult.refresh_token ? " refreshToken=[REDACTED]" : ""