Merge PR #395 and resolve conflicts

Co-authored-by: BunsDev <68980965+BunsDev@users.noreply.github.com>

Author: Copilot

DESIGN.md

@@ -52,34 +52,34 @@ conversation with the agent. Every pixel must earn its place.
 
 ### Typography
 
-| Role                       | Size                 | Weight          | Tracking  | Font Stack                   |
-| -------------------------- | -------------------- | --------------- | --------- | ---------------------------- |
-| Thread title (sidebar)     | `text-xs` (0.75rem)  | `font-normal`   | default   | Inter, system-ui, sans-serif |
-| Thread subtitle / metadata | `text-[10px]`        | `font-normal`   | default   | Inter, system-ui, sans-serif |
-| Badge text                 | `text-[10px]`        | `font-medium`   | default   | Inter, system-ui, sans-serif |
-| Button text                | `text-sm` (0.875rem) | `font-medium`   | default   | Inter, system-ui, sans-serif |
-| Heading / dialog title     | `text-lg` (1.125rem) | `font-semibold` | `-0.01em` | Inter, system-ui, sans-serif |
-| Code / terminal            | `text-sm`            | `font-normal`   | default   | SF Mono, Consolas, monospace |
-| Project name               | `text-xs`            | `font-semibold` | default   | Inter, system-ui, sans-serif |
+| Role | Size | Weight | Tracking | Font Stack |
+|------|------|--------|----------|------------|
+| Thread title (sidebar) | `text-xs` (0.75rem) | `font-normal` | default | Inter, system-ui, sans-serif |
+| Thread subtitle / metadata | `text-[10px]` | `font-normal` | default | Inter, system-ui, sans-serif |
+| Badge text | `text-[10px]` | `font-medium` | default | Inter, system-ui, sans-serif |
+| Button text | `text-sm` (0.875rem) | `font-medium` | default | Inter, system-ui, sans-serif |
+| Heading / dialog title | `text-lg` (1.125rem) | `font-semibold` | `-0.01em` | Inter, system-ui, sans-serif |
+| Code / terminal | `text-sm` | `font-normal` | default | SF Mono, Consolas, monospace |
+| Project name | `text-xs` | `font-semibold` | default | Inter, system-ui, sans-serif |
 
 ### Color Semantics
 
 Colors are referenced through CSS custom properties, never hardcoded hex values.
 
-| Token                      | Usage                                             |
-| -------------------------- | ------------------------------------------------- |
-| `text-foreground`          | Primary text                                      |
-| `text-muted-foreground`    | Secondary/deemphasized text                       |
+| Token | Usage |
+|-------|-------|
+| `text-foreground` | Primary text |
+| `text-muted-foreground` | Secondary/deemphasized text |
 | `text-muted-foreground/50` | Tertiary/metadata text (branch names, timestamps) |
-| `bg-background`            | Page background                                   |
-| `bg-accent`                | Hover state, active row highlight                 |
-| `bg-accent/60`             | Active sidebar item                               |
-| `bg-accent/40`             | Selected sidebar item                             |
-| `text-emerald-600`         | Additions / success (green)                       |
-| `text-rose-500`            | Deletions / error (red)                           |
-| `text-warning`             | Warning states, behind-upstream                   |
-| `text-destructive`         | Destructive actions (delete)                      |
-| `border-border/60`         | Subtle badge borders                              |
+| `bg-background` | Page background |
+| `bg-accent` | Hover state, active row highlight |
+| `bg-accent/60` | Active sidebar item |
+| `bg-accent/40` | Selected sidebar item |
+| `text-emerald-600` | Additions / success (green) |
+| `text-rose-500` | Deletions / error (red) |
+| `text-warning` | Warning states, behind-upstream |
+| `text-destructive` | Destructive actions (delete) |
+| `border-border/60` | Subtle badge borders |
 
 ### Spacing Rules
 
@@ -93,16 +93,15 @@ Colors are referenced through CSS custom properties, never hardcoded hex values.
 
 ### Themes
 
-Six premium themes, each with light and dark variants:
+Five premium themes, each with light and dark variants:
 
-| Theme                 | Vibe                                  |
-| --------------------- | ------------------------------------- |
-| **Iridescent Void**   | Futuristic, expensive, slightly alien |
-| **Solar Witch**       | Magical, cozy, ritualistic            |
-| **Carbon**            | Stark, modern, performance-focused    |
-| **Vapor**             | Refined, fluid, purposeful            |
-| **Cotton Candy**      | Sweet, dreamy, pink and blue          |
-| **Cathedral Circuit** | Sacred machine, techno-gothic         |
+| Theme | Vibe |
+|-------|------|
+| **Iridescent Void** | Futuristic, expensive, slightly alien |
+| **Carbon** | Stark, modern, performance-focused |
+| **Vapor** | Refined, fluid, purposeful |
+| **Cotton Candy** | Sweet, dreamy, pink and blue |
+| **Cathedral Circuit** | Sacred machine, techno-gothic |
 
 All themes define the same set of CSS custom properties. Components must use semantic
 tokens (`bg-accent`, `text-muted-foreground`) — never theme-specific values.
