@yeaft/webchat-agent 1.0.666 → 1.0.667

package/local-runtime/server/db/connection.js

@@ -43,7 +43,11 @@ db.exec(`
     sidebar_projects_ratio REAL NOT NULL DEFAULT 0.5
       CHECK (sidebar_projects_ratio >= 0.15 AND sidebar_projects_ratio <= 0.85),
     sidebar_actions_compact INTEGER NOT NULL DEFAULT 0
-      CHECK (sidebar_actions_compact IN (0, 1))
+      CHECK (sidebar_actions_compact IN (0, 1)),
+    sidebar_collapsed_projects TEXT NOT NULL DEFAULT '{}'
+      CHECK (json_valid(sidebar_collapsed_projects) AND json_type(sidebar_collapsed_projects) = 'object'),
+    sidebar_collapsed_sections TEXT NOT NULL DEFAULT '{}'
+      CHECK (json_valid(sidebar_collapsed_sections) AND json_type(sidebar_collapsed_sections) = 'object')
   );
 
   -- Finalized deletion survives removal of the users row. This prevents a
@@ -341,6 +345,10 @@ db.exec(`
 const migrations = [
   `ALTER TABLE user_preferences ADD COLUMN sidebar_actions_compact INTEGER NOT NULL DEFAULT 0
     CHECK (sidebar_actions_compact IN (0, 1))`,
+  `ALTER TABLE user_preferences ADD COLUMN sidebar_collapsed_projects TEXT NOT NULL DEFAULT '{}'
+    CHECK (json_valid(sidebar_collapsed_projects) AND json_type(sidebar_collapsed_projects) = 'object')`,
+  `ALTER TABLE user_preferences ADD COLUMN sidebar_collapsed_sections TEXT NOT NULL DEFAULT '{}'
+    CHECK (json_valid(sidebar_collapsed_sections) AND json_type(sidebar_collapsed_sections) = 'object')`,
   `ALTER TABLE sessions ADD COLUMN user_id TEXT REFERENCES users(id)`,
   `ALTER TABLE users ADD COLUMN totp_secret TEXT`,
   `ALTER TABLE users ADD COLUMN totp_enabled INTEGER DEFAULT 0`,
@@ -911,16 +919,25 @@ export const stmts = {
   `),
 
   getUserPreferences: db.prepare(`
-    SELECT sidebar_projects_ratio, sidebar_actions_compact FROM user_preferences WHERE user_id = ?
+    SELECT sidebar_projects_ratio, sidebar_actions_compact, sidebar_collapsed_projects, sidebar_collapsed_sections
+    FROM user_preferences WHERE user_id = ?
   `),
 
   upsertUserPreferences: db.prepare(`
-    INSERT INTO user_preferences (user_id, sidebar_projects_ratio, sidebar_actions_compact)
-    VALUES (?, COALESCE(?, 0.5), COALESCE(?, 0))
+    INSERT INTO user_preferences (
+      user_id, sidebar_projects_ratio, sidebar_actions_compact, sidebar_collapsed_projects, sidebar_collapsed_sections
+    )
+    VALUES (?, COALESCE(?, 0.5), COALESCE(?, 0), ?, ?)
     ON CONFLICT(user_id) DO UPDATE SET
       sidebar_projects_ratio = COALESCE(?, user_preferences.sidebar_projects_ratio),
-      sidebar_actions_compact = COALESCE(?, user_preferences.sidebar_actions_compact)
-    RETURNING sidebar_projects_ratio, sidebar_actions_compact
+      sidebar_actions_compact = COALESCE(?, user_preferences.sidebar_actions_compact),
+      sidebar_collapsed_projects = json_patch(
+        user_preferences.sidebar_collapsed_projects, excluded.sidebar_collapsed_projects
+      ),
+      sidebar_collapsed_sections = json_patch(
+        user_preferences.sidebar_collapsed_sections, excluded.sidebar_collapsed_sections
+      )
+    RETURNING sidebar_projects_ratio, sidebar_actions_compact, sidebar_collapsed_projects, sidebar_collapsed_sections
   `),
 
   // Invitation 操作

package/local-runtime/server/db/user-preferences-db.js

@@ -4,6 +4,8 @@ function toPreferences(row) {
   return {
     sidebarProjectsRatio: row?.sidebar_projects_ratio ?? 0.5,
     sidebarActionsCompact: !!row?.sidebar_actions_compact,
+    sidebarCollapsedProjects: JSON.parse(row?.sidebar_collapsed_projects ?? '{}'),
+    sidebarCollapsedSections: JSON.parse(row?.sidebar_collapsed_sections ?? '{}'),
   };
 }
 
@@ -14,10 +16,15 @@ export const userPreferencesDb = {
   },
 
   // The HTTP boundary validates the patch. A single upsert preserves omitted
-  // fields without a read/merge/write race between independent clients.
+  // fields and merges map keys without a read/merge/write race between clients.
+  // Empty maps are no-ops; explicit false values remain stored overrides.
   update(userId, patch) {
     const ratio = patch.sidebarProjectsRatio ?? null;
     const compact = patch.sidebarActionsCompact === undefined ? null : Number(patch.sidebarActionsCompact);
-    return toPreferences(stmts.upsertUserPreferences.get(userId, ratio, compact, ratio, compact));
+    const projects = JSON.stringify(patch.sidebarCollapsedProjects ?? {});
+    const sections = JSON.stringify(patch.sidebarCollapsedSections ?? {});
+    return toPreferences(stmts.upsertUserPreferences.get(
+      userId, ratio, compact, projects, sections, ratio, compact,
+    ));
   },
 };

package/local-runtime/server/routes/user-routes.js

@@ -51,6 +51,26 @@ function ensureAgentSecret(user) {
   return userDb.resetAgentSecret(user.id);
 }
 
+function isPlainObject(value) {
+  if (!value || typeof value !== 'object') return false;
+  const prototype = Object.getPrototypeOf(value);
+  return prototype === Object.prototype || prototype === null;
+}
+
+const preferenceFields = new Set([
+  'sidebarProjectsRatio', 'sidebarActionsCompact', 'sidebarCollapsedProjects', 'sidebarCollapsedSections',
+]);
+const unsafeMapKeys = new Set(['__proto__', 'constructor', 'prototype']);
+
+function isCollapseMap(value, sections = false) {
+  if (!isPlainObject(value)) return false;
+  const entries = Object.entries(value);
+  return (sections || entries.length <= 1000) && entries.every(([key, collapsed]) => (
+    typeof collapsed === 'boolean' && !unsafeMapKeys.has(key)
+    && (sections ? key === 'projects' || key === 'recents' : key.length > 0 && key.length <= 200)
+  ));
+}
+
 /**
  * Register user profile, agent secret, and admin user management routes.
  */
@@ -104,17 +124,22 @@ export function registerUserRoutes(app, {
       }
 
       const body = req.body;
-      if (!body || typeof body !== 'object' || Array.isArray(body)
+      if (!isPlainObject(body)
         || Object.keys(body).length === 0
-        || Object.keys(body).some(key => key !== 'sidebarProjectsRatio' && key !== 'sidebarActionsCompact')
+        || Object.keys(body).some(key => !preferenceFields.has(key))
         || (Object.hasOwn(body, 'sidebarProjectsRatio') && (
           typeof body.sidebarProjectsRatio !== 'number'
           || !Number.isFinite(body.sidebarProjectsRatio)
           || body.sidebarProjectsRatio < 0.15 || body.sidebarProjectsRatio > 0.85
         ))
-        || (Object.hasOwn(body, 'sidebarActionsCompact') && typeof body.sidebarActionsCompact !== 'boolean')) {
+        || (Object.hasOwn(body, 'sidebarActionsCompact') && typeof body.sidebarActionsCompact !== 'boolean')
+        || (Object.hasOwn(body, 'sidebarCollapsedProjects') && !isCollapseMap(body.sidebarCollapsedProjects))
+        || (Object.hasOwn(body, 'sidebarCollapsedSections') && !isCollapseMap(body.sidebarCollapsedSections, true))) {
         return res.status(400).json({
-          error: 'Expected a nonempty patch with only sidebarProjectsRatio (finite number between 0.15 and 0.85) and/or sidebarActionsCompact (boolean)',
+          error: 'Expected a nonempty patch with only sidebarProjectsRatio (finite number between 0.15 and 0.85), '
+            + 'sidebarActionsCompact (boolean), sidebarCollapsedProjects (boolean map, up to 1000 nonempty project IDs '
+            + 'of at most 200 characters, excluding __proto__/constructor/prototype), and/or '
+            + 'sidebarCollapsedSections (boolean map with only projects/recents)',
         });
       }
 

package/local-runtime/version.json

@@ -1 +1 @@
-{"version":"1.0.666"}
+{"version":"1.0.667"}