Deploy v3.4.0 persistence update

DEPLOY.md

@@ -45,7 +45,7 @@ Next server phase:
 - add job/update APIs
 Then extend `marine_mcp.py` with corresponding tools.
 
-## v3.3.0 deployment stability
+## v3.4.0 deployment stability
 
 - `VERSION` is the single application version source.
 - Only root `app.html` is served; do not re-create `templates/app.html`.

README.md

@@ -9,10 +9,10 @@ app_port: 7860
 
 # Global Marine Foundation Data Agent
 
-Current UI release: **v3.3.0**.
+Current UI release: **v3.4.0**.
 
 
-## v3.3.0 稳定性重构（第一阶段）
+## v3.4.0 稳定性重构（第一阶段）
 
 - 新增根目录 `VERSION`，后端与前端统一从同一版本源渲染，避免版本号漂移。
 - 运行时仅服务根目录 `app.html`；发布包不再携带第二份 `templates/app.html`。

VERSION

@@ -1 +1 @@
-3.3.0
+3.4.0

app.html

@@ -697,6 +697,8 @@ let CURRENT_VIEW="chat";
 let FAVORITES=[];
 let FAVORITES_SYNC={enabled:false,storage_mode:"local",status:"local"};
 let FAVORITES_SYNC_TIMER=null;
+let WORKSPACE_SYNC_TIMER=null;
+let WORKSPACE_SYNC={enabled:false,storage_mode:"local",status:"local"};
 let DATASET_COMPARE=[];
 let SETTINGS={fontSize:"normal",enterToSend:true,refreshSeconds:15,accent:"blue",defaultView:"chat",compact:false,reduceMotion:false,longitudeRange:"-180_180",timeDisplay:"local",exportFormat:"auto",answerDetail:"standard",historyLimit:30,confirmDownload:true,messageActionTrigger:"left"};
 let STATUS_TIMER=null;
@@ -736,7 +738,7 @@ function loadSessions(){
 }
 let S=[];
 
-function save(){const limit=[10,30,50].includes(Number(SETTINGS.historyLimit))?Number(SETTINGS.historyLimit):30;localStorage.setItem(K,JSON.stringify(S.slice(0,limit)))}
+function save(){const limit=[10,30,50].includes(Number(SETTINGS.historyLimit))?Number(SETTINGS.historyLimit):30;localStorage.setItem(K,JSON.stringify(S.slice(0,limit)));scheduleWorkspaceSync()}
 function scopedKey(base){return base+":"+USER_ID}
 function loadFavorites(){
   try{return JSON.parse(localStorage.getItem(scopedKey(FAV_BASE_K))||"[]")}
@@ -796,7 +798,11 @@ function loadSettings(){
   }
   catch{return {...SETTINGS}}
 }
-function saveSettings(){localStorage.setItem(scopedKey(SETTINGS_BASE_K),JSON.stringify(SETTINGS))}
+function saveSettings(){localStorage.setItem(scopedKey(SETTINGS_BASE_K),JSON.stringify(SETTINGS));scheduleWorkspaceSync()}
+function mergeSessions(remote,local){const map=new Map();[...(remote||[]),...(local||[])].forEach(x=>{if(!x||!x.thread_id)return;const prev=map.get(x.thread_id);if(!prev||Number(x.updated||0)>=Number(prev.updated||0))map.set(x.thread_id,x)});return [...map.values()].sort((a,b)=>Number(b.updated||0)-Number(a.updated||0)).slice(0,50)}
+function scheduleWorkspaceSync(){if(!AUTH_ENABLED||!AUTH_TOKEN)return;clearTimeout(WORKSPACE_SYNC_TIMER);WORKSPACE_SYNC_TIMER=setTimeout(()=>pushWorkspaceToServer().catch(()=>{}),500)}
+async function pushWorkspaceToServer(){if(!AUTH_ENABLED||!AUTH_TOKEN)return;WORKSPACE_SYNC.status="syncing";const data=await j("/api/sidebar/workspace",{method:"PUT",body:JSON.stringify({user_id:USER_ID,sessions:S.slice(0,50),settings:SETTINGS})});WORKSPACE_SYNC={enabled:!!data.sync_enabled,storage_mode:data.storage_mode||"server_session",status:"synced"}}
+async function syncWorkspaceFromServer(){if(!AUTH_ENABLED||!AUTH_TOKEN){WORKSPACE_SYNC={enabled:false,storage_mode:"local",status:"local"};return}try{const localSessions=loadSessions(),localSettings=loadSettings();const data=await j("/api/sidebar/workspace?user_id="+encodeURIComponent(USER_ID));S=mergeSessions(data.sessions||[],localSessions);SETTINGS={...SETTINGS,...localSettings,...(data.settings||{})};localStorage.setItem(K,JSON.stringify(S.slice(0,50)));localStorage.setItem(scopedKey(SETTINGS_BASE_K),JSON.stringify(SETTINGS));WORKSPACE_SYNC={enabled:!!data.sync_enabled,storage_mode:data.storage_mode||"server_session",status:"synced"};if(localSessions.length||Object.keys(localSettings||{}).length)await pushWorkspaceToServer()}catch(err){WORKSPACE_SYNC={enabled:false,storage_mode:"local",status:"error"};console.warn("workspace sync failed",err)}}
 function exportWorkspaceBackup(){
   const payload={schema:"squid-workspace-backup",schema_version:1,app_version:"__APP_VERSION__",exported_at:new Date().toISOString(),sessions:S.slice(0,50),favorites:FAVORITES.slice(0,100),settings:SETTINGS};
   const blob=new Blob([JSON.stringify(payload,null,2)],{type:"application/json;charset=utf-8"}),url=URL.createObjectURL(blob),a=document.createElement("a");
@@ -1975,9 +1981,10 @@ async function boot(){
   }
 
   S=loadSessions();
+  SETTINGS=loadSettings();
   FAVORITES=loadFavorites();
   await syncFavoritesFromServer();
-  SETTINGS=loadSettings();
+  await syncWorkspaceFromServer();
   document.body.classList.remove("auth-pending");
   hist();
   status();

tests/test_release_stability.py

@@ -7,7 +7,7 @@ def test_version_is_single_source():
     version = (ROOT / "VERSION").read_text(encoding="utf-8").strip()
     ui = (ROOT / "ui_server.py").read_text(encoding="utf-8")
     html = (ROOT / "app.html").read_text(encoding="utf-8")
-    assert version == "3.3.0"
+    assert version == "3.4.0"
     assert 'with_name("VERSION")' in ui
     assert "__APP_VERSION__" in html
 

ui_server.py

@@ -45,9 +45,9 @@ MEMORY_API_TOKEN = os.environ.get("MEMORY_API_TOKEN", "").strip()
 ADMIN_DASHBOARD_PASSWORD = os.environ.get("ADMIN_DASHBOARD_PASSWORD", "").strip()
 VERSION_FILE = Path(__file__).with_name("VERSION")
 try:
-    CODE_VERSION = VERSION_FILE.read_text(encoding="utf-8").strip() or "3.3.0"
+    CODE_VERSION = VERSION_FILE.read_text(encoding="utf-8").strip() or "3.4.0"
 except Exception:
-    CODE_VERSION = "3.3.0"
+    CODE_VERSION = "3.4.0"
 APP_VERSION = CODE_VERSION
 APP_REVISION = (
     os.environ.get("SPACE_REVISION", "").strip()
@@ -366,6 +366,55 @@ class FavoritesSyncRequest(BaseModel):
     user_id: str = ""
     favorites: list[dict[str, Any]] = Field(default_factory=list)
 
+class WorkspaceSyncRequest(BaseModel):
+    user_id: str = ""
+    sessions: list[dict[str, Any]] = Field(default_factory=list)
+    settings: dict[str, Any] = Field(default_factory=dict)
+
+def _workspace_state_file(user_id: str) -> Path:
+    if not valid_user_id(user_id):
+        raise HTTPException(400, "invalid user_id")
+    return USER_STATE_ROOT / f"{user_id}.workspace.json"
+
+def _sanitize_workspace_sessions(items: Any) -> list[dict[str, Any]]:
+    out=[]
+    for x in items if isinstance(items,list) else []:
+        if not isinstance(x,dict): continue
+        thread_id=str(x.get("thread_id") or "")[:200]
+        if not thread_id: continue
+        messages=[]
+        for m in (x.get("messages") if isinstance(x.get("messages"),list) else [])[-80:]:
+            if not isinstance(m,dict): continue
+            messages.append({
+                "role":"assistant" if m.get("role")=="assistant" else "user",
+                "text":str(m.get("text") or "")[:50000],
+                "meta":str(m.get("meta") or "")[:1000],
+                "time":int(m.get("time") or int(time.time()*1000)),
+            })
+        out.append({"thread_id":thread_id,"title":str(x.get("title") or "新对话")[:200],"updated":int(x.get("updated") or int(time.time()*1000)),"messages":messages})
+        if len(out)>=50: break
+    return out
+
+def _sanitize_workspace_settings(value: Any) -> dict[str, Any]:
+    if not isinstance(value,dict): return {}
+    allowed={"fontSize","enterToSend","refreshSeconds","accent","defaultView","compact","reduceMotion","longitudeRange","timeDisplay","exportFormat","answerDetail","historyLimit","confirmDownload","messageActionTrigger"}
+    return {str(k):v for k,v in value.items() if k in allowed}
+
+def _read_server_workspace(user_id: str) -> dict[str, Any]:
+    path=_workspace_state_file(user_id)
+    if not path.exists(): return {"sessions":[],"settings":{},"updated_at":""}
+    try: raw=json.loads(path.read_text(encoding="utf-8"))
+    except Exception: return {"sessions":[],"settings":{},"updated_at":""}
+    return {"sessions":_sanitize_workspace_sessions(raw.get("sessions",[])),"settings":_sanitize_workspace_settings(raw.get("settings",{})),"updated_at":str(raw.get("updated_at") or "")}
+
+def _write_server_workspace(user_id: str, sessions: Any, settings: Any) -> dict[str, Any]:
+    clean_sessions=_sanitize_workspace_sessions(sessions)
+    clean_settings=_sanitize_workspace_settings(settings)
+    payload={"schema":"squid-server-workspace","schema_version":1,"updated_at":datetime.now().astimezone().isoformat(timespec="seconds"),"sessions":clean_sessions,"settings":clean_settings}
+    path=_workspace_state_file(user_id); tmp=path.with_suffix(path.suffix+".tmp")
+    tmp.write_text(json.dumps(payload,ensure_ascii=False,indent=2),encoding="utf-8"); tmp.replace(path)
+    return payload
+
 def _favorite_state_file(user_id: str) -> Path:
     if not valid_user_id(user_id):
         raise HTTPException(400, "invalid user_id")
@@ -3994,6 +4043,21 @@ async def put_synced_favorites(body: FavoritesSyncRequest, request: Request):
         "count": len(items),
     }
 
+@app.get("/api/sidebar/workspace")
+async def get_synced_workspace(request: Request):
+    supplied_uid=str(request.query_params.get("user_id") or "").strip()
+    uid,auth_user=await resolve_request_user(request,supplied_uid)
+    if AUTH_ENABLED and not auth_user: raise HTTPException(401,"Authentication required")
+    data=_read_server_workspace(uid)
+    return {**data,"sync_enabled":bool(auth_user),"storage_mode":_favorites_storage_mode(),"user_id":uid}
+
+@app.put("/api/sidebar/workspace")
+async def put_synced_workspace(body: WorkspaceSyncRequest, request: Request):
+    uid,auth_user=await resolve_request_user(request,body.user_id)
+    if AUTH_ENABLED and not auth_user: raise HTTPException(401,"Authentication required")
+    data=_write_server_workspace(uid,body.sessions,body.settings)
+    return {**data,"sync_enabled":bool(auth_user),"storage_mode":_favorites_storage_mode(),"user_id":uid}
+
 @app.get("/api/status")
 async def status(request:Request, thread_id: str | None = None):
     if AUTH_ENABLED: