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

package/src/runtime.ts

@@ -19,7 +19,12 @@ import { createOpenclawClawlingApiClient } from "./api-client.ts";
 import { buildActivationBootstrapText } from "./activation-greeting.ts";
 import { reportPluginVersionSafe, resolvePluginVersion } from "./plugin-report.ts";
 import path from "node:path";
-import { ensureLivewareCli, livewareCliHomeDir, resolveLivewarePath } from "./liveware-cli.ts";
+import {
+  ensureLivewareCli,
+  livewareCliHomeDir,
+  livewareSampleRootDir,
+  resolveLivewarePath,
+} from "./liveware-cli.ts";
 import {
   LivewareSampleSupervisor,
   type LivewareSampleStoreLike,
@@ -38,10 +43,14 @@ import {
   effectiveGroupCommandMode,
   effectiveGroupMode,
   hasOpenclawClawlingConnectCredentials,
+  normalizeOpenclawClawlingAccountId,
+  readOpenclawClawlingAccountSection,
   resolveOpenclawClawlingAccount,
   type ResolvedOpenclawClawlingAccount,
   CLAWCHAT_REFRESH_TOKEN_ENV,
 } from "./config.ts";
+import { patchOpenclawClawlingAccountSection } from "./account-config-writes.ts";
+import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/setup";
 import { isValidChatId, type ClawlingChatClient } from "./ws-client.ts";
 import { dispatchOpenclawClawlingInbound, type IngestTurnParams } from "./inbound.ts";
 import {
@@ -234,21 +243,24 @@ export function classifyHelloFailReason(
   return "generic";
 }
 
-/** Read `channels.<CHANNEL_ID>.refreshToken` from a live config, or null. */
 /**
- * The refresh token paired with the configured access token. Channel config
- * `refreshToken` wins. `CLAWCHAT_REFRESH_TOKEN` (declared in the manifest's
- * `channelEnvVars`) is honoured ONLY when the channel config carries no `token`
- * of its own — i.e. when the access token itself came from `CLAWCHAT_TOKEN` —
- * so an env-provisioned pair can rotate, while a login-written config token is
- * never paired with a stray refresh token left in the environment.
+ * The refresh token paired with the account's access token. The account
+ * section's `refreshToken` wins. `CLAWCHAT_REFRESH_TOKEN` is process-wide, so
+ * it is honoured ONLY for the default account and ONLY when that section
+ * carries no `token` of its own (i.e. the access token itself came from
+ * `CLAWCHAT_TOKEN`) — an env-provisioned pair can rotate, while a login-written
+ * token is never paired with a stray refresh token left in the environment.
  */
-function readConfigRefreshToken(cfg: OpenClawConfig, env: NodeJS.ProcessEnv = process.env): string | null {
-  const channels = (cfg as { channels?: Record<string, unknown> }).channels;
-  const channel = isRecord(channels) ? channels[CHANNEL_ID] : undefined;
-  const refreshToken = isRecord(channel) ? channel.refreshToken : undefined;
+function readConfigRefreshToken(
+  cfg: OpenClawConfig,
+  accountId: string,
+  env: NodeJS.ProcessEnv = process.env,
+): string | null {
+  const section = readOpenclawClawlingAccountSection(cfg, accountId);
+  const refreshToken = section.refreshToken;
   if (typeof refreshToken === "string" && refreshToken.trim()) return refreshToken.trim();
-  const configToken = isRecord(channel) ? channel.token : undefined;
+  if (normalizeOpenclawClawlingAccountId(accountId) !== DEFAULT_ACCOUNT_ID) return null;
+  const configToken = section.token;
   if (typeof configToken === "string" && configToken.trim()) return null;
   const envRefreshToken = env[CLAWCHAT_REFRESH_TOKEN_ENV];
   return typeof envRefreshToken === "string" && envRefreshToken.trim() ? envRefreshToken.trim() : null;
@@ -697,7 +709,7 @@ export interface AutoActivateFromEnvParams {
   /** Test seam — login implementation. */
   runLogin?: (params: LoginParams) => Promise<void>;
   /** Test seam — account resolver applied to the (mutated) cfg after login. */
-  resolveAccount?: (cfg: OpenClawConfig) => ResolvedOpenclawClawlingAccount;
+  resolveAccount?: (cfg: OpenClawConfig, accountId?: string | null) => ResolvedOpenclawClawlingAccount;
 }
 
 /**
@@ -714,6 +726,14 @@ export async function maybeAutoActivateFromEnv(
 ): Promise<ResolvedOpenclawClawlingAccount> {
   const code = (params.connectCode ?? "").trim();
   if (!code) return params.account;
+  // The env var is process-wide: it can only ever describe ONE identity, and
+  // that is the default account. A named account never redeems it.
+  if (normalizeOpenclawClawlingAccountId(params.account.accountId) !== DEFAULT_ACCOUNT_ID) {
+    params.log?.info?.(
+      `[${params.account.accountId}] clawchat-plugin-openclaw ${CONNECT_CODE_ENV} present but ignored: env activation is for the default account only`,
+    );
+    return params.account;
+  }
   if (accountHasConnectCredentials(params.account)) return params.account;
   const accountId = params.account.accountId;
   const stored = params.store?.getActivationCredentials?.({ platform: "openclaw", accountId });
@@ -750,7 +770,7 @@ export async function maybeAutoActivateFromEnv(
     );
     return params.account;
   }
-  const next = resolveAccount(params.cfg);
+  const next = resolveAccount(params.cfg, accountId);
   params.log?.info?.(
     `[${accountId}] clawchat-plugin-openclaw ${CONNECT_CODE_ENV} activation succeeded hasToken=${Boolean(next.token)}`,
   );
@@ -1098,7 +1118,7 @@ export async function startOpenclawClawlingGateway(params: StartGatewayParams):
         userId: account.userId,
         ownerUserId: account.ownerUserId,
         accessToken: account.token,
-        refreshToken: readConfigRefreshToken(cfg),
+        refreshToken: readConfigRefreshToken(cfg, accountId),
         loginMethod: "config-seed",
         deviceId: CHANNEL_ID,
       });
@@ -1186,13 +1206,16 @@ export async function startOpenclawClawlingGateway(params: StartGatewayParams):
       // `RuntimeConnectionStore` only `Pick`s a subset of its methods, so widen
       // through the structural `LivewareSampleStoreLike` contract (Task 8/4).
       store: store as unknown as LivewareSampleStoreLike,
-      sampleRoot: path.join(stateDirForSample ?? "", "clawchat", "liveware-sample"),
+      // Per account: two supervisors in one process otherwise install, swap and
+      // delete inside the SAME `app/` tree. `default` keeps the legacy path.
+      sampleRoot: livewareSampleRootDir(stateDirForSample ?? "", accountId),
       resolveToken: () => account.token ?? "",
       resolveAgentUserId: () => account.userId ?? null,
       resolveLivewarePath: () => resolveLivewarePath(stateDirForSample),
-      // Per-instance HOME for the liveware CLI: its credentials otherwise live
-      // in the host-global `$HOME/.clawling`, which a second profile clobbers.
-      cliHome: livewareCliHomeDir(stateDirForSample),
+      // Per-instance AND per-account HOME for the liveware CLI: its credentials
+      // otherwise live in the host-global `$HOME/.clawling`, which a second
+      // profile — or a second account in this very process — clobbers.
+      cliHome: livewareCliHomeDir(stateDirForSample, accountId),
       cliReady: livewareCliReady,
       listApps: async () => {
         const client = getConversationApiClient();
@@ -1246,7 +1269,7 @@ export async function startOpenclawClawlingGateway(params: StartGatewayParams):
       : undefined;
   };
 
-  // §0/§C.1 — write the channel-config `token`/`refreshToken` keys. `tokens=null`
+  // §0/§C.1 — write the account slot's `token`/`refreshToken` keys. `tokens=null`
   // blanks them (auto-logout); otherwise persists the rotated pair.
   const persistConfigTokens = async (
     tokens: { accessToken: string; refreshToken: string } | null,
@@ -1261,20 +1284,13 @@ export async function startOpenclawClawlingGateway(params: StartGatewayParams):
     await mutateConfigFile({
       afterWrite: { mode: "none", reason: "clawchat-plugin-openclaw token refresh" },
       mutate(draft) {
-        const channels = ((draft as { channels?: Record<string, unknown> }).channels ?? {}) as Record<
-          string,
-          unknown
-        >;
-        const existing = (channels[CHANNEL_ID] ?? {}) as Record<string, unknown>;
-        const nextSection: Record<string, unknown> = {
-          ...existing,
-          token: tokens ? tokens.accessToken : "",
-          refreshToken: tokens ? tokens.refreshToken : "",
-        };
-        Object.assign(draft, {
-          ...draft,
-          channels: { ...channels, [CHANNEL_ID]: nextSection },
-        });
+        Object.assign(
+          draft,
+          patchOpenclawClawlingAccountSection(draft, accountId, {
+            token: tokens ? tokens.accessToken : "",
+            refreshToken: tokens ? tokens.refreshToken : "",
+          }),
+        );
       },
     });
   };
@@ -1375,7 +1391,7 @@ export async function startOpenclawClawlingGateway(params: StartGatewayParams):
     (activationAccount.source === "sqlite" && store?.getActivationCredentials
       ? store.getActivationCredentials({ platform: "openclaw", accountId })?.refreshToken
       : null) ??
-    readConfigRefreshToken(cfg);
+    readConfigRefreshToken(cfg, accountId);
 
   const refreshManager = new RefreshManager({
     baseUrl: account.baseUrl,