@cloudcli-ai/cloudcli 1.34.0 → 1.35.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (247) hide show
  1. package/README.de.md +9 -1
  2. package/README.ja.md +8 -0
  3. package/README.ko.md +9 -1
  4. package/README.md +23 -5
  5. package/README.ru.md +9 -1
  6. package/README.tr.md +8 -1
  7. package/README.zh-CN.md +9 -1
  8. package/README.zh-TW.md +9 -1
  9. package/dist/api-docs.html +36 -18
  10. package/dist/assets/index-BvX30NW5.css +32 -0
  11. package/dist/assets/index-D1IdCTT6.js +1418 -0
  12. package/dist/index.html +12 -4
  13. package/dist-server/server/browser-use-mcp.js +350 -0
  14. package/dist-server/server/browser-use-mcp.js.map +1 -0
  15. package/dist-server/server/claude-sdk.js +25 -5
  16. package/dist-server/server/claude-sdk.js.map +1 -1
  17. package/dist-server/server/cli.js +14 -6
  18. package/dist-server/server/cli.js.map +1 -1
  19. package/dist-server/server/cursor-cli.js +27 -11
  20. package/dist-server/server/cursor-cli.js.map +1 -1
  21. package/dist-server/server/gemini-cli.js +17 -2
  22. package/dist-server/server/gemini-cli.js.map +1 -1
  23. package/dist-server/server/index.js +136 -40
  24. package/dist-server/server/index.js.map +1 -1
  25. package/dist-server/server/load-env.js +1 -1
  26. package/dist-server/server/load-env.js.map +1 -1
  27. package/dist-server/server/modules/browser-use/browser-use-mcp.routes.js +107 -0
  28. package/dist-server/server/modules/browser-use/browser-use-mcp.routes.js.map +1 -0
  29. package/dist-server/server/modules/browser-use/browser-use.routes.js +93 -0
  30. package/dist-server/server/modules/browser-use/browser-use.routes.js.map +1 -0
  31. package/dist-server/server/modules/browser-use/browser-use.service.js +688 -0
  32. package/dist-server/server/modules/browser-use/browser-use.service.js.map +1 -0
  33. package/dist-server/server/modules/browser-use/tests/browser-use.service.test.js +8 -0
  34. package/dist-server/server/modules/browser-use/tests/browser-use.service.test.js.map +1 -0
  35. package/dist-server/server/modules/database/index.js +1 -0
  36. package/dist-server/server/modules/database/index.js.map +1 -1
  37. package/dist-server/server/modules/database/migrations.js +23 -1
  38. package/dist-server/server/modules/database/migrations.js.map +1 -1
  39. package/dist-server/server/modules/database/repositories/notification-channel-endpoints.js +100 -0
  40. package/dist-server/server/modules/database/repositories/notification-channel-endpoints.js.map +1 -0
  41. package/dist-server/server/modules/database/repositories/notification-preferences.js +8 -0
  42. package/dist-server/server/modules/database/repositories/notification-preferences.js.map +1 -1
  43. package/dist-server/server/modules/database/repositories/sessions.db.js +173 -17
  44. package/dist-server/server/modules/database/repositories/sessions.db.js.map +1 -1
  45. package/dist-server/server/modules/database/schema.js +26 -0
  46. package/dist-server/server/modules/database/schema.js.map +1 -1
  47. package/dist-server/server/modules/database/tests/projects.db.integration.test.js.map +1 -0
  48. package/dist-server/server/modules/database/tests/sessions-provider-mapping.test.js +78 -0
  49. package/dist-server/server/modules/database/tests/sessions-provider-mapping.test.js.map +1 -0
  50. package/dist-server/server/modules/database/{repositories → tests}/sessions.db.integration.test.js +10 -0
  51. package/dist-server/server/modules/database/tests/sessions.db.integration.test.js.map +1 -0
  52. package/dist-server/server/modules/notifications/index.js +4 -0
  53. package/dist-server/server/modules/notifications/index.js.map +1 -0
  54. package/dist-server/server/modules/notifications/notifications.routes.js +115 -0
  55. package/dist-server/server/modules/notifications/notifications.routes.js.map +1 -0
  56. package/dist-server/server/modules/notifications/services/desktop-notification-clients.service.js +97 -0
  57. package/dist-server/server/modules/notifications/services/desktop-notification-clients.service.js.map +1 -0
  58. package/dist-server/server/modules/notifications/services/notification-orchestrator.service.js +229 -0
  59. package/dist-server/server/modules/notifications/services/notification-orchestrator.service.js.map +1 -0
  60. package/dist-server/server/modules/notifications/websocket/desktop-notifications-websocket.service.js +79 -0
  61. package/dist-server/server/modules/notifications/websocket/desktop-notifications-websocket.service.js.map +1 -0
  62. package/dist-server/server/modules/projects/services/project-management.service.js +0 -4
  63. package/dist-server/server/modules/projects/services/project-management.service.js.map +1 -1
  64. package/dist-server/server/modules/projects/services/projects-with-sessions-fetch.service.js +10 -38
  65. package/dist-server/server/modules/projects/services/projects-with-sessions-fetch.service.js.map +1 -1
  66. package/dist-server/server/modules/providers/index.js +1 -0
  67. package/dist-server/server/modules/providers/index.js.map +1 -1
  68. package/dist-server/server/modules/providers/list/claude/claude-session-synchronizer.provider.js +24 -1
  69. package/dist-server/server/modules/providers/list/claude/claude-session-synchronizer.provider.js.map +1 -1
  70. package/dist-server/server/modules/providers/list/claude/claude-sessions.provider.js +9 -12
  71. package/dist-server/server/modules/providers/list/claude/claude-sessions.provider.js.map +1 -1
  72. package/dist-server/server/modules/providers/list/claude/claude-skills.provider.js +7 -0
  73. package/dist-server/server/modules/providers/list/claude/claude-skills.provider.js.map +1 -1
  74. package/dist-server/server/modules/providers/list/codex/codex-session-synchronizer.provider.js +7 -3
  75. package/dist-server/server/modules/providers/list/codex/codex-session-synchronizer.provider.js.map +1 -1
  76. package/dist-server/server/modules/providers/list/codex/codex-sessions.provider.js +3 -9
  77. package/dist-server/server/modules/providers/list/codex/codex-sessions.provider.js.map +1 -1
  78. package/dist-server/server/modules/providers/list/codex/codex-skills.provider.js +7 -0
  79. package/dist-server/server/modules/providers/list/codex/codex-skills.provider.js.map +1 -1
  80. package/dist-server/server/modules/providers/list/cursor/cursor-sessions.provider.js +13 -22
  81. package/dist-server/server/modules/providers/list/cursor/cursor-sessions.provider.js.map +1 -1
  82. package/dist-server/server/modules/providers/list/cursor/cursor-skills.provider.js +7 -0
  83. package/dist-server/server/modules/providers/list/cursor/cursor-skills.provider.js.map +1 -1
  84. package/dist-server/server/modules/providers/list/gemini/gemini-models.provider.js +5 -8
  85. package/dist-server/server/modules/providers/list/gemini/gemini-models.provider.js.map +1 -1
  86. package/dist-server/server/modules/providers/list/gemini/gemini-sessions.provider.js +6 -6
  87. package/dist-server/server/modules/providers/list/gemini/gemini-sessions.provider.js.map +1 -1
  88. package/dist-server/server/modules/providers/list/gemini/gemini-skills.provider.js +7 -0
  89. package/dist-server/server/modules/providers/list/gemini/gemini-skills.provider.js.map +1 -1
  90. package/dist-server/server/modules/providers/list/opencode/opencode-session-synchronizer.provider.js +17 -3
  91. package/dist-server/server/modules/providers/list/opencode/opencode-session-synchronizer.provider.js.map +1 -1
  92. package/dist-server/server/modules/providers/list/opencode/opencode-sessions.provider.js +9 -10
  93. package/dist-server/server/modules/providers/list/opencode/opencode-sessions.provider.js.map +1 -1
  94. package/dist-server/server/modules/providers/provider.routes.js +123 -1
  95. package/dist-server/server/modules/providers/provider.routes.js.map +1 -1
  96. package/dist-server/server/modules/providers/services/mcp.service.js +23 -0
  97. package/dist-server/server/modules/providers/services/mcp.service.js.map +1 -1
  98. package/dist-server/server/modules/providers/services/provider-capabilities.service.js +65 -0
  99. package/dist-server/server/modules/providers/services/provider-capabilities.service.js.map +1 -0
  100. package/dist-server/server/modules/providers/services/provider-models.service.js +1 -1
  101. package/dist-server/server/modules/providers/services/provider-models.service.js.map +1 -1
  102. package/dist-server/server/modules/providers/services/sessions-watcher.service.js +62 -23
  103. package/dist-server/server/modules/providers/services/sessions-watcher.service.js.map +1 -1
  104. package/dist-server/server/modules/providers/services/sessions.service.js +62 -4
  105. package/dist-server/server/modules/providers/services/sessions.service.js.map +1 -1
  106. package/dist-server/server/modules/providers/services/skills.service.js +11 -0
  107. package/dist-server/server/modules/providers/services/skills.service.js.map +1 -1
  108. package/dist-server/server/modules/providers/shared/skills/skills.provider.js +163 -1
  109. package/dist-server/server/modules/providers/shared/skills/skills.provider.js.map +1 -1
  110. package/dist-server/server/modules/providers/tests/opencode-sessions.test.js +45 -0
  111. package/dist-server/server/modules/providers/tests/opencode-sessions.test.js.map +1 -1
  112. package/dist-server/server/modules/providers/tests/skills.test.js +160 -0
  113. package/dist-server/server/modules/providers/tests/skills.test.js.map +1 -1
  114. package/dist-server/server/modules/websocket/index.js +1 -0
  115. package/dist-server/server/modules/websocket/index.js.map +1 -1
  116. package/dist-server/server/modules/websocket/services/chat-run-registry.service.js +252 -0
  117. package/dist-server/server/modules/websocket/services/chat-run-registry.service.js.map +1 -0
  118. package/dist-server/server/modules/websocket/services/chat-session-writer.service.js +105 -0
  119. package/dist-server/server/modules/websocket/services/chat-session-writer.service.js.map +1 -0
  120. package/dist-server/server/modules/websocket/services/chat-websocket.service.js +218 -156
  121. package/dist-server/server/modules/websocket/services/chat-websocket.service.js.map +1 -1
  122. package/dist-server/server/modules/websocket/services/shell-websocket.service.js +83 -31
  123. package/dist-server/server/modules/websocket/services/shell-websocket.service.js.map +1 -1
  124. package/dist-server/server/modules/websocket/services/websocket-server.service.js +5 -0
  125. package/dist-server/server/modules/websocket/services/websocket-server.service.js.map +1 -1
  126. package/dist-server/server/modules/websocket/tests/chat-run-registry.test.js +216 -0
  127. package/dist-server/server/modules/websocket/tests/chat-run-registry.test.js.map +1 -0
  128. package/dist-server/server/openai-codex.js +24 -14
  129. package/dist-server/server/openai-codex.js.map +1 -1
  130. package/dist-server/server/opencode-cli.js +21 -8
  131. package/dist-server/server/opencode-cli.js.map +1 -1
  132. package/dist-server/server/opencode-cli.test.js +19 -1
  133. package/dist-server/server/opencode-cli.test.js.map +1 -1
  134. package/dist-server/server/routes/settings.js +1 -1
  135. package/dist-server/server/routes/settings.js.map +1 -1
  136. package/dist-server/server/services/notification-orchestrator.js +1 -176
  137. package/dist-server/server/services/notification-orchestrator.js.map +1 -1
  138. package/dist-server/server/services/tests/notification-orchestrator.test.js +64 -0
  139. package/dist-server/server/services/tests/notification-orchestrator.test.js.map +1 -0
  140. package/dist-server/server/shared/{claude-cli-path.test.js → tests/claude-cli-path.test.js} +1 -1
  141. package/dist-server/server/shared/tests/claude-cli-path.test.js.map +1 -0
  142. package/dist-server/server/shared/tests/slice-tail-page.test.js +35 -0
  143. package/dist-server/server/shared/tests/slice-tail-page.test.js.map +1 -0
  144. package/dist-server/server/shared/utils.js +73 -1
  145. package/dist-server/server/shared/utils.js.map +1 -1
  146. package/dist-server/server/voice-proxy.js +226 -0
  147. package/dist-server/server/voice-proxy.js.map +1 -0
  148. package/electron/assets/logo-macos.icns +0 -0
  149. package/electron/assets/logo-macos.png +0 -0
  150. package/electron/assets/logo-windows.ico +0 -0
  151. package/electron/cloud.js +260 -0
  152. package/electron/desktopNotifications.js +378 -0
  153. package/electron/desktopWindow.js +766 -0
  154. package/electron/launcher/index.html +14 -0
  155. package/electron/launcher/launcher.css +801 -0
  156. package/electron/launcher/launcher.js +687 -0
  157. package/electron/localServer.js +550 -0
  158. package/electron/main.js +944 -0
  159. package/electron/preload.cjs +60 -0
  160. package/electron/scripts/generate-macos-icon.js +62 -0
  161. package/electron/serverInstaller.js +277 -0
  162. package/electron/tabs.js +87 -0
  163. package/electron/viewHost.js +331 -0
  164. package/package.json +79 -3
  165. package/public/api-docs.html +36 -18
  166. package/scripts/release/build-server-bundle.js +176 -0
  167. package/scripts/release/prepare-desktop-app.js +152 -0
  168. package/server/browser-use-mcp.ts +384 -0
  169. package/server/claude-sdk.js +27 -5
  170. package/server/cli.js +15 -6
  171. package/server/cursor-cli.js +27 -11
  172. package/server/gemini-cli.js +17 -2
  173. package/server/index.js +137 -47
  174. package/server/load-env.js +1 -1
  175. package/server/modules/browser-use/browser-use-mcp.routes.ts +120 -0
  176. package/server/modules/browser-use/browser-use.routes.ts +96 -0
  177. package/server/modules/browser-use/browser-use.service.ts +836 -0
  178. package/server/modules/browser-use/tests/browser-use.service.test.ts +10 -0
  179. package/server/modules/database/index.ts +1 -0
  180. package/server/modules/database/migrations.ts +25 -0
  181. package/server/modules/database/repositories/notification-channel-endpoints.ts +153 -0
  182. package/server/modules/database/repositories/notification-preferences.ts +12 -1
  183. package/server/modules/database/repositories/sessions.db.ts +227 -23
  184. package/server/modules/database/schema.ts +27 -0
  185. package/server/modules/database/tests/sessions-provider-mapping.test.ts +108 -0
  186. package/server/modules/database/{repositories → tests}/sessions.db.integration.test.ts +12 -0
  187. package/server/modules/notifications/index.ts +13 -0
  188. package/server/modules/notifications/notifications.routes.ts +127 -0
  189. package/server/modules/notifications/services/desktop-notification-clients.service.ts +124 -0
  190. package/server/modules/notifications/services/notification-orchestrator.service.js +288 -0
  191. package/server/modules/notifications/websocket/desktop-notifications-websocket.service.ts +109 -0
  192. package/server/modules/projects/services/project-management.service.ts +0 -8
  193. package/server/modules/projects/services/projects-with-sessions-fetch.service.ts +12 -53
  194. package/server/modules/providers/README.md +1 -1
  195. package/server/modules/providers/index.ts +1 -0
  196. package/server/modules/providers/list/claude/claude-session-synchronizer.provider.ts +26 -1
  197. package/server/modules/providers/list/claude/claude-sessions.provider.ts +9 -14
  198. package/server/modules/providers/list/claude/claude-skills.provider.ts +8 -0
  199. package/server/modules/providers/list/codex/codex-session-synchronizer.provider.ts +7 -3
  200. package/server/modules/providers/list/codex/codex-sessions.provider.ts +3 -12
  201. package/server/modules/providers/list/codex/codex-skills.provider.ts +8 -0
  202. package/server/modules/providers/list/cursor/cursor-sessions.provider.ts +13 -22
  203. package/server/modules/providers/list/cursor/cursor-skills.provider.ts +8 -0
  204. package/server/modules/providers/list/gemini/gemini-models.provider.ts +5 -8
  205. package/server/modules/providers/list/gemini/gemini-sessions.provider.ts +6 -6
  206. package/server/modules/providers/list/gemini/gemini-skills.provider.ts +8 -0
  207. package/server/modules/providers/list/opencode/opencode-session-synchronizer.provider.ts +18 -4
  208. package/server/modules/providers/list/opencode/opencode-sessions.provider.ts +9 -12
  209. package/server/modules/providers/provider.routes.ts +167 -1
  210. package/server/modules/providers/services/mcp.service.ts +26 -0
  211. package/server/modules/providers/services/provider-capabilities.service.ts +91 -0
  212. package/server/modules/providers/services/provider-models.service.ts +1 -1
  213. package/server/modules/providers/services/sessions-watcher.service.ts +71 -25
  214. package/server/modules/providers/services/sessions.service.ts +79 -4
  215. package/server/modules/providers/services/skills.service.ts +25 -1
  216. package/server/modules/providers/shared/skills/skills.provider.ts +223 -0
  217. package/server/modules/providers/tests/opencode-sessions.test.ts +49 -0
  218. package/server/modules/providers/tests/skills.test.ts +212 -0
  219. package/server/modules/websocket/README.md +33 -27
  220. package/server/modules/websocket/index.ts +1 -0
  221. package/server/modules/websocket/services/chat-run-registry.service.ts +327 -0
  222. package/server/modules/websocket/services/chat-session-writer.service.ts +145 -0
  223. package/server/modules/websocket/services/chat-websocket.service.ts +292 -207
  224. package/server/modules/websocket/services/shell-websocket.service.ts +108 -32
  225. package/server/modules/websocket/services/websocket-server.service.ts +6 -0
  226. package/server/modules/websocket/tests/chat-run-registry.test.ts +244 -0
  227. package/server/openai-codex.js +24 -14
  228. package/server/opencode-cli.js +21 -8
  229. package/server/opencode-cli.test.js +20 -1
  230. package/server/routes/settings.js +6 -1
  231. package/server/services/notification-orchestrator.js +3 -224
  232. package/server/services/tests/notification-orchestrator.test.js +80 -0
  233. package/server/shared/interfaces.ts +15 -0
  234. package/server/shared/tests/slice-tail-page.test.ts +42 -0
  235. package/server/shared/types.ts +84 -1
  236. package/server/shared/utils.ts +95 -1
  237. package/server/voice-proxy.js +224 -0
  238. package/dist/assets/index-73Xw3i9v.css +0 -32
  239. package/dist/assets/index-BIHaviaA.js +0 -1361
  240. package/dist/modelConstants.js +0 -854
  241. package/dist-server/server/modules/database/repositories/projects.db.integration.test.js.map +0 -1
  242. package/dist-server/server/modules/database/repositories/sessions.db.integration.test.js.map +0 -1
  243. package/dist-server/server/shared/claude-cli-path.test.js.map +0 -1
  244. package/public/modelConstants.js +0 -854
  245. /package/dist-server/server/modules/database/{repositories → tests}/projects.db.integration.test.js +0 -0
  246. /package/server/modules/database/{repositories → tests}/projects.db.integration.test.ts +0 -0
  247. /package/server/shared/{claude-cli-path.test.ts → tests/claude-cli-path.test.ts} +0 -0