@@ -142,7 +141,6 @@ const buttonVariants = cva("base classes", {
 ### Focus States
 
 All interactive elements use the same focus ring:
-
 ```
 focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]
 ```
@@ -250,7 +248,6 @@ a single flow:
 ```
 
 Quick action resolves automatically based on git state:
-
 - Has changes + no PR → "Commit, push & PR"
 - Has changes + existing PR → "Commit & push"
 - No changes + ahead → "Push & create PR"

apps/server/package.json

@@ -26,7 +26,7 @@
     "@anthropic-ai/claude-agent-sdk": "^0.2.77",
     "@effect/platform-node": "catalog:",
     "@effect/sql-sqlite-bun": "catalog:",
-    "@pierre/diffs": "^1.1.0-beta.16",
+    "@pierre/diffs": "1.1.13",
     "effect": "catalog:",
     "node-pty": "^1.1.0",
     "open": "^10.1.0",

apps/server/src/openclaw/GatewayClient.ts

@@ -466,7 +466,7 @@ export class OpenclawGatewayClient {
 
       if (frame.type === "event" && typeof frame.event === "string") {
         let matchedWaiter = false;
-        for (const waiter of this.pendingEventWaiters) {
+        for (const waiter of [...this.pendingEventWaiters]) {
           if (waiter.eventName === frame.event) {
             matchedWaiter = true;
             this.pendingEventWaiters.delete(waiter);

apps/server/src/persistence/Layers/OpenclawGatewayConfig.ts

@@ -68,7 +68,7 @@ function normalizeScopes(scopes: ReadonlyArray<string> | undefined): string[] {
       unique.add(trimmed);
     }
   }
-  return [...unique].toSorted((left, right) => left.localeCompare(right));
+  return [...unique].sort((left, right) => left.localeCompare(right));
 }
 
 function fromGeneratedIdentity(identity: ReturnType<typeof generateOpenclawDeviceIdentity>) {
@@ -339,16 +339,20 @@ export const OpenclawGatewayConfigLive = Layer.effect(
           : input.sharedSecret?.trim() !== undefined && input.sharedSecret.trim().length > 0
             ? input.sharedSecret.trim()
             : existing?.sharedSecret;
-        const generatedIdentity = fromGeneratedIdentity(generateOpenclawDeviceIdentity());
-        const identity = existing ?? {
-          ...generatedIdentity,
-          deviceToken: undefined,
-          deviceTokenRole: undefined,
-          deviceTokenScopes: [],
-          updatedAt: new Date().toISOString(),
-          gatewayUrl: input.gatewayUrl,
-          sharedSecret,
-        };
+        const identity =
+          existing ??
+          (() => {
+            const generatedIdentity = fromGeneratedIdentity(generateOpenclawDeviceIdentity());
+            return {
+              ...generatedIdentity,
+              deviceToken: undefined,
+              deviceTokenRole: undefined,
+              deviceTokenScopes: [],
+              updatedAt: new Date().toISOString(),
+              gatewayUrl: input.gatewayUrl,
+              sharedSecret,
+            };
+          })();
         const nextConfig = makeStoredConfig({
           gatewayUrl: input.gatewayUrl,
           sharedSecret,

apps/server/src/persistence/Migrations/021_OpenclawGatewayConfig.ts

@@ -0,0 +1,23 @@
+import * as Effect from "effect/Effect";
+import * as SqlClient from "effect/unstable/sql/SqlClient";
+
+export default Effect.gen(function* () {
+  const sql = yield* SqlClient.SqlClient;
+
+  yield* sql`
+    CREATE TABLE IF NOT EXISTS openclaw_gateway_config (
+      config_id TEXT PRIMARY KEY,
+      gateway_url TEXT NOT NULL,
+      encrypted_shared_secret TEXT NULL,
+      device_id TEXT NOT NULL,
+      device_public_key TEXT NOT NULL,
+      device_fingerprint TEXT NOT NULL,
+      encrypted_device_private_key TEXT NOT NULL,
+      encrypted_device_token TEXT NULL,
+      device_token_role TEXT NULL,
+      device_token_scopes_json TEXT NOT NULL DEFAULT '[]',
+      created_at TEXT NOT NULL,
+      updated_at TEXT NOT NULL
+    )
+  `;
+});

apps/web/package.json

@@ -30,7 +30,7 @@
     "@lexical/react": "^0.41.0",
     "@okcode/contracts": "workspace:*",
     "@okcode/shared": "workspace:*",
-    "@pierre/diffs": "1.1.0-beta.16",
+    "@pierre/diffs": "1.1.13",
     "@tanstack/react-pacer": "^0.19.4",
     "@tanstack/react-query": "^5.90.0",
     "@tanstack/react-router": "^1.160.2",
@@ -42,7 +42,7 @@
     "html-to-image": "^1.11.13",
     "lexical": "^0.41.0",
     "lucide-react": "^0.564.0",
-    "oxfmt": "^0.42.0",
+    "oxfmt": "^0.44.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-intl": "^10.1.1",