fix(backup): include goals and tasks in exports

README.md

@@ -8,15 +8,16 @@
 
 - **桌面式交互**：桌面图标、任务栏、启动器、多窗口、最小化/最大化/关闭。
 - **Today**：每日文字记录、情绪天气、1–5 能量等级，以及随机生成的“今日电影”。
-- **Timeline**：按时间轴浏览、编辑和删除记忆。
+- **Timeline**：按时间轴浏览、编辑和删除记忆；支持标签、地点/场景、收藏和关联待办，并可按标签或关键词筛选。
 - **Museum**：将重要记忆长期珍藏为馆藏。
 - **Tasks / Goals**：创建目标和待办，关联任务、设置截止日期与优先级，查看今天/即将开始/已完成事项并追踪目标进度。
+- **Calendar**：月历查看每天的记忆、待办截止与完成记录，以及目标创建、目标日期和完成节点；可切换到日视图查看当天详情。
 - **Insights / Profile**：查看情绪、能量、连续记录与个人系统状态。
 - **System**：深浅主题、自动识别浏览器语言（也可固定中文/English）、JSON 导入导出与本地存储说明。
 - **Bing 每日一图**：桌面壁纸每日自动更新；由 Life OS 同源代理读取，避免浏览器跨域限制。
 - **Windows 式操作**：桌面端单击选择、双击打开；右键桌面或 App 图标可使用快捷菜单。
 - **快捷键与草稿恢复**：`Ctrl / ⌘ + K` 打开启动器，`Ctrl / ⌘ + F` 搜索记忆，`Ctrl / ⌘ + S` 归档 Today；当天未归档文字会自动恢复。
-- **Tasks 快捷键**：`Alt + 6` 打开目标与待办，`Alt + 7` 打开 System。
+- **App 快捷键**：`Alt + 6` 打开目标与待办，`Alt + 7` 打开日历，`Alt + 8` 打开 System。
 - **移动端**：App 以全屏方式打开，保留任务栏恢复入口。
 - **个人云端**：使用 ChatGPT 登录后，数据按账号隔离并同步到 SQLite 兼容的 D1 数据库。
 
@@ -34,7 +35,7 @@
 - `lifeos_settings`
 - `lifeos_system`
 
-备份格式包含 `schemaVersion: 1`，为后续数据迁移预留兼容空间。目标和待办保存在 `lifeos_system.tasksBoard`，随现有云端 system 字段同步，并包含在新版 JSON 备份中。
+JSON 备份使用 `schemaVersion: 2`，导入仍兼容 v1 备份。D1 表结构保持 v1：目标和待办保存在 `lifeos_system.tasksBoard`，随现有 `system_json` 字段同步；记忆及其标签、地点、关联待办保存在 `lifeos_memories`。云端恢复时会把本机尚未同步的目标与待办合并并补传。旧版记忆继续兼容，新增信息为选填。
 
 ## 运行
 