@@ -0,0 +1,229 @@
1
+ import webPush from 'web-push';
2
+ import { notificationPreferencesDb, pushSubscriptionsDb, sessionsDb } from '../../../modules/database/index.js';
3
+ import { sendDesktopNotification as sendDesktopNotificationToClients } from '../../../modules/notifications/services/desktop-notification-clients.service.js';
4
+ const KIND_TO_PREF_KEY = {
5
+ action_required: 'actionRequired',
6
+ stop: 'stop',
7
+ error: 'error'
8
+ };
9
+ const PROVIDER_LABELS = {
10
+ claude: 'Claude',
11
+ cursor: 'Cursor',
12
+ codex: 'Codex',
13
+ gemini: 'Gemini',
14
+ system: 'System'
15
+ };
16
+ const recentEventKeys = new Map();
17
+ const DEDUPE_WINDOW_MS = 20000;
18
+ const cleanupOldEventKeys = () => {
19
+ const now = Date.now();
20
+ for (const [key, timestamp] of recentEventKeys.entries()) {
21
+ if (now - timestamp > DEDUPE_WINDOW_MS) {
22
+ recentEventKeys.delete(key);
23
+ }
24
+ }
25
+ };
26
+ function isNotificationEventEnabled(preferences, event) {
27
+ const prefEventKey = KIND_TO_PREF_KEY[event.kind];
28
+ const eventEnabled = prefEventKey ? Boolean(preferences?.events?.[prefEventKey]) : true;
29
+ return eventEnabled;
30
+ }
31
+ function isDuplicate(event) {
32
+ cleanupOldEventKeys();
33
+ const key = event.dedupeKey || `${event.provider}:${event.kind || 'info'}:${event.code || 'generic'}:${event.sessionId || 'none'}`;
34
+ if (recentEventKeys.has(key)) {
35
+ return true;
36
+ }
37
+ recentEventKeys.set(key, Date.now());
38
+ return false;
39
+ }
40
+ function createNotificationEvent({ provider, sessionId = null, kind = 'info', code = 'generic.info', meta = {}, severity = 'info', dedupeKey = null, requiresUserAction = false }) {
41
+ return {
42
+ provider,
43
+ sessionId,
44
+ kind,
45
+ code,
46
+ meta,
47
+ severity,
48
+ requiresUserAction,
49
+ dedupeKey,
50
+ createdAt: new Date().toISOString()
51
+ };
52
+ }
53
+ function normalizeErrorMessage(error) {
54
+ if (typeof error === 'string') {
55
+ return error;
56
+ }
57
+ if (error && typeof error.message === 'string') {
58
+ return error.message;
59
+ }
60
+ if (error == null) {
61
+ return 'Unknown error';
62
+ }
63
+ return String(error);
64
+ }
65
+ function normalizeSessionName(sessionName) {
66
+ if (typeof sessionName !== 'string') {
67
+ return null;
68
+ }
69
+ const normalized = sessionName.replace(/\s+/g, ' ').trim();
70
+ if (!normalized) {
71
+ return null;
72
+ }
73
+ return normalized.length > 80 ? `${normalized.slice(0, 77)}...` : normalized;
74
+ }
75
+ function rowMatchesProvider(row, provider) {
76
+ return row && (!provider || row.provider === provider);
77
+ }
78
+ function resolveSessionRow(sessionId, provider) {
79
+ if (!sessionId) {
80
+ return null;
81
+ }
82
+ const appSessionRow = sessionsDb.getSessionById(sessionId);
83
+ if (rowMatchesProvider(appSessionRow, provider)) {
84
+ return appSessionRow;
85
+ }
86
+ const providerSessionRow = sessionsDb.getSessionByProviderSessionId(sessionId);
87
+ if (rowMatchesProvider(providerSessionRow, provider)) {
88
+ return providerSessionRow;
89
+ }
90
+ return null;
91
+ }
92
+ function normalizeNotificationSession(event) {
93
+ if (!event?.sessionId || !event.provider || event.provider === 'system') {
94
+ return event;
95
+ }
96
+ const row = resolveSessionRow(event.sessionId, event.provider);
97
+ if (!row || row.session_id === event.sessionId) {
98
+ return event;
99
+ }
100
+ return {
101
+ ...event,
102
+ sessionId: row.session_id
103
+ };
104
+ }
105
+ function resolveSessionName(event) {
106
+ const explicitSessionName = normalizeSessionName(event.meta?.sessionName);
107
+ if (explicitSessionName) {
108
+ return explicitSessionName;
109
+ }
110
+ if (!event.sessionId || !event.provider) {
111
+ return null;
112
+ }
113
+ return normalizeSessionName(sessionsDb.getSessionName(event.sessionId, event.provider));
114
+ }
115
+ function buildNotificationPayload(event) {
116
+ const normalizedEvent = normalizeNotificationSession(event);
117
+ const CODE_MAP = {
118
+ 'permission.required': normalizedEvent.meta?.toolName
119
+ ? `Action Required: Tool "${normalizedEvent.meta.toolName}" needs approval`
120
+ : 'Action Required: A tool needs your approval',
121
+ 'run.stopped': normalizedEvent.meta?.stopReason || 'Run Stopped: The run has stopped',
122
+ 'run.failed': normalizedEvent.meta?.error ? `Run Failed: ${normalizedEvent.meta.error}` : 'Run Failed: The run encountered an error',
123
+ 'agent.notification': normalizedEvent.meta?.message ? String(normalizedEvent.meta.message) : 'You have a new notification',
124
+ 'push.enabled': 'Push notifications are now enabled!'
125
+ };
126
+ const providerLabel = PROVIDER_LABELS[normalizedEvent.provider] || 'Assistant';
127
+ const sessionName = resolveSessionName(normalizedEvent);
128
+ const message = CODE_MAP[normalizedEvent.code] || 'You have a new notification';
129
+ return {
130
+ title: sessionName || 'CloudCLI',
131
+ body: `${providerLabel}: ${message}`,
132
+ data: {
133
+ sessionId: normalizedEvent.sessionId || null,
134
+ code: normalizedEvent.code,
135
+ provider: normalizedEvent.provider || null,
136
+ sessionName,
137
+ tag: `${normalizedEvent.provider || 'assistant'}:${normalizedEvent.sessionId || 'none'}:${normalizedEvent.code}`
138
+ }
139
+ };
140
+ }
141
+ function sendWebPushPayload(userId, payload) {
142
+ const subscriptions = pushSubscriptionsDb.getSubscriptions(userId);
143
+ if (!subscriptions.length)
144
+ return Promise.resolve();
145
+ const serializedPayload = JSON.stringify(payload);
146
+ return Promise.allSettled(subscriptions.map((sub) => webPush.sendNotification({
147
+ endpoint: sub.endpoint,
148
+ keys: {
149
+ p256dh: sub.keys_p256dh,
150
+ auth: sub.keys_auth
151
+ }
152
+ }, serializedPayload))).then((results) => {
153
+ results.forEach((result, index) => {
154
+ if (result.status === 'rejected') {
155
+ const statusCode = result.reason?.statusCode;
156
+ if (statusCode === 410 || statusCode === 404) {
157
+ pushSubscriptionsDb.removeSubscription(subscriptions[index].endpoint);
158
+ }
159
+ }
160
+ });
161
+ });
162
+ }
163
+ const notificationChannels = [
164
+ {
165
+ id: 'webPush',
166
+ // TODO: Web push still uses push_subscriptions. Do not remove that table until
167
+ // browser push subscriptions are migrated into notification_channel_endpoints.
168
+ isEnabled: (preferences) => Boolean(preferences?.channels?.webPush),
169
+ send: ({ userId, payload }) => sendWebPushPayload(userId, payload)
170
+ },
171
+ {
172
+ id: 'desktop',
173
+ isEnabled: (preferences) => Boolean(preferences?.channels?.desktop),
174
+ send: ({ userId, payload }) => sendDesktopNotificationToClients(userId, payload)
175
+ }
176
+ ];
177
+ function notifyUserIfEnabled({ userId, event }) {
178
+ if (!userId || !event) {
179
+ return;
180
+ }
181
+ const normalizedEvent = normalizeNotificationSession(event);
182
+ const preferences = notificationPreferencesDb.getPreferences(userId);
183
+ if (!isNotificationEventEnabled(preferences, normalizedEvent)) {
184
+ return;
185
+ }
186
+ if (isDuplicate(normalizedEvent)) {
187
+ return;
188
+ }
189
+ const payload = buildNotificationPayload(normalizedEvent);
190
+ for (const channel of notificationChannels) {
191
+ if (!channel.isEnabled(preferences)) {
192
+ continue;
193
+ }
194
+ Promise.resolve(channel.send({ userId, event: normalizedEvent, payload })).catch((err) => {
195
+ console.error(`Notification channel "${channel.id}" send error:`, err);
196
+ });
197
+ }
198
+ }
199
+ function notifyRunStopped({ userId, provider, sessionId = null, stopReason = 'completed', sessionName = null }) {
200
+ notifyUserIfEnabled({
201
+ userId,
202
+ event: createNotificationEvent({
203
+ provider,
204
+ sessionId,
205
+ kind: 'stop',
206
+ code: 'run.stopped',
207
+ meta: { stopReason, sessionName },
208
+ severity: 'info',
209
+ dedupeKey: `${provider}:run:stop:${sessionId || 'none'}:${stopReason}`
210
+ })
211
+ });
212
+ }
213
+ function notifyRunFailed({ userId, provider, sessionId = null, error, sessionName = null }) {
214
+ const errorMessage = normalizeErrorMessage(error);
215
+ notifyUserIfEnabled({
216
+ userId,
217
+ event: createNotificationEvent({
218
+ provider,
219
+ sessionId,
220
+ kind: 'error',
221
+ code: 'run.failed',
222
+ meta: { error: errorMessage, sessionName },
223
+ severity: 'error',
224
+ dedupeKey: `${provider}:run:error:${sessionId || 'none'}:${errorMessage}`
225
+ })
226
+ });
227
+ }
228
+ export { buildNotificationPayload, createNotificationEvent, notifyUserIfEnabled, notifyRunStopped, notifyRunFailed };
229
+ //# sourceMappingURL=notification-orchestrator.service.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"notification-orchestrator.service.js","sourceRoot":"","sources":["../../../../../server/modules/notifications/services/notification-orchestrator.service.js"],"names":[],"mappings":"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"}
@@ -0,0 +1,79 @@
1
+ import { registerDesktopNotificationClient, unregisterDesktopNotificationClient, } from '../../../modules/notifications/services/desktop-notification-clients.service.js';
2
+ import { parseIncomingJsonObject } from '../../../shared/utils.js';
3
+ function readRequestUserId(request) {
4
+ const user = request.user;
5
+ const rawUserId = typeof user?.id === 'number' || typeof user?.id === 'string'
6
+ ? user.id
7
+ : typeof user?.userId === 'number' || typeof user?.userId === 'string'
8
+ ? user.userId
9
+ : null;
10
+ const numericUserId = Number(rawUserId);
11
+ return Number.isInteger(numericUserId) && numericUserId > 0 ? numericUserId : null;
12
+ }
13
+ function readOptionalString(value) {
14
+ if (typeof value !== 'string')
15
+ return null;
16
+ const normalized = value.trim();
17
+ return normalized || null;
18
+ }
19
+ function sendJson(ws, payload) {
20
+ if (ws.readyState === ws.OPEN) {
21
+ ws.send(JSON.stringify(payload));
22
+ }
23
+ }
24
+ export function handleDesktopNotificationsConnection(ws, request) {
25
+ const userId = readRequestUserId(request);
26
+ if (!userId) {
27
+ ws.close(1008, 'Missing authenticated user');
28
+ return;
29
+ }
30
+ let registered = false;
31
+ ws.on('message', (rawMessage) => {
32
+ const data = parseIncomingJsonObject(rawMessage);
33
+ if (!data) {
34
+ return;
35
+ }
36
+ const type = typeof data.type === 'string' ? data.type : typeof data.kind === 'string' ? data.kind : '';
37
+ if (type === 'notification_ack') {
38
+ return;
39
+ }
40
+ if (type !== 'register' || registered) {
41
+ return;
42
+ }
43
+ const deviceId = readOptionalString(data.deviceId);
44
+ if (!deviceId) {
45
+ sendJson(ws, {
46
+ type: 'error',
47
+ code: 'DEVICE_ID_REQUIRED',
48
+ message: 'Desktop notification registration requires deviceId.',
49
+ });
50
+ ws.close(1008, 'Missing deviceId');
51
+ return;
52
+ }
53
+ const device = registerDesktopNotificationClient({
54
+ userId,
55
+ deviceId,
56
+ label: readOptionalString(data.label),
57
+ platform: readOptionalString(data.platform),
58
+ appVersion: readOptionalString(data.appVersion),
59
+ ws,
60
+ });
61
+ if (!device) {
62
+ ws.close(1011, 'Registration failed');
63
+ return;
64
+ }
65
+ registered = true;
66
+ sendJson(ws, {
67
+ type: 'registered',
68
+ deviceId: device.endpoint_id,
69
+ enabled: Boolean(device.enabled),
70
+ });
71
+ });
72
+ ws.on('close', () => {
73
+ unregisterDesktopNotificationClient(ws);
74
+ });
75
+ ws.on('error', () => {
76
+ unregisterDesktopNotificationClient(ws);
77
+ });
78
+ }
79
+ //# sourceMappingURL=desktop-notifications-websocket.service.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"desktop-notifications-websocket.service.js","sourceRoot":"","sources":["../../../../../server/modules/notifications/websocket/desktop-notifications-websocket.service.ts"],"names":[],"mappings":"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"}
@@ -34,10 +34,6 @@ function mapProjectRowToApiView(projectRow) {
34
34
  isArchived: Boolean(projectRow.isArchived),
35
35
  isStarred: Boolean(projectRow.isStarred),
36
36
  sessions: [],
37
- cursorSessions: [],
38
- codexSessions: [],
39
- geminiSessions: [],
40
- opencodeSessions: [],
41
37
  sessionMeta: {
42
38
  hasMore: false,
43
39
  total: 0,
@@ -1 +1 @@
1
- {"version":3,"file":"project-management.service.js","sourceRoot":"","sources":["../../../../../server/modules/projects/services/project-management.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"project-management.service.js","sourceRoot":"","sources":["../../../../../server/modules/projects/services/project-management.service.ts"],"names":[],"mappings":"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"}
@@ -44,33 +44,16 @@ function normalizeSessionPagination(options = {}) {
44
44
  function mapSessionRowToSummary(row) {
45
45
  return {
46
46
  id: row.session_id,
47
+ provider: row.provider,
47
48
  summary: row.custom_name || '',
48
49
  messageCount: 0,
49
50
  lastActivity: row.updated_at ?? row.created_at ?? new Date().toISOString(),
50
51
  };
51
52
  }
52
- function bucketSessionRowsByProvider(rows) {
53
- const byProvider = {
54
- claude: [],
55
- cursor: [],
56
- codex: [],
57
- gemini: [],
58
- opencode: [],
59
- };
60
- for (const row of rows) {
61
- const provider = row.provider;
62
- const bucket = byProvider[provider];
63
- if (!bucket) {
64
- continue;
65
- }
66
- bucket.push(mapSessionRowToSummary(row));
67
- }
68
- return byProvider;
69
- }
70
53
  function readProjectSessionsIncludingArchived(projectPath) {
71
54
  const rows = sessionsDb.getSessionsByProjectPathIncludingArchived(projectPath);
72
55
  return {
73
- sessionsByProvider: bucketSessionRowsByProvider(rows),
56
+ sessions: rows.map(mapSessionRowToSummary),
74
57
  total: rows.length,
75
58
  hasMore: false,
76
59
  };
@@ -83,15 +66,16 @@ function readProjectSessionsPageByPath(projectPath, options = {}) {
83
66
  const rows = sessionsDb.getSessionsByProjectPathPage(projectPath, pagination.limit, pagination.offset);
84
67
  const total = sessionsDb.countSessionsByProjectPath(projectPath);
85
68
  return {
86
- sessionsByProvider: bucketSessionRowsByProvider(rows),
69
+ sessions: rows.map(mapSessionRowToSummary),
87
70
  total,
88
71
  hasMore: pagination.offset + rows.length < total,
89
72
  };
90
73
  }
91
- // Broadcast progress to all connected WebSocket clients
74
+ // Broadcast progress to all connected WebSocket clients.
75
+ // Uses the unified `kind` envelope like every other websocket frame.
92
76
  function broadcastProgress(progress) {
93
77
  const message = JSON.stringify({
94
- type: 'loading_progress',
78
+ kind: 'loading_progress',
95
79
  ...progress,
96
80
  });
97
81
  connectedClients.forEach((client) => {
@@ -101,7 +85,7 @@ function broadcastProgress(progress) {
101
85
  });
102
86
  }
103
87
  /**
104
- * Reads all projects from DB and returns provider-bucketed session summaries.
88
+ * Reads all projects from DB and returns normalized session summaries.
105
89
  */
106
90
  export async function getProjectsWithSessions(options = {}) {
107
91
  if (!options.skipSynchronization) {
@@ -134,11 +118,7 @@ export async function getProjectsWithSessions(options = {}) {
134
118
  displayName,
135
119
  fullPath: projectPath,
136
120
  isStarred: Boolean(row.isStarred),
137
- sessions: sessionsPage.sessionsByProvider.claude,
138
- cursorSessions: sessionsPage.sessionsByProvider.cursor,
139
- codexSessions: sessionsPage.sessionsByProvider.codex,
140
- geminiSessions: sessionsPage.sessionsByProvider.gemini,
141
- opencodeSessions: sessionsPage.sessionsByProvider.opencode,
121
+ sessions: sessionsPage.sessions,
142
122
  sessionMeta: {
143
123
  hasMore: sessionsPage.hasMore,
144
124
  total: sessionsPage.total,
@@ -175,11 +155,7 @@ export async function getArchivedProjectsWithSessions(options = {}) {
175
155
  fullPath: row.project_path,
176
156
  isStarred: Boolean(row.isStarred),
177
157
  isArchived: true,
178
- sessions: sessionsPage.sessionsByProvider.claude,
179
- cursorSessions: sessionsPage.sessionsByProvider.cursor,
180
- codexSessions: sessionsPage.sessionsByProvider.codex,
181
- geminiSessions: sessionsPage.sessionsByProvider.gemini,
182
- opencodeSessions: sessionsPage.sessionsByProvider.opencode,
158
+ sessions: sessionsPage.sessions,
183
159
  sessionMeta: {
184
160
  hasMore: sessionsPage.hasMore,
185
161
  total: sessionsPage.total,
@@ -202,11 +178,7 @@ export async function getProjectSessionsPage(projectId, options = {}) {
202
178
  const sessionsPage = readProjectSessionsPageByPath(projectRow.project_path, options);
203
179
  return {
204
180
  projectId: projectRow.project_id,
205
- sessions: sessionsPage.sessionsByProvider.claude,
206
- cursorSessions: sessionsPage.sessionsByProvider.cursor,
207
- codexSessions: sessionsPage.sessionsByProvider.codex,
208
- geminiSessions: sessionsPage.sessionsByProvider.gemini,
209
- opencodeSessions: sessionsPage.sessionsByProvider.opencode,
181
+ sessions: sessionsPage.sessions,
210
182
  sessionMeta: {
211
183
  hasMore: sessionsPage.hasMore,
212
184
  total: sessionsPage.total,
@@ -1 +1 @@
1
- {"version":3,"file":"projects-with-sessions-fetch.service.js","sourceRoot":"","sources":["../../../../../server/modules/projects/services/projects-with-sessions-fetch.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"projects-with-sessions-fetch.service.js","sourceRoot":"","sources":["../../../../../server/modules/projects/services/projects-with-sessions-fetch.service.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  export { sessionSynchronizerService } from './services/session-synchronizer.service.js';
2
2
  export { providerSkillsService } from './services/skills.service.js';
3
+ export { providerMcpService } from './services/mcp.service.js';
3
4
  export { initializeSessionsWatcher } from './services/sessions-watcher.service.js';
4
5
  export { closeSessionsWatcher } from './services/sessions-watcher.service.js';
5
6
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/modules/providers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AACxF,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAErE,OAAO,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/modules/providers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AACxF,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC"}
@@ -9,6 +9,20 @@ import { buildLookupMap, extractFirstValidJsonlData, findFilesRecursivelyCreated
9
9
  export class ClaudeSessionSynchronizer {
10
10
  provider = 'claude';
11
11
  claudeHome = path.join(os.homedir(), '.claude');
12
+ /**
13
+ * Returns true when a JSONL file is a subagent transcript rather than a
14
+ * top-level session.
15
+ *
16
+ * Claude stores subagent transcripts under a `subagents/` directory, e.g.
17
+ * `~/.claude/projects/<encoded-cwd>/<session-id>/subagents/agent-<id>.jsonl`.
18
+ * Those files repeat the parent session's `sessionId`, so indexing them as
19
+ * standalone sessions overwrites the parent row's `jsonl_path` and corrupts
20
+ * the main session record. The recursive scan in `synchronize()` reaches
21
+ * them, so both entry points must skip them.
22
+ */
23
+ isSubagentTranscript(filePath) {
24
+ return path.normalize(filePath).split(path.sep).includes('subagents');
25
+ }
12
26
  /**
13
27
  * Scans ~/.claude/projects and upserts discovered sessions into DB.
14
28
  */
@@ -17,6 +31,9 @@ export class ClaudeSessionSynchronizer {
17
31
  const files = await findFilesRecursivelyCreatedAfter(path.join(this.claudeHome, 'projects'), '.jsonl', since ?? null);
18
32
  let processed = 0;
19
33
  for (const filePath of files) {
34
+ if (this.isSubagentTranscript(filePath)) {
35
+ continue;
36
+ }
20
37
  const parsed = await this.processSessionFile(filePath, nameMap);
21
38
  if (!parsed) {
22
39
  continue;
@@ -34,6 +51,9 @@ export class ClaudeSessionSynchronizer {
34
51
  if (!filePath.endsWith('.jsonl')) {
35
52
  return null;
36
53
  }
54
+ if (this.isSubagentTranscript(filePath)) {
55
+ return null;
56
+ }
37
57
  const nameMap = await buildLookupMap(path.join(this.claudeHome, 'history.jsonl'), 'sessionId', 'display');
38
58
  const parsed = await this.processSessionFile(filePath, nameMap);
39
59
  if (!parsed) {
@@ -61,7 +81,10 @@ export class ClaudeSessionSynchronizer {
61
81
  if (!parsed) {
62
82
  return null;
63
83
  }
64
- const existingSession = sessionsDb.getSessionById(parsed.sessionId);
84
+ // App-created sessions are keyed by an app id, so disk-discovered provider
85
+ // ids must be resolved through the provider-id mapping first.
86
+ const existingSession = sessionsDb.getSessionByProviderSessionId(parsed.sessionId)
87
+ ?? sessionsDb.getSessionById(parsed.sessionId);
65
88
  const existingSessionName = existingSession?.custom_name;
66
89
  if (existingSessionName && existingSessionName !== 'Untitled Claude Session') {
67
90
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"claude-session-synchronizer.provider.js","sourceRoot":"","sources":["../../../../../../server/modules/providers/list/claude/claude-session-synchronizer.provider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"claude-session-synchronizer.provider.js","sourceRoot":"","sources":["../../../../../../server/modules/providers/list/claude/claude-session-synchronizer.provider.ts"],"names":[],"mappings":"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"}