@newbase-clawchat/openclaw-clawchat 2026.5.4 → 2026.5.12-13

package/src/login.runtime.test.ts

@@ -30,7 +30,7 @@ describe("runOpenclawClawlingLogin", () => {
   it("works with no prior setup (baseUrl / websocketUrl default built-in)", async () => {
     const cfg = buildCfg({}); // empty section — resolver provides defaults
     const agentsConnect = vi.fn().mockResolvedValue({
-      agent: { user_id: "u" },
+      agent: { user_id: "u", owner_id: "owner-u" },
       access_token: "t",
       refresh_token: "r",
     });
@@ -102,9 +102,12 @@ describe("runOpenclawClawlingLogin", () => {
     expect(persistConfig).toHaveBeenCalledTimes(1);
     const savedCfg = persistConfig.mock.calls[0]![0] as OpenClawConfig;
     const section = (savedCfg.channels as Record<string, Record<string, unknown>>)[CHANNEL_ID]!;
+    expect((savedCfg.plugins as { allow?: string[] })?.allow).toEqual([CHANNEL_ID]);
     expect(section.token).toBe("access-tok");
     expect(section.refreshToken).toBe("refresh-tok");
     expect(section.userId).toBe("agent-123");
+    expect(section.ownerUserId).toBe("owner-1");
+    expect(section.groupMode).toBe("all");
     // Existing baseUrl and websocketUrl are preserved — agents/connect
     // does not return them.
     expect(section.baseUrl).toBe("https://api.example.com");
@@ -112,19 +115,64 @@ describe("runOpenclawClawlingLogin", () => {
     expect(log).toHaveBeenCalledWith(expect.stringContaining("login succeeded"));
   });
 
-  it("uses the runtime config mutator with auto reload intent for config writes", async () => {
+  it("persists latest activation bootstrap metadata to the sqlite store after config write", async () => {
     const cfg = buildCfg({
       baseUrl: "https://api.example.com",
       websocketUrl: "wss://ws.example.com/v2/client",
     });
     const agentsConnect = vi.fn().mockResolvedValue({
-      agent: { user_id: "agent-123", nickname: "Bot" },
+      agent: { user_id: "agent-123", owner_id: "owner-123", nickname: "Bot" },
+      access_token: "access-plain",
+      refresh_token: "refresh-plain",
+      conversation: { id: "conv-activation" },
+    });
+    const persistConfig = vi.fn();
+    const upsertActivation = vi.fn();
+
+    await runOpenclawClawlingLogin({
+      cfg,
+      runtime: { log: vi.fn() },
+      readInviteCode: async () => "INV-ABC",
+      apiClientFactory: () => makeApiClient({ agentsConnect }),
+      persistConfig,
+      store: { upsertActivation },
+    });
+
+    expect(upsertActivation).toHaveBeenCalledTimes(1);
+    expect(persistConfig.mock.invocationCallOrder[0]).toBeLessThan(
+      upsertActivation.mock.invocationCallOrder[0],
+    );
+    expect(upsertActivation).toHaveBeenCalledWith({
+      platform: "openclaw",
+      accountId: "default",
+      userId: "agent-123",
+      ownerUserId: "owner-123",
+      conversationId: "conv-activation",
+      loginMethod: "login",
+    });
+    expect(upsertActivation.mock.calls[0]![0]).not.toHaveProperty("accessToken");
+    expect(upsertActivation.mock.calls[0]![0]).not.toHaveProperty("refreshToken");
+    expect(upsertActivation.mock.calls[0]![0]).not.toHaveProperty("baseUrl");
+    expect(upsertActivation.mock.calls[0]![0]).not.toHaveProperty("websocketUrl");
+  });
+
+  it("uses the runtime config mutator with restart intent after credential writes", async () => {
+    const cfg = buildCfg({
+      baseUrl: "https://api.example.com",
+      websocketUrl: "wss://ws.example.com/v2/client",
+    });
+    const agentsConnect = vi.fn().mockResolvedValue({
+      agent: { user_id: "agent-123", owner_id: "owner-123", nickname: "Bot" },
       access_token: "access-tok",
       refresh_token: "refresh-tok",
     });
     let mutatedCfg: OpenClawConfig | undefined;
+    const log = vi.fn();
     const mutateConfigFile = vi.fn(async (params) => {
-      expect(params.afterWrite).toEqual({ mode: "auto" });
+      expect(params.afterWrite).toEqual({
+        mode: "restart",
+        reason: "openclaw-clawchat credentials changed",
+      });
       const draft = structuredClone(cfg) as OpenClawConfig;
       await params.mutate(draft, { snapshot: {} as never, previousHash: "before" });
       mutatedCfg = draft;
@@ -133,7 +181,7 @@ describe("runOpenclawClawlingLogin", () => {
 
     await runOpenclawClawlingLogin({
       cfg,
-      runtime: { log: vi.fn() },
+      runtime: { log },
       readInviteCode: async () => "INV-ABC",
       apiClientFactory: () => makeApiClient({ agentsConnect }),
       mutateConfigFile,
@@ -146,6 +194,19 @@ describe("runOpenclawClawlingLogin", () => {
     expect(section.token).toBe("access-tok");
     expect(section.refreshToken).toBe("refresh-tok");
     expect(section.userId).toBe("agent-123");
+    expect(section.ownerUserId).toBe("owner-123");
+    expect(section.groupMode).toBe("all");
+    const plugins = (mutatedCfg! as OpenClawConfig & {
+      plugins: { allow?: string[]; entries: Record<string, Record<string, unknown>> };
+    }).plugins;
+    expect(plugins.allow).toEqual([CHANNEL_ID]);
+    expect(plugins.entries[CHANNEL_ID]?.enabled).toBe(true);
+    expect(log).toHaveBeenCalledWith(
+      expect.stringContaining("Persisting ClawChat credentials and plugin activation"),
+    );
+    expect(log).toHaveBeenCalledWith(
+      expect.stringContaining("ClawChat credentials and plugin activation persisted"),
+    );
   });
 
   it("preserves other configured channels when persisting ClawChat credentials", async () => {
@@ -162,7 +223,7 @@ describe("runOpenclawClawlingLogin", () => {
       },
     } as unknown as OpenClawConfig;
     const agentsConnect = vi.fn().mockResolvedValue({
-      agent: { user_id: "agent-123" },
+      agent: { user_id: "agent-123", owner_id: "owner-123" },
       access_token: "access-tok",
       refresh_token: "refresh-tok",
     });
@@ -186,6 +247,7 @@ describe("runOpenclawClawlingLogin", () => {
       websocketUrl: "wss://ws.example.com/v2/client",
       token: "access-tok",
       userId: "agent-123",
+      ownerUserId: "owner-123",
       refreshToken: "refresh-tok",
     });
   });
@@ -196,7 +258,7 @@ describe("runOpenclawClawlingLogin", () => {
       baseUrl: "https://api.example.com",
     });
     const agentsConnect = vi.fn().mockResolvedValue({
-      agent: { user_id: "agent-123" },
+      agent: { user_id: "agent-123", owner_id: "owner-123" },
       access_token: "access-tok",
       refresh_token: "refresh-tok",
     });
@@ -215,6 +277,63 @@ describe("runOpenclawClawlingLogin", () => {
     expect(section.enabled).toBe(true);
     expect(section.token).toBe("access-tok");
     expect(section.userId).toBe("agent-123");
+    expect(section.ownerUserId).toBe("owner-123");
+    expect(section.groupMode).toBe("all");
+  });
+
+  it("does not overwrite an explicit mention groupMode during login", async () => {
+    const cfg = buildCfg({
+      baseUrl: "https://api.example.com",
+      groupMode: "mention",
+    });
+    const agentsConnect = vi.fn().mockResolvedValue({
+      agent: { user_id: "agent-123", owner_id: "owner-123" },
+      access_token: "access-tok",
+      refresh_token: "refresh-tok",
+    });
+    const persistConfig = vi.fn();
+
+    await runOpenclawClawlingLogin({
+      cfg,
+      runtime: { log: vi.fn() },
+      readInviteCode: async () => "INV-ABC",
+      apiClientFactory: () => makeApiClient({ agentsConnect }),
+      persistConfig,
+    });
+
+    const savedCfg = persistConfig.mock.calls[0]![0] as OpenClawConfig;
+    const section = (savedCfg.channels as Record<string, Record<string, unknown>>)[CHANNEL_ID]!;
+    expect(section.groupMode).toBe("mention");
+  });
+
+  it("does not overwrite per-group groupMode settings during login", async () => {
+    const cfg = buildCfg({
+      baseUrl: "https://api.example.com",
+      groupMode: "all",
+      groups: {
+        "group-quiet": { groupMode: "mention" },
+      },
+    });
+    const agentsConnect = vi.fn().mockResolvedValue({
+      agent: { user_id: "agent-123", owner_id: "owner-123" },
+      access_token: "access-tok",
+      refresh_token: "refresh-tok",
+    });
+    const persistConfig = vi.fn();
+
+    await runOpenclawClawlingLogin({
+      cfg,
+      runtime: { log: vi.fn() },
+      readInviteCode: async () => "INV-ABC",
+      apiClientFactory: () => makeApiClient({ agentsConnect }),
+      persistConfig,
+    });
+
+    const savedCfg = persistConfig.mock.calls[0]![0] as OpenClawConfig;
+    const section = (savedCfg.channels as Record<string, Record<string, unknown>>)[CHANNEL_ID]!;
+    expect(section.groups).toEqual({
+      "group-quiet": { groupMode: "mention" },
+    });
   });
 
   it("allows openclaw-clawchat plugin tools after successful login without replacing policy", async () => {
@@ -228,7 +347,7 @@ describe("runOpenclawClawlingLogin", () => {
       },
     } as unknown as OpenClawConfig;
     const agentsConnect = vi.fn().mockResolvedValue({
-      agent: { user_id: "agent-123" },
+      agent: { user_id: "agent-123", owner_id: "owner-123" },
       access_token: "access-tok",
       refresh_token: "refresh-tok",
     });
@@ -251,6 +370,46 @@ describe("runOpenclawClawlingLogin", () => {
     });
   });
 
+  it("enables the runtime plugin entry after successful login without replacing plugin config", async () => {
+    const cfg = {
+      ...buildCfg({ baseUrl: "https://api.example.com" }),
+      plugins: {
+        allow: ["browser"],
+        entries: {
+          [CHANNEL_ID]: {
+            enabled: false,
+            config: { keep: true },
+            hooks: { allowConversationAccess: true },
+          },
+        },
+      },
+    } as unknown as OpenClawConfig;
+    const agentsConnect = vi.fn().mockResolvedValue({
+      agent: { user_id: "agent-123", owner_id: "owner-123" },
+      access_token: "access-tok",
+      refresh_token: "refresh-tok",
+    });
+    const persistConfig = vi.fn();
+
+    await runOpenclawClawlingLogin({
+      cfg,
+      runtime: { log: vi.fn() },
+      readInviteCode: async () => "INV-ABC",
+      apiClientFactory: () => makeApiClient({ agentsConnect }),
+      persistConfig,
+    });
+
+    const savedCfg = persistConfig.mock.calls[0]![0] as OpenClawConfig & {
+      plugins: { allow?: string[]; entries: Record<string, Record<string, unknown>> };
+    };
+    expect(savedCfg.plugins.allow).toEqual(["browser", "openclaw-clawchat"]);
+    expect(savedCfg.plugins.entries[CHANNEL_ID]).toEqual({
+      enabled: true,
+      config: { keep: true },
+      hooks: { allowConversationAccess: true },
+    });
+  });
+
   it("surfaces agents/connect API errors with the kind and message", async () => {
     const cfg = buildCfg({ baseUrl: "https://api.example.com" });
     const agentsConnect = vi.fn().mockRejectedValue(
@@ -270,9 +429,118 @@ describe("runOpenclawClawlingLogin", () => {
   it("rejects responses that omit required fields", async () => {
     const cfg = buildCfg({ baseUrl: "https://api.example.com" });
     const agentsConnect = vi.fn().mockResolvedValue({
-      agent: { user_id: "" },
+      agent: { user_id: "", owner_id: "owner-123" },
+      access_token: "t",
+      refresh_token: "r",
+    });
+    await expect(
+      runOpenclawClawlingLogin({
+        cfg,
+        runtime: { log: vi.fn() },
+        readInviteCode: async () => "ok",
+        apiClientFactory: () => makeApiClient({ agentsConnect }),
+        persistConfig: vi.fn(),
+      }),
+    ).rejects.toThrow(/missing required fields/);
+  });
+
+  it("rejects whitespace-only required agents/connect response fields", async () => {
+    const cfg = buildCfg({ baseUrl: "https://api.example.com" });
+    const agentsConnect = vi.fn().mockResolvedValue({
+      agent: { user_id: "   ", owner_id: "owner-123" },
+      access_token: "t",
+      refresh_token: "r",
+    });
+    await expect(
+      runOpenclawClawlingLogin({
+        cfg,
+        runtime: { log: vi.fn() },
+        readInviteCode: async () => "ok",
+        apiClientFactory: () => makeApiClient({ agentsConnect }),
+        persistConfig: vi.fn(),
+      }),
+    ).rejects.toThrow(/missing required fields/);
+  });
+
+  it("rejects whitespace-only agents/connect access tokens", async () => {
+    const cfg = buildCfg({ baseUrl: "https://api.example.com" });
+    const agentsConnect = vi.fn().mockResolvedValue({
+      agent: { user_id: "agent-123", owner_id: "owner-123" },
+      access_token: "   ",
+      refresh_token: "r",
+    });
+    await expect(
+      runOpenclawClawlingLogin({
+        cfg,
+        runtime: { log: vi.fn() },
+        readInviteCode: async () => "ok",
+        apiClientFactory: () => makeApiClient({ agentsConnect }),
+        persistConfig: vi.fn(),
+      }),
+    ).rejects.toThrow(/access_token/);
+  });
+
+  it("rejects agents/connect responses that omit agent owner ids", async () => {
+    const cfg = buildCfg({ baseUrl: "https://api.example.com" });
+    const agentsConnect = vi.fn().mockResolvedValue({
+      agent: { user_id: "agent-123" },
+      access_token: "t",
+      refresh_token: "r",
+    });
+    await expect(
+      runOpenclawClawlingLogin({
+        cfg,
+        runtime: { log: vi.fn() },
+        readInviteCode: async () => "ok",
+        apiClientFactory: () => makeApiClient({ agentsConnect }),
+        persistConfig: vi.fn(),
+      }),
+    ).rejects.toThrow(/agent\.owner_id/);
+  });
+
+  it("rejects empty returned agent owner ids", async () => {
+    const cfg = buildCfg({ baseUrl: "https://api.example.com" });
+    const agentsConnect = vi.fn().mockResolvedValue({
+      agent: { user_id: "agent-123", owner_id: "" },
+      access_token: "t",
+      refresh_token: "r",
+    });
+    await expect(
+      runOpenclawClawlingLogin({
+        cfg,
+        runtime: { log: vi.fn() },
+        readInviteCode: async () => "ok",
+        apiClientFactory: () => makeApiClient({ agentsConnect }),
+        persistConfig: vi.fn(),
+      }),
+    ).rejects.toThrow(/agent\.owner_id/);
+  });
+
+  it("rejects whitespace-only returned agent owner ids", async () => {
+    const cfg = buildCfg({ baseUrl: "https://api.example.com" });
+    const agentsConnect = vi.fn().mockResolvedValue({
+      agent: { user_id: "agent-123", owner_id: "   " },
+      access_token: "t",
+      refresh_token: "r",
+    });
+    await expect(
+      runOpenclawClawlingLogin({
+        cfg,
+        runtime: { log: vi.fn() },
+        readInviteCode: async () => "ok",
+        apiClientFactory: () => makeApiClient({ agentsConnect }),
+        persistConfig: vi.fn(),
+      }),
+    ).rejects.toThrow(/missing required fields/);
+  });
+
+  it("rejects whitespace-only activation conversation ids when present", async () => {
+    const cfg = buildCfg({ baseUrl: "https://api.example.com" });
+    const agentsConnect = vi.fn().mockResolvedValue({
+      agent: { user_id: "agent-123", owner_id: "owner-123" },
       access_token: "t",
       refresh_token: "r",
+      conversation: { id: "   " },
     });
     await expect(
       runOpenclawClawlingLogin({
@@ -285,13 +553,76 @@ describe("runOpenclawClawlingLogin", () => {
     ).rejects.toThrow(/missing required fields/);
   });
 
+  it("trims persisted agents/connect credentials and activation conversation id", async () => {
+    const cfg = buildCfg({ baseUrl: "https://api.example.com" });
+    const agentsConnect = vi.fn().mockResolvedValue({
+      agent: { user_id: "  agent-123  ", owner_id: "  owner-123  ", nickname: "Bot" },
+      access_token: "  access-tok  ",
+      refresh_token: "  refresh-tok  ",
+      conversation: { id: "  conv-activation  " },
+    });
+    const persistConfig = vi.fn();
+    const upsertActivation = vi.fn();
+
+    await runOpenclawClawlingLogin({
+      cfg,
+      runtime: { log: vi.fn() },
+      readInviteCode: async () => "ok",
+      apiClientFactory: () => makeApiClient({ agentsConnect }),
+      persistConfig,
+      store: { upsertActivation },
+    });
+
+    const savedCfg = persistConfig.mock.calls[0]![0] as OpenClawConfig;
+    const section = (savedCfg.channels as Record<string, Record<string, unknown>>)[CHANNEL_ID]!;
+    expect(section.token).toBe("access-tok");
+    expect(section.refreshToken).toBe("refresh-tok");
+    expect(section.userId).toBe("agent-123");
+    expect(section.ownerUserId).toBe("owner-123");
+    expect(upsertActivation).toHaveBeenCalledWith({
+      platform: "openclaw",
+      accountId: "default",
+      userId: "agent-123",
+      ownerUserId: "owner-123",
+      conversationId: "conv-activation",
+      loginMethod: "login",
+    });
+  });
+
+  it("does not preserve a stale refresh token when agents/connect returns a blank refresh token", async () => {
+    const cfg = buildCfg({
+      baseUrl: "https://api.example.com",
+      refreshToken: "stale-refresh",
+    });
+    const agentsConnect = vi.fn().mockResolvedValue({
+      agent: { user_id: "agent-123", owner_id: "owner-123" },
+      access_token: "access-tok",
+      refresh_token: "   ",
+    });
+    const persistConfig = vi.fn();
+
+    await runOpenclawClawlingLogin({
+      cfg,
+      runtime: { log: vi.fn() },
+      readInviteCode: async () => "ok",
+      apiClientFactory: () => makeApiClient({ agentsConnect }),
+      persistConfig,
+    });
+
+    const savedCfg = persistConfig.mock.calls[0]![0] as OpenClawConfig;
+    const section = (savedCfg.channels as Record<string, Record<string, unknown>>)[CHANNEL_ID]!;
+    expect(section.token).toBe("access-tok");
+    expect(section.userId).toBe("agent-123");
+    expect(section.refreshToken).toBeUndefined();
+  });
+
   it("persists the config automatically after receiving the token (no further prompts)", async () => {
     const cfg = buildCfg({
       baseUrl: "https://api.example.com",
       websocketUrl: "wss://ws.example.com",
     });
     const agentsConnect = vi.fn().mockResolvedValue({
-      agent: { user_id: "agent-9", nickname: "Nine" },
+      agent: { user_id: "agent-9", owner_id: "owner-9", nickname: "Nine" },
       access_token: "ACC-0123456789",
       refresh_token: "REF-xyz",
     });
@@ -311,6 +642,7 @@ describe("runOpenclawClawlingLogin", () => {
     const section = (persistCalls[0]!.channels as Record<string, Record<string, unknown>>)[CHANNEL_ID]!;
     expect(section.token).toBe("ACC-0123456789");
     expect(section.userId).toBe("agent-9");
+    expect(section.ownerUserId).toBe("owner-9");
     expect(section.refreshToken).toBe("REF-xyz");
     // Existing URL fields are preserved.
     expect(section.baseUrl).toBe("https://api.example.com");
@@ -320,12 +652,13 @@ describe("runOpenclawClawlingLogin", () => {
     expect(logMessages.some((m) => /Config file updated/.test(m))).toBe(true);
     // Token in logs is redacted.
     expect(logMessages.every((m) => !m.includes("ACC-0123456789"))).toBe(true);
+    expect(logMessages.every((m) => !m.includes("ACC-") && !m.includes("6789"))).toBe(true);
   });
 
   it("login logs don't leak the /agents/connect endpoint path or base URL", async () => {
     const cfg = buildCfg({ baseUrl: "https://api.example.com" });
     const agentsConnect = vi.fn().mockResolvedValue({
-      agent: { user_id: "u" },
+      agent: { user_id: "u", owner_id: "owner-u" },
       access_token: "t",
       refresh_token: "r",
     });
@@ -346,7 +679,7 @@ describe("runOpenclawClawlingLogin", () => {
   it("trims the invite code before sending", async () => {
     const cfg = buildCfg({ baseUrl: "https://api.example.com" });
     const agentsConnect = vi.fn().mockResolvedValue({
-      agent: { user_id: "u" },
+      agent: { user_id: "u", owner_id: "owner-u" },
       access_token: "t",
       refresh_token: "r",
     });
@@ -369,7 +702,7 @@ describe("runOpenclawClawlingLogin (non-interactive via readInviteCode)", () =>
   it("performs a full login when called with a fixed readInviteCode (programmatic path)", async () => {
     const cfg = buildCfg({ baseUrl: "https://api.example.com" });
     const agentsConnect = vi.fn().mockResolvedValue({
-      agent: { user_id: "agent-7", nickname: "Seven" },
+      agent: { user_id: "agent-7", owner_id: "owner-7", nickname: "Seven" },
       access_token: "acc-non-interactive",
       refresh_token: "ref-ni",
     });
@@ -391,6 +724,7 @@ describe("runOpenclawClawlingLogin (non-interactive via readInviteCode)", () =>
       ["openclaw-clawchat"] as Record<string, unknown>;
     expect(section.token).toBe("acc-non-interactive");
     expect(section.userId).toBe("agent-7");
+    expect(section.ownerUserId).toBe("owner-7");
     expect(section.refreshToken).toBe("ref-ni");
   });
 });