@@ -54,6 +55,7 @@ npm run validate
 ```text
 public/index.html   # 桌面框架与窗口交互
 public/tasks.js     # 目标与待办 App
+public/calendar.js  # 记忆、待办与目标节点的日历时间轴
 public/addons.js    # 窗口与辅助交互
 worker/index.js     # ChatGPT 登录门槛、云端数据 API 与 Bing 壁纸代理
 drizzle/            # SQLite / D1 数据库迁移

package.json

@@ -1,6 +1,6 @@
 {
   "name": "life-os",
-  "version": "1.2.0",
+  "version": "1.4.2",
   "private": true,
   "type": "module",
   "scripts": {

public/addons.js

@@ -1,8 +1,8 @@
 /* Life OS reliability and productivity add-ons. */
 (() => {
   const DRAFT_KEY = 'lifeos_today_draft_v1';
-  const APP_VERSION = '1.2.0';
+  const APP_VERSION = '1.4.2';
-  const appIds = ['today', 'timeline', 'museum', 'insights', 'profile', 'tasks', 'system'];
+  const appIds = ['today', 'timeline', 'museum', 'insights', 'profile', 'tasks', 'calendar', 'system'];
   const t = (key, values) => LifeI18n.t(key, values);
 
   function readDraft() {
@@ -75,33 +75,44 @@
     });
   }
   function exportData() {
-    const data = { app: 'Life OS', version: APP_VERSION, schemaVersion: 1, exportedAt: new Date().toISOString(), profile: profile(), memories: mems(), museum: museum(), settings: settings(), system: sys() };
+    const data = { app: 'Life OS', version: APP_VERSION, schemaVersion: 2, exportedAt: new Date().toISOString(), profile: profile(), memories: mems(), museum: museum(), settings: settings(), system: sys() };
     const link = document.createElement('a');
     link.href = URL.createObjectURL(new Blob([JSON.stringify(data, null, 2)], { type: 'application/json' }));
     link.download = `life-os-backup-${day()}.json`; link.click();
     const state = settings(); state.lastBackup = new Date().toISOString(); save('lifeos_settings', state); renderAll(); toast('feedback.backup');
   }
+  // The System panel uses inline onclick handlers, so expose this complete exporter.
+  window.exportData = exportData;
   const CLOUD_KEYS = { profile: 'lifeos_profile', memories: 'lifeos_memories', museum: 'lifeos_museum', settings: 'lifeos_settings', system: 'lifeos_system' };
   let cloudReady = false, applyingCloud = false, syncTimer = null, syncErrorShown = false;
-  const cloudFallback = { profile: {}, memories: [], museum: [], settings: {}, system: {} };
+  const cloudFallback = { profile: {}, memories: [], museum: [], settings: {}, system: { schemaVersion: 2 } };
   function cloudSnapshot() {
-    return Object.fromEntries(Object.entries(CLOUD_KEYS).map(([field, key]) => {
+    const snapshot = Object.fromEntries(Object.entries(CLOUD_KEYS).map(([field, key]) => {
       try { return [field, JSON.parse(localStorage.getItem(key) || JSON.stringify(cloudFallback[field]))]; } catch { return [field, cloudFallback[field]]; }
     }));
+    snapshot.system = { ...snapshot.system, schemaVersion: 2 };
+    return snapshot;
   }
   function hasLocalLife(state) { return state.memories.length || state.museum.length || Object.keys(state.profile).length || Object.keys(state.settings).length > 2 || state.system?.tasksBoard?.goals?.length || state.system?.tasksBoard?.tasks?.length; }
   function applyCloudState(state) {
     let localSystem = {};
     try { localSystem = JSON.parse(localStorage.getItem('lifeos_system') || '{}'); } catch {}
     const localBoard = localSystem.tasksBoard, cloudBoard = state.system?.tasksBoard;
+    const systemNeedsMigration = (Number(state.system?.schemaVersion) || 1) < 2;
+    state = { ...state, system: { ...(state.system || {}), schemaVersion: 2 } };
+    let mergedLocalBoard = false;
     if ((localBoard?.goals?.length || localBoard?.tasks?.length) && state.system) {
-      const mergeById = (cloudItems = [], localItems = []) => [...cloudItems, ...localItems.filter(item => !cloudItems.some(existing => existing.id === item.id))];
+      const mergeById = (cloudItems = [], localItems = []) => {
+        mergedLocalBoard ||= localItems.some(item => !cloudItems.some(existing => existing.id === item.id));
+        return [...cloudItems, ...localItems.filter(item => !cloudItems.some(existing => existing.id === item.id))];
+      };
       state = { ...state, system: { ...state.system, tasksBoard: { goals: mergeById(cloudBoard?.goals, localBoard.goals), tasks: mergeById(cloudBoard?.tasks, localBoard.tasks) } } };
     }
     applyingCloud = true;
     Object.entries(CLOUD_KEYS).forEach(([field, key]) => localStorage.setItem(key, JSON.stringify(state[field] ?? cloudFallback[field])));
     applyingCloud = false;
     todayDraft = null; renderIcons(); renderAll(); applyLanguage();
+    return mergedLocalBoard || systemNeedsMigration;
   }
   async function uploadCloudState() {
     if (!cloudReady) return;
@@ -131,7 +142,9 @@
       const local = cloudSnapshot();
       if (state) {
         if (hasLocalLife(local)) localStorage.setItem('lifeos_precloud_backup_v1', JSON.stringify({ exportedAt: new Date().toISOString(), state: local }));
-        applyCloudState(state); cloudReady = true; toast('addon.cloudRestored');
+        const mergedLocalBoard = applyCloudState(state); cloudReady = true;
+        if (mergedLocalBoard) await uploadCloudState();
+        toast('addon.cloudRestored');
       } else if (hasLocalLife(local)) {
         migrationPrompt(local);
       } else {
@@ -163,7 +176,7 @@
     if (mod && e.key.toLowerCase() === 'k') { e.preventDefault(); toggleLauncher(); }
     if (mod && e.key.toLowerCase() === 'f') { e.preventDefault(); openSearch(); }
     if (mod && e.key.toLowerCase() === 's' && document.querySelector('#entry')) { e.preventDefault(); archiveToday(); }
-    if (e.altKey && /^[1-7]$/.test(e.key)) { e.preventDefault(); openApp(appIds[Number(e.key) - 1]); }
+    if (e.altKey && /^[1-8]$/.test(e.key)) { e.preventDefault(); openApp(appIds[Number(e.key) - 1]); }
     if (e.key === 'Escape') { closeSearch(); document.querySelector('#launcher')?.classList.add('hidden'); document.querySelector('#calendar')?.classList.add('hidden'); document.querySelector('#life-context')?.remove(); }
   });
 })();