fix(web): QA fixes on users settings page (MS21-UI-001-QA)

Reviewed-on: #597

apps/web/src/app/(authenticated)/settings/users/page.test.tsx

@@ -1,17 +1,19 @@
 import type { ReactElement, ReactNode } from "react";
 
 import { WorkspaceMemberRole } from "@mosaic/shared";
-import { render, screen, waitFor } from "@testing-library/react";
+import { render, screen, waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
 import {
+  type AdminUser,
   deactivateUser,
   fetchAdminUsers,
   inviteUser,
   updateUser,
   type AdminUsersResponse,
 } from "@/lib/api/admin";
+import { useAuth } from "@/lib/auth/auth-context";
 import { fetchUserWorkspaces, updateWorkspaceMemberRole } from "@/lib/api/workspaces";
 import UsersSettingsPage from "./page";
 
@@ -39,48 +41,80 @@ vi.mock("@/lib/api/workspaces", () => ({
   updateWorkspaceMemberRole: vi.fn(),
 }));
 
+vi.mock("@/lib/auth/auth-context", () => ({
+  useAuth: vi.fn(),
+}));
+
 const fetchAdminUsersMock = vi.mocked(fetchAdminUsers);
 const inviteUserMock = vi.mocked(inviteUser);
 const updateUserMock = vi.mocked(updateUser);
 const deactivateUserMock = vi.mocked(deactivateUser);
 const fetchUserWorkspacesMock = vi.mocked(fetchUserWorkspaces);
 const updateWorkspaceMemberRoleMock = vi.mocked(updateWorkspaceMemberRole);
+const useAuthMock = vi.mocked(useAuth);
 
-const adminUsersResponse: AdminUsersResponse = {
+function makeAdminUser(overrides?: Partial<AdminUser>): AdminUser {
-  data: [
+  return {
-    {
+    id: "user-1",
-      id: "user-1",
+    name: "Alice",
-      name: "Alice",
+    email: "alice@example.com",
-      email: "alice@example.com",
+    emailVerified: true,
-      emailVerified: true,
+    image: null,
-      image: null,
+    createdAt: "2026-01-01T00:00:00.000Z",
-      createdAt: "2026-01-01T00:00:00.000Z",
+    deactivatedAt: null,
-      deactivatedAt: null,
+    isLocalAuth: false,
-      isLocalAuth: false,
+    invitedAt: null,
-      invitedAt: null,
+    invitedBy: null,
-      invitedBy: null,
+    workspaceMemberships: [
-      workspaceMemberships: [
+      {
-        {
+        workspaceId: "workspace-1",
-          workspaceId: "workspace-1",
+        workspaceName: "Personal Workspace",
-          workspaceName: "Personal Workspace",
+        role: WorkspaceMemberRole.ADMIN,
-          role: WorkspaceMemberRole.ADMIN,
+        joinedAt: "2026-01-01T00:00:00.000Z",
-          joinedAt: "2026-01-01T00:00:00.000Z",
+      },
-        },
+    ],
-      ],
+    ...overrides,
+  };
+}
+
+function makeAdminUsersResponse(options?: {
+  data?: AdminUser[];
+  page?: number;
+  totalPages?: number;
+  total?: number;
+  limit?: number;
+}): AdminUsersResponse {
+  const data = options?.data ?? [makeAdminUser()];
+  return {
+    data,
+    meta: {
+      total: options?.total ?? data.length,
+      page: options?.page ?? 1,
+      limit: options?.limit ?? 50,
+      totalPages: options?.totalPages ?? 1,
     },
-  ],
+  };
-  meta: {
+}
-    total: 1,
+
-    page: 1,
+function makeAuthState(userId: string): ReturnType<typeof useAuth> {
-    limit: 50,
+  return {
-    totalPages: 1,
+    user: { id: userId, email: `${userId}@example.com`, name: "Current User" },
-  },
+    isLoading: false,
-};
+    isAuthenticated: true,
+    authError: null,
+    sessionExpiring: false,
+    sessionMinutesRemaining: 0,
+    signOut: vi.fn(() => Promise.resolve()),
+    refreshSession: vi.fn(() => Promise.resolve()),
+  };
+}
 
 describe("UsersSettingsPage", () => {
   beforeEach(() => {
     vi.clearAllMocks();
 
+    const adminUsersResponse = makeAdminUsersResponse();
+
     fetchAdminUsersMock.mockResolvedValue(adminUsersResponse);
     fetchUserWorkspacesMock.mockResolvedValue([
       {
@@ -97,10 +131,7 @@ describe("UsersSettingsPage", () => {
       email: "new@example.com",
       invitedAt: "2026-01-02T00:00:00.000Z",
     });
-    const firstUser = adminUsersResponse.data[0];
+    const firstUser = adminUsersResponse.data[0] ?? makeAdminUser();
-    if (!firstUser) {
-      throw new Error("Expected at least one admin user in test fixtures");
-    }
 
     updateUserMock.mockResolvedValue(firstUser);
     deactivateUserMock.mockResolvedValue(firstUser);
@@ -116,6 +147,8 @@ describe("UsersSettingsPage", () => {
         image: null,
       },
     });
+
+    useAuthMock.mockReturnValue(makeAuthState("user-current"));
   });
 
   it("shows access denied to non-admin users", async () => {
@@ -174,4 +207,146 @@ describe("UsersSettingsPage", () => {
 
     expect(updateWorkspaceMemberRoleMock).not.toHaveBeenCalled();
   });
+
+  it("caps pagination to the last valid page after deactivation shrinks the dataset", async () => {
+    const user = userEvent.setup();
+    const pageOneUser = makeAdminUser({
+      id: "user-1",
+      name: "Alice",
+      email: "alice@example.com",
+    });
+    const pageTwoUser = makeAdminUser({
+      id: "user-2",
+      name: "Bob",
+      email: "bob@example.com",
+    });
+
+    fetchAdminUsersMock.mockReset();
+    const responses = [
+      {
+        expectedPage: 1,
+        response: makeAdminUsersResponse({
+          data: [pageOneUser],
+          page: 1,
+          totalPages: 2,
+          total: 2,
+        }),
+      },
+      {
+        expectedPage: 2,
+        response: makeAdminUsersResponse({
+          data: [pageTwoUser],
+          page: 2,
+          totalPages: 2,
+          total: 2,
+        }),
+      },
+      {
+        expectedPage: 2,
+        response: makeAdminUsersResponse({
+          data: [],
+          page: 2,
+          totalPages: 1,
+          total: 1,
+        }),
+      },
+      {
+        expectedPage: 1,
+        response: makeAdminUsersResponse({
+          data: [pageOneUser],
+          page: 1,
+          totalPages: 1,
+          total: 1,
+        }),
+      },
+    ];
+
+    fetchAdminUsersMock.mockImplementation((page = 1) => {
+      const next = responses.shift();
+      if (!next) {
+        throw new Error("Unexpected fetchAdminUsers call in pagination-cap test");
+      }
+
+      expect(page).toBe(next.expectedPage);
+      return Promise.resolve(next.response);
+    });
+
+    render(<UsersSettingsPage />);
+
+    expect(await screen.findByText("alice@example.com")).toBeInTheDocument();
+
+    await user.click(screen.getByRole("button", { name: "Next" }));
+    expect(await screen.findByText("bob@example.com")).toBeInTheDocument();
+
+    const pageTwoRow = screen.getByText("bob@example.com").closest('[role="button"]');
+    if (!(pageTwoRow instanceof HTMLElement)) {
+      throw new Error("Expected Bob's row to exist");
+    }
+
+    await user.click(within(pageTwoRow).getByRole("button", { name: "Deactivate" }));
+    const deactivateButtons = await screen.findAllByRole("button", { name: "Deactivate" });
+    const confirmDeactivateButton = deactivateButtons[deactivateButtons.length - 1];
+    if (!confirmDeactivateButton) {
+      throw new Error("Expected confirmation deactivate button to be rendered");
+    }
+    await user.click(confirmDeactivateButton);
+
+    expect(await screen.findByText("alice@example.com")).toBeInTheDocument();
+    expect(screen.queryByText("No Users Yet")).not.toBeInTheDocument();
+    expect(deactivateUserMock).toHaveBeenCalledWith("user-2");
+    const requestedPages = fetchAdminUsersMock.mock.calls.map(([requestedPage]) => requestedPage);
+    expect(requestedPages.slice(-2)).toEqual([2, 1]);
+  });
+
+  it("shows the API error state without rendering the empty-state message", async () => {
+    fetchAdminUsersMock.mockRejectedValueOnce(new Error("Unable to load users"));
+
+    render(<UsersSettingsPage />);
+
+    expect(await screen.findByText("Unable to load users")).toBeInTheDocument();
+    expect(screen.queryByText("No Users Yet")).not.toBeInTheDocument();
+    expect(screen.queryByText("Invite the first user to get started.")).not.toBeInTheDocument();
+  });
+
+  it("prevents the current user from deactivating their own account", async () => {
+    useAuthMock.mockReturnValue(makeAuthState("user-1"));
+
+    const selfUser = makeAdminUser({
+      id: "user-1",
+      name: "Alice",
+      email: "alice@example.com",
+    });
+    const otherUser = makeAdminUser({
+      id: "user-2",
+      name: "Bob",
+      email: "bob@example.com",
+    });
+
+    fetchAdminUsersMock.mockResolvedValueOnce(
+      makeAdminUsersResponse({
+        data: [selfUser, otherUser],
+        page: 1,
+        totalPages: 1,
+        total: 2,
+      })
+    );
+
+    render(<UsersSettingsPage />);
+
+    expect(await screen.findByText("alice@example.com")).toBeInTheDocument();
+    expect(screen.getByText("bob@example.com")).toBeInTheDocument();
+
+    const selfRow = screen.getByText("alice@example.com").closest('[role="button"]');
+    if (!(selfRow instanceof HTMLElement)) {
+      throw new Error("Expected current-user row to exist");
+    }
+    expect(within(selfRow).queryByRole("button", { name: "Deactivate" })).not.toBeInTheDocument();
+
+    const otherRow = screen.getByText("bob@example.com").closest('[role="button"]');
+    if (!(otherRow instanceof HTMLElement)) {
+      throw new Error("Expected other-user row to exist");
+    }
+    expect(within(otherRow).getByRole("button", { name: "Deactivate" })).toBeInTheDocument();
+    expect(deactivateUserMock).not.toHaveBeenCalled();
+  });
 });

apps/web/src/app/(authenticated)/settings/users/page.tsx

@@ -55,6 +55,7 @@ import {
   type InviteUserDto,
   type UpdateUserDto,
 } from "@/lib/api/admin";
+import { useAuth } from "@/lib/auth/auth-context";
 import { fetchUserWorkspaces, updateWorkspaceMemberRole } from "@/lib/api/workspaces";
 import { SettingsAccessDenied } from "@/components/settings/SettingsAccessDenied";
 
@@ -77,6 +78,7 @@ const INITIAL_DETAIL_FORM = {
   workspaceId: null as string | null,
   workspaceName: null as string | null,
 };
+const USERS_PAGE_SIZE = 50;
 
 interface DetailInitialState {
   name: string;
@@ -104,8 +106,11 @@ function getPrimaryMembership(user: AdminUser): AdminWorkspaceMembership | null
 }
 
 export default function UsersSettingsPage(): ReactElement {
+  const { user: authUser } = useAuth();
+
   const [users, setUsers] = useState<AdminUser[]>([]);
   const [meta, setMeta] = useState<AdminUsersResponse["meta"] | null>(null);
+  const [page, setPage] = useState<number>(1);
   const [isLoading, setIsLoading] = useState<boolean>(true);
   const [isRefreshing, setIsRefreshing] = useState<boolean>(false);
   const [error, setError] = useState<string | null>(null);
@@ -127,25 +132,35 @@ export default function UsersSettingsPage(): ReactElement {
   const [deactivateTarget, setDeactivateTarget] = useState<AdminUser | null>(null);
   const [isDeactivating, setIsDeactivating] = useState<boolean>(false);
 
-  const loadUsers = useCallback(async (showLoadingState: boolean): Promise<void> => {
+  const loadUsers = useCallback(
-    try {
+    async (showLoadingState: boolean): Promise<void> => {
-      if (showLoadingState) {
+      try {
-        setIsLoading(true);
+        if (showLoadingState) {
-      } else {
+          setIsLoading(true);
-        setIsRefreshing(true);
+        } else {
-      }
+          setIsRefreshing(true);
+        }
 
-      const response = await fetchAdminUsers(1, 50);
+        const response = await fetchAdminUsers(page, USERS_PAGE_SIZE);
-      setUsers(response.data);
+        const lastValidPage = Math.max(1, response.meta.totalPages);
-      setMeta(response.meta);
+
-      setError(null);
+        if (page > lastValidPage) {
-    } catch (err: unknown) {
+          setPage(lastValidPage);
-      setError(err instanceof Error ? err.message : "Failed to load admin users");
+          return;
-    } finally {
+        }
-      setIsLoading(false);
+
-      setIsRefreshing(false);
+        setUsers(response.data);
-    }
+        setMeta(response.meta);
-  }, []);
+        setError(null);
+      } catch (err: unknown) {
+        setError(err instanceof Error ? err.message : "Failed to load admin users");
+      } finally {
+        setIsLoading(false);
+        setIsRefreshing(false);
+      }
+    },
+    [page]
+  );
 
   useEffect(() => {
     fetchUserWorkspaces()
@@ -170,7 +185,7 @@ export default function UsersSettingsPage(): ReactElement {
     }
 
     void loadUsers(true);
-  }, [isAdmin, loadUsers]);
+  }, [isAdmin, loadUsers, page]);
 
   function resetInviteForm(): void {
     setInviteForm(INITIAL_INVITE_FORM);
@@ -324,6 +339,12 @@ export default function UsersSettingsPage(): ReactElement {
       return;
     }
 
+    if (authUser?.id === deactivateTarget.id) {
+      setDeactivateTarget(null);
+      setError("You cannot deactivate your own account.");
+      return;
+    }
+
     try {
       setIsDeactivating(true);
       await deactivateUser(deactivateTarget.id);
@@ -481,7 +502,13 @@ export default function UsersSettingsPage(): ReactElement {
         </Link>
       </div>
 
-      {error ? (
+      {isLoading ? (
+        <Card>
+          <CardContent className="py-12 text-center text-muted-foreground">
+            Loading users...
+          </CardContent>
+        </Card>
+      ) : error ? (
         <Card>
           <CardContent className="py-4">
             <p className="text-sm text-destructive" role="alert">
@@ -489,14 +516,6 @@ export default function UsersSettingsPage(): ReactElement {
             </p>
           </CardContent>
         </Card>
-      ) : null}
-
-      {isLoading ? (
-        <Card>
-          <CardContent className="py-12 text-center text-muted-foreground">
-            Loading users...
-          </CardContent>
-        </Card>
       ) : users.length === 0 ? (
         <Card>
           <CardHeader>
@@ -514,6 +533,7 @@ export default function UsersSettingsPage(): ReactElement {
             {users.map((user) => {
               const primaryMembership = getPrimaryMembership(user);
               const isActive = user.deactivatedAt === null;
+              const isCurrentUser = authUser?.id === user.id;
 
               return (
                 <div
@@ -529,7 +549,14 @@ export default function UsersSettingsPage(): ReactElement {
                   }}
                 >
                   <div className="space-y-1 min-w-0">
-                    <p className="font-semibold truncate">{user.name || "Unnamed User"}</p>
+                    <p className="font-semibold truncate">
+                      {user.name || "Unnamed User"}
+                      {isCurrentUser ? (
+                        <span className="ml-2 text-xs font-normal text-muted-foreground">
+                          (You)
+                        </span>
+                      ) : null}
+                    </p>
                     <p className="text-sm text-muted-foreground truncate">{user.email}</p>
                   </div>
 
@@ -540,7 +567,7 @@ export default function UsersSettingsPage(): ReactElement {
                     <Badge variant={isActive ? "secondary" : "destructive"}>
                       {isActive ? "Active" : "Inactive"}
                     </Badge>
-                    {isActive ? (
+                    {isActive && !isCurrentUser ? (
                       <Button
                         variant="destructive"
                         size="sm"
@@ -557,6 +584,36 @@ export default function UsersSettingsPage(): ReactElement {
                 </div>
               );
             })}
+
+            {meta && meta.totalPages > 1 ? (
+              <div className="flex items-center justify-between pt-3 mt-1 border-t">
+                <p className="text-sm text-muted-foreground">
+                  Page {page} of {meta.totalPages}
+                </p>
+                <div className="flex gap-2">
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    disabled={page === 1}
+                    onClick={() => {
+                      setPage((previousPage) => Math.max(1, previousPage - 1));
+                    }}
+                  >
+                    Previous
+                  </Button>
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    disabled={page >= meta.totalPages}
+                    onClick={() => {
+                      setPage((previousPage) => Math.min(meta.totalPages, previousPage + 1));
+                    }}
+                  >
+                    Next
+                  </Button>
+                </div>
+              </div>
+            ) : null}
           </CardContent>
         </Card>
       )}

docker/OPENCLAW-FLEET.md

@@ -1,90 +0,0 @@
-# OpenClaw Agent Fleet
-
-OpenClaw multi-agent deployment for Mosaic Stack using Docker Swarm and Portainer.
-
-## Agent Roster
-
-| Agent             | Service             | Primary Model   | Role                               |
-| ----------------- | ------------------- | --------------- | ---------------------------------- |
-| jarvis-main       | `jarvis-main`       | `zai/glm-5`     | Orchestrator / user-facing gateway |
-| jarvis-projects   | `jarvis-projects`   | `zai/glm-5`     | Development and coding tasks       |
-| jarvis-research   | `jarvis-research`   | `zai/glm-5`     | Research and web search            |
-| jarvis-operations | `jarvis-operations` | `ollama/cogito` | Monitoring, health checks, alerts  |
-
-## Prerequisites
-
-1. Docker Swarm initialized on the target host
-2. Existing Docker network `mosaic-stack_internal` (external swarm network)
-3. Z.ai API access key (`ZAI_API_KEY`)
-4. Ollama reachable at `10.1.1.42:11434` for the `cogito` model
-
-## Quick Start
-
-### 1. Configure each agent env file
-
-Set values in:
-
-- `docker/openclaw-instances/jarvis-main.env`
-- `docker/openclaw-instances/jarvis-projects.env`
-- `docker/openclaw-instances/jarvis-research.env`
-- `docker/openclaw-instances/jarvis-operations.env`
-
-Required variables:
-
-- `OPENCLAW_CONFIG_PATH=/config/openclaw.json`
-- `ZAI_API_KEY=<your-zai-api-key>`
-- `OPENCLAW_GATEWAY_TOKEN=<unique-token-per-agent>`
-
-### 2. Generate unique gateway tokens
-
-Generate one token per service:
-
-```bash
-openssl rand -hex 32
-```
-
-### 3. Deploy the fleet
-
-From repo root:
-
-```bash
-docker stack deploy -c docker/openclaw-compose.yml jarvis
-```
-
-### 4. Verify service status
-
-```bash
-docker stack services jarvis
-docker service logs jarvis-jarvis-main --tail 100
-docker service logs jarvis-jarvis-projects --tail 100
-docker service logs jarvis-jarvis-research --tail 100
-docker service logs jarvis-jarvis-operations --tail 100
-```
-
-### 5. First-time auth (if required)
-
-Exec into a container and run OpenClaw auth device flow:
-
-```bash
-docker exec -it $(docker ps -q -f name=jarvis-jarvis-main) sh
-openclaw auth
-```
-
-You can also complete this in the Mosaic WebUI terminal (xterm.js).
-
-## Management Commands
-
-| Command                                                     | Description            |
-| ----------------------------------------------------------- | ---------------------- |
-| `docker stack deploy -c docker/openclaw-compose.yml jarvis` | Deploy/update fleet    |
-| `docker stack services jarvis`                              | List services in stack |
-| `docker service logs jarvis-<service>`                      | View service logs      |
-| `docker service update --force jarvis-<service>`            | Restart rolling update |
-| `docker service scale jarvis-<service>=N`                   | Scale a service        |
-| `docker stack rm jarvis`                                    | Remove fleet           |
-
-## Notes
-
-- Each service stores persistent local OpenClaw state in `/home/node/.openclaw`.
-- Each service mounts a read-only per-agent JSON config at `/config/openclaw.json`.
-- `chatCompletions` endpoint is enabled in each agent config for Mosaic API usage.

docker/openclaw-compose.yml

@@ -1,166 +0,0 @@
-services:
-  jarvis-main:
-    image: alpine/openclaw:latest
-    command: ["gateway", "run", "--bind", "lan", "--auth", "token"]
-    env_file:
-      - ./openclaw-instances/jarvis-main.env
-    environment:
-      OPENCLAW_CONFIG_PATH: /config/openclaw.json
-    volumes:
-      - jarvis-main-config:/config/openclaw.json:ro
-      - jarvis-main-state:/home/node/.openclaw
-    networks:
-      - mosaic-stack_internal
-    healthcheck:
-      test: ["CMD", "openclaw", "gateway", "health"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 20s
-    deploy:
-      replicas: 1
-      restart_policy:
-        condition: on-failure
-        delay: 5s
-        max_attempts: 3
-      resources:
-        limits:
-          memory: 2G
-        reservations:
-          memory: 512M
-      labels:
-        - com.mosaic.agent=jarvis-main
-        - com.mosaic.role=orchestrator
-
-  jarvis-projects:
-    image: alpine/openclaw:latest
-    command: ["gateway", "run", "--bind", "lan", "--auth", "token"]
-    env_file:
-      - ./openclaw-instances/jarvis-projects.env
-    environment:
-      OPENCLAW_CONFIG_PATH: /config/openclaw.json
-    volumes:
-      - jarvis-projects-config:/config/openclaw.json:ro
-      - jarvis-projects-state:/home/node/.openclaw
-    networks:
-      - mosaic-stack_internal
-    healthcheck:
-      test: ["CMD", "openclaw", "gateway", "health"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 20s
-    deploy:
-      replicas: 1
-      restart_policy:
-        condition: on-failure
-        delay: 5s
-        max_attempts: 3
-      resources:
-        limits:
-          memory: 4G
-        reservations:
-          memory: 1G
-      labels:
-        - com.mosaic.agent=jarvis-projects
-        - com.mosaic.role=development
-
-  jarvis-research:
-    image: alpine/openclaw:latest
-    command: ["gateway", "run", "--bind", "lan", "--auth", "token"]
-    env_file:
-      - ./openclaw-instances/jarvis-research.env
-    environment:
-      OPENCLAW_CONFIG_PATH: /config/openclaw.json
-    volumes:
-      - jarvis-research-config:/config/openclaw.json:ro
-      - jarvis-research-state:/home/node/.openclaw
-    networks:
-      - mosaic-stack_internal
-    healthcheck:
-      test: ["CMD", "openclaw", "gateway", "health"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 20s
-    deploy:
-      replicas: 1
-      restart_policy:
-        condition: on-failure
-        delay: 5s
-        max_attempts: 3
-      resources:
-        limits:
-          memory: 1G
-        reservations:
-          memory: 256M
-      labels:
-        - com.mosaic.agent=jarvis-research
-        - com.mosaic.role=research
-
-  jarvis-operations:
-    image: alpine/openclaw:latest
-    command: ["gateway", "run", "--bind", "lan", "--auth", "token"]
-    env_file:
-      - ./openclaw-instances/jarvis-operations.env
-    environment:
-      OPENCLAW_CONFIG_PATH: /config/openclaw.json
-    volumes:
-      - jarvis-operations-config:/config/openclaw.json:ro
-      - jarvis-operations-state:/home/node/.openclaw
-    networks:
-      - mosaic-stack_internal
-    healthcheck:
-      test: ["CMD", "openclaw", "gateway", "health"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 20s
-    deploy:
-      replicas: 1
-      restart_policy:
-        condition: on-failure
-        delay: 5s
-        max_attempts: 3
-      resources:
-        limits:
-          memory: 1G
-        reservations:
-          memory: 256M
-      labels:
-        - com.mosaic.agent=jarvis-operations
-        - com.mosaic.role=operations
-
-networks:
-  mosaic-stack_internal:
-    external: true
-
-volumes:
-  jarvis-main-config:
-    driver: local
-    driver_opts:
-      type: none
-      o: bind
-      device: ${PWD}/docker/openclaw-instances/jarvis-main.json
-  jarvis-projects-config:
-    driver: local
-    driver_opts:
-      type: none
-      o: bind
-      device: ${PWD}/docker/openclaw-instances/jarvis-projects.json
-  jarvis-research-config:
-    driver: local
-    driver_opts:
-      type: none
-      o: bind
-      device: ${PWD}/docker/openclaw-instances/jarvis-research.json
-  jarvis-operations-config:
-    driver: local
-    driver_opts:
-      type: none
-      o: bind
-      device: ${PWD}/docker/openclaw-instances/jarvis-operations.json
-  jarvis-main-state:
-  jarvis-projects-state:
-  jarvis-research-state:
-  jarvis-operations-state:

docker/openclaw-instances/README.md

@@ -1,47 +0,0 @@
-# OpenClaw Agent Instance Setup
-
-Each service in the OpenClaw fleet reads:
-
-- A per-agent environment file: `docker/openclaw-instances/<agent>.env`
-- A per-agent JSON5 config: `docker/openclaw-instances/<agent>.json`
-
-## 1. Fill in API keys in `.env` files
-
-Set `ZAI_API_KEY` in each instance env file:
-
-- `jarvis-main.env`
-- `jarvis-projects.env`
-- `jarvis-research.env`
-- `jarvis-operations.env`
-
-## 2. Generate unique gateway tokens per agent
-
-Generate one token per instance:
-
-```bash
-openssl rand -hex 32
-```
-
-Set a different `OPENCLAW_GATEWAY_TOKEN` in each `.env` file.
-
-## 3. Deploy the Docker Swarm stack
-
-From repository root:
-
-```bash
-docker stack deploy -c docker/openclaw-compose.yml jarvis
-```
-
-## 4. First-time auth (if needed)
-
-If an instance requires first-time login, exec into the running container and run:
-
-```bash
-openclaw auth
-```
-
-This uses OpenClaw's headless OAuth device-code flow.
-
-## 5. Use Mosaic WebUI terminal for auth
-
-You can complete the device-code auth flow from the Mosaic WebUI terminal (xterm.js) attached to the service container.

docker/openclaw-instances/jarvis-main.env

@@ -1,3 +0,0 @@
-OPENCLAW_CONFIG_PATH=/config/openclaw.json
-ZAI_API_KEY=REPLACE_WITH_ZAI_API_KEY
-OPENCLAW_GATEWAY_TOKEN=REPLACE_WITH_UNIQUE_GATEWAY_TOKEN

docker/openclaw-instances/jarvis-main.json

@@ -1,41 +0,0 @@
-{
-  "gateway": {
-    "mode": "local",
-    "port": 18789,
-    "bind": "lan",
-    "auth": { "mode": "token" },
-    "http": {
-      "endpoints": {
-        "chatCompletions": { "enabled": true }
-      }
-    }
-  },
-  "agents": {
-    "defaults": {
-      "workspace": "/home/node/workspace",
-      "model": { "primary": "zai/glm-5" }
-    }
-  },
-  // Z.ai is built in and uses ZAI_API_KEY.
-  // Ollama is configured for optional local reasoning fallback.
-  "models": {
-    "mode": "merge",
-    "providers": {
-      "ollama": {
-        "baseUrl": "http://10.1.1.42:11434/v1",
-        "api": "openai-completions",
-        "models": [
-          {
-            "id": "cogito",
-            "name": "Cogito (Local Reasoning)",
-            "reasoning": false,
-            "input": ["text"],
-            "cost": { "input": 0, "output": 0, "cacheRead": 0, "cacheWrite": 0 },
-            "contextWindow": 128000,
-            "maxTokens": 8192
-          }
-        ]
-      }
-    }
-  }
-}

docker/openclaw-instances/jarvis-operations.env

@@ -1,3 +0,0 @@
-OPENCLAW_CONFIG_PATH=/config/openclaw.json
-ZAI_API_KEY=REPLACE_WITH_ZAI_API_KEY
-OPENCLAW_GATEWAY_TOKEN=REPLACE_WITH_UNIQUE_GATEWAY_TOKEN

docker/openclaw-instances/jarvis-operations.json

@@ -1,40 +0,0 @@
-{
-  "gateway": {
-    "mode": "local",
-    "port": 18789,
-    "bind": "lan",
-    "auth": { "mode": "token" },
-    "http": {
-      "endpoints": {
-        "chatCompletions": { "enabled": true }
-      }
-    }
-  },
-  "agents": {
-    "defaults": {
-      "workspace": "/home/node/workspace",
-      "model": { "primary": "ollama/cogito" }
-    }
-  },
-  // Operations uses local Ollama Cogito as the primary model.
-  "models": {
-    "mode": "merge",
-    "providers": {
-      "ollama": {
-        "baseUrl": "http://10.1.1.42:11434/v1",
-        "api": "openai-completions",
-        "models": [
-          {
-            "id": "cogito",
-            "name": "Cogito (Local Reasoning)",
-            "reasoning": false,
-            "input": ["text"],
-            "cost": { "input": 0, "output": 0, "cacheRead": 0, "cacheWrite": 0 },
-            "contextWindow": 128000,
-            "maxTokens": 8192
-          }
-        ]
-      }
-    }
-  }
-}

docker/openclaw-instances/jarvis-projects.env

@@ -1,3 +0,0 @@
-OPENCLAW_CONFIG_PATH=/config/openclaw.json
-ZAI_API_KEY=REPLACE_WITH_ZAI_API_KEY
-OPENCLAW_GATEWAY_TOKEN=REPLACE_WITH_UNIQUE_GATEWAY_TOKEN

docker/openclaw-instances/jarvis-projects.json

@@ -1,39 +0,0 @@
-{
-  "gateway": {
-    "mode": "local",
-    "port": 18789,
-    "bind": "lan",
-    "auth": { "mode": "token" },
-    "http": {
-      "endpoints": {
-        "chatCompletions": { "enabled": true }
-      }
-    }
-  },
-  "agents": {
-    "defaults": {
-      "workspace": "/home/node/workspace",
-      "model": { "primary": "zai/glm-5" }
-    }
-  },
-  "models": {
-    "mode": "merge",
-    "providers": {
-      "ollama": {
-        "baseUrl": "http://10.1.1.42:11434/v1",
-        "api": "openai-completions",
-        "models": [
-          {
-            "id": "cogito",
-            "name": "Cogito (Local Reasoning)",
-            "reasoning": false,
-            "input": ["text"],
-            "cost": { "input": 0, "output": 0, "cacheRead": 0, "cacheWrite": 0 },
-            "contextWindow": 128000,
-            "maxTokens": 8192
-          }
-        ]
-      }
-    }
-  }
-}

docker/openclaw-instances/jarvis-research.env

@@ -1,3 +0,0 @@
-OPENCLAW_CONFIG_PATH=/config/openclaw.json
-ZAI_API_KEY=REPLACE_WITH_ZAI_API_KEY
-OPENCLAW_GATEWAY_TOKEN=REPLACE_WITH_UNIQUE_GATEWAY_TOKEN

docker/openclaw-instances/jarvis-research.json

@@ -1,39 +0,0 @@
-{
-  "gateway": {
-    "mode": "local",
-    "port": 18789,
-    "bind": "lan",
-    "auth": { "mode": "token" },
-    "http": {
-      "endpoints": {
-        "chatCompletions": { "enabled": true }
-      }
-    }
-  },
-  "agents": {
-    "defaults": {
-      "workspace": "/home/node/workspace",
-      "model": { "primary": "zai/glm-5" }
-    }
-  },
-  "models": {
-    "mode": "merge",
-    "providers": {
-      "ollama": {
-        "baseUrl": "http://10.1.1.42:11434/v1",
-        "api": "openai-completions",
-        "models": [
-          {
-            "id": "cogito",
-            "name": "Cogito (Local Reasoning)",
-            "reasoning": false,
-            "input": ["text"],
-            "cost": { "input": 0, "output": 0, "cacheRead": 0, "cacheWrite": 0 },
-            "contextWindow": 128000,
-            "maxTokens": 8192
-          }
-        ]
-      }
-    }
-  }
-}

docs/TASKS.md

@@ -55,19 +55,19 @@ Remaining estimate: ~143K tokens (Codex budget).
 
 ## MS22 — Fleet Evolution (Phase 0: Knowledge Layer)
 
-| id              | status      | milestone    | description                                                  | issue    | repo  | branch                         | depends_on                                                | blocks        | agent        | started_at | completed_at | estimate | used | notes                                         |
+| id              | status | milestone    | description                                                  | issue    | repo  | branch                         | depends_on                                                | blocks        | agent        | started_at | completed_at | estimate | used | notes                                         |
-| --------------- | ----------- | ------------ | ------------------------------------------------------------ | -------- | ----- | ------------------------------ | --------------------------------------------------------- | ------------- | ------------ | ---------- | ------------ | -------- | ---- | --------------------------------------------- |
+| --------------- | ------ | ------------ | ------------------------------------------------------------ | -------- | ----- | ------------------------------ | --------------------------------------------------------- | ------------- | ------------ | ---------- | ------------ | -------- | ---- | --------------------------------------------- |
-| MS22-PLAN-001   | done        | p0-knowledge | PRD + mission bootstrap + TASKS.md                           | TASKS:P0 | stack | feat/ms22-knowledge-schema     | —                                                         | MS22-DB-001   | orchestrator | 2026-02-28 | 2026-02-28   | 10K      | 8K   | PRD-MS22.md, mission fleet-evolution-20260228 |
+| MS22-PLAN-001   | done   | p0-knowledge | PRD + mission bootstrap + TASKS.md                           | TASKS:P0 | stack | feat/ms22-knowledge-schema     | —                                                         | MS22-DB-001   | orchestrator | 2026-02-28 | 2026-02-28   | 10K      | 8K   | PRD-MS22.md, mission fleet-evolution-20260228 |
-| MS22-DB-001     | done        | p0-knowledge | Findings module (pgvector, CRUD, similarity search)          | TASKS:P0 | api   | feat/ms22-findings             | MS22-PLAN-001                                             | —             | codex        | 2026-02-28 | 2026-02-28   | 20K      | ~22K | PR #585 merged, CI green                      |
+| MS22-DB-001     | done   | p0-knowledge | Findings module (pgvector, CRUD, similarity search)          | TASKS:P0 | api   | feat/ms22-findings             | MS22-PLAN-001                                             | —             | codex        | 2026-02-28 | 2026-02-28   | 20K      | ~22K | PR #585 merged, CI green                      |
-| MS22-API-001    | done        | p0-knowledge | Findings API endpoints                                       | TASKS:P0 | api   | feat/ms22-findings             | MS22-DB-001                                               | —             | codex        | 2026-02-28 | 2026-02-28   | —        | —    | Combined with DB-001                          |
+| MS22-API-001    | done   | p0-knowledge | Findings API endpoints                                       | TASKS:P0 | api   | feat/ms22-findings             | MS22-DB-001                                               | —             | codex        | 2026-02-28 | 2026-02-28   | —        | —    | Combined with DB-001                          |
-| MS22-DB-002     | done        | p0-knowledge | AgentMemory module (key/value store, upsert)                 | TASKS:P0 | api   | feat/ms22-agent-memory         | MS22-DB-001                                               | —             | codex        | 2026-02-28 | 2026-02-28   | 15K      | ~16K | PR #586 merged, CI green                      |
+| MS22-DB-002     | done   | p0-knowledge | AgentMemory module (key/value store, upsert)                 | TASKS:P0 | api   | feat/ms22-agent-memory         | MS22-DB-001                                               | —             | codex        | 2026-02-28 | 2026-02-28   | 15K      | ~16K | PR #586 merged, CI green                      |
-| MS22-API-002    | done        | p0-knowledge | AgentMemory API endpoints                                    | TASKS:P0 | api   | feat/ms22-agent-memory         | MS22-DB-002                                               | —             | codex        | 2026-02-28 | 2026-02-28   | —        | —    | Combined with DB-002                          |
+| MS22-API-002    | done   | p0-knowledge | AgentMemory API endpoints                                    | TASKS:P0 | api   | feat/ms22-agent-memory         | MS22-DB-002                                               | —             | codex        | 2026-02-28 | 2026-02-28   | —        | —    | Combined with DB-002                          |
-| MS22-DB-004     | done        | p0-knowledge | ConversationArchive module (pgvector, ingest, search)        | TASKS:P0 | api   | feat/ms22-conversation-archive | MS22-DB-001                                               | —             | codex        | 2026-02-28 | 2026-02-28   | 20K      | ~18K | PR #587 merged, CI green                      |
+| MS22-DB-004     | done   | p0-knowledge | ConversationArchive module (pgvector, ingest, search)        | TASKS:P0 | api   | feat/ms22-conversation-archive | MS22-DB-001                                               | —             | codex        | 2026-02-28 | 2026-02-28   | 20K      | ~18K | PR #587 merged, CI green                      |
-| MS22-API-004    | done        | p0-knowledge | ConversationArchive API endpoints                            | TASKS:P0 | api   | feat/ms22-conversation-archive | MS22-DB-004                                               | —             | codex        | 2026-02-28 | 2026-02-28   | —        | —    | Combined with DB-004                          |
+| MS22-API-004    | done   | p0-knowledge | ConversationArchive API endpoints                            | TASKS:P0 | api   | feat/ms22-conversation-archive | MS22-DB-004                                               | —             | codex        | 2026-02-28 | 2026-02-28   | —        | —    | Combined with DB-004                          |
-| MS22-API-005    | done        | p0-knowledge | EmbeddingService (reuse existing KnowledgeModule)            | TASKS:P0 | api   | —                              | —                                                         | —             | orchestrator | 2026-02-28 | 2026-02-28   | 0        | 0    | Already existed; no work needed               |
+| MS22-API-005    | done   | p0-knowledge | EmbeddingService (reuse existing KnowledgeModule)            | TASKS:P0 | api   | —                              | —                                                         | —             | orchestrator | 2026-02-28 | 2026-02-28   | 0        | 0    | Already existed; no work needed               |
-| MS22-DB-003     | not-started | p0-knowledge | Task model: add assigned_agent field + migration             | TASKS:P0 | api   | feat/ms22-task-agent           | MS22-DB-001                                               | MS22-API-003  | —            | —          | —            | 8K       | —    | Small schema + migration only                 |
+| MS22-DB-003     | done   | p0-knowledge | Task model: add assigned_agent field + migration             | TASKS:P0 | api   | feat/ms22-task-agent           | MS22-DB-001                                               | MS22-API-003  | —            | —          | —            | 8K       | —    | Small schema + migration only                 |
-| MS22-API-003    | not-started | p0-knowledge | Task API: expose assigned_agent in CRUD                      | TASKS:P0 | api   | feat/ms22-task-agent           | MS22-DB-003                                               | MS22-TEST-001 | —            | —          | —            | 8K       | —    | Extend existing TaskModule                    |
+| MS22-API-003    | done   | p0-knowledge | Task API: expose assigned_agent in CRUD                      | TASKS:P0 | api   | feat/ms22-task-agent           | MS22-DB-003                                               | MS22-TEST-001 | —            | —          | —            | 8K       | —    | Extend existing TaskModule                    |
-| MS22-TEST-001   | not-started | p0-knowledge | Integration tests: Findings + AgentMemory + ConvArchive      | TASKS:P0 | api   | test/ms22-integration          | MS22-API-001,MS22-API-002,MS22-API-004                    | MS22-VER-P0   | —            | —          | —            | 20K      | —    | E2E with live postgres                        |
+| MS22-TEST-001   | done   | p0-knowledge | Integration tests: Findings + AgentMemory + ConvArchive      | TASKS:P0 | api   | test/ms22-integration          | MS22-API-001,MS22-API-002,MS22-API-004                    | MS22-VER-P0   | —            | —          | —            | 20K      | —    | E2E with live postgres                        |
-| MS22-SKILL-001  | not-started | p0-knowledge | OpenClaw mosaic skill (agents read/write findings/memory)    | TASKS:P0 | stack | feat/ms22-openclaw-skill       | MS22-API-001,MS22-API-002                                 | MS22-VER-P0   | —            | —          | —            | 15K      | —    | Skill in ~/.agents/skills/mosaic/             |
+| MS22-SKILL-001  | done   | p0-knowledge | OpenClaw mosaic skill (agents read/write findings/memory)    | TASKS:P0 | stack | feat/ms22-openclaw-skill       | MS22-API-001,MS22-API-002                                 | MS22-VER-P0   | —            | —          | —            | 15K      | —    | Skill in ~/.agents/skills/mosaic/             |
-| MS22-INGEST-001 | done        | p0-knowledge | Session log ingestion pipeline (OpenClaw logs → ConvArchive) | TASKS:P0 | stack | feat/ms22-ingest               | MS22-API-004                                              | MS22-VER-P0   | —            | —          | —            | 20K      | —    | Script to batch-ingest existing logs          |
+| MS22-INGEST-001 | done   | p0-knowledge | Session log ingestion pipeline (OpenClaw logs → ConvArchive) | TASKS:P0 | stack | feat/ms22-ingest               | MS22-API-004                                              | MS22-VER-P0   | —            | —          | —            | 20K      | —    | Script to batch-ingest existing logs          |
-| MS22-VER-P0     | not-started | p0-knowledge | Phase 0 verification: all modules deployed + smoke tested    | TASKS:P0 | stack | —                              | MS22-TEST-001,MS22-SKILL-001,MS22-INGEST-001,MS22-API-003 | —             | —            | —          | —            | 5K       | —    |                                               |
+| MS22-VER-P0     | done   | p0-knowledge | Phase 0 verification: all modules deployed + smoke tested    | TASKS:P0 | stack | —                              | MS22-TEST-001,MS22-SKILL-001,MS22-INGEST-001,MS22-API-003 | —             | —            | —          | —            | 5K       | —    |                                               |