@jcjeon/integration-cli 0.2.0

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 (264) hide show
  1. package/.gitignore +23 -0
  2. package/.npmignore +21 -0
  3. package/.prettierignore +6 -0
  4. package/.prettierrc +26 -0
  5. package/AGENTS.md +10 -0
  6. package/CLAUDE.md +10 -0
  7. package/README.md +384 -0
  8. package/apps/server/README.md +294 -0
  9. package/apps/server/eslint.config.mjs +20 -0
  10. package/apps/server/nest-cli.json +8 -0
  11. package/apps/server/package.json +89 -0
  12. package/apps/server/scripts/postinstall.js +53 -0
  13. package/apps/server/src/__mocks__/glob.js +6 -0
  14. package/apps/server/src/__mocks__/uuid.js +5 -0
  15. package/apps/server/src/app.controller.spec.ts +24 -0
  16. package/apps/server/src/app.controller.ts +13 -0
  17. package/apps/server/src/app.module.ts +18 -0
  18. package/apps/server/src/app.service.ts +8 -0
  19. package/apps/server/src/common/ji-paths.ts +41 -0
  20. package/apps/server/src/database/database.module.ts +27 -0
  21. package/apps/server/src/database/entities/agent-changelog.entity.ts +39 -0
  22. package/apps/server/src/database/entities/agent-session.entity.ts +29 -0
  23. package/apps/server/src/database/entities/conversation.entity.ts +41 -0
  24. package/apps/server/src/database/entities/session.entity.ts +16 -0
  25. package/apps/server/src/database/entities/task-agent-run.entity.ts +40 -0
  26. package/apps/server/src/database/entities/task-agent.entity.ts +42 -0
  27. package/apps/server/src/database/entities/task-requirement.entity.ts +27 -0
  28. package/apps/server/src/database/entities/task-run.entity.ts +41 -0
  29. package/apps/server/src/database/entities/task.entity.ts +44 -0
  30. package/apps/server/src/main.ts +65 -0
  31. package/apps/server/src/modules/agents/agent-model-settings.spec.ts +80 -0
  32. package/apps/server/src/modules/agents/agents.module.ts +11 -0
  33. package/apps/server/src/modules/agents/claude/claude-auth.manager.ts +83 -0
  34. package/apps/server/src/modules/agents/claude/claude-pty.manager.ts +380 -0
  35. package/apps/server/src/modules/agents/claude/claude.controller.ts +85 -0
  36. package/apps/server/src/modules/agents/claude/claude.gateway.ts +158 -0
  37. package/apps/server/src/modules/agents/claude/claude.module.ts +18 -0
  38. package/apps/server/src/modules/agents/claude/claude.service.ts +67 -0
  39. package/apps/server/src/modules/agents/claude/dto/create-session.dto.ts +24 -0
  40. package/apps/server/src/modules/agents/claude/dto/resize-session.dto.ts +13 -0
  41. package/apps/server/src/modules/agents/claude/dto/send-input.dto.ts +9 -0
  42. package/apps/server/src/modules/agents/claude/interfaces/claude-session.interface.ts +26 -0
  43. package/apps/server/src/modules/agents/claude/interfaces/pty-event.interface.ts +10 -0
  44. package/apps/server/src/modules/agents/claude/interfaces/stream-event.interface.ts +61 -0
  45. package/apps/server/src/modules/agents/codex/codex-auth.manager.ts +107 -0
  46. package/apps/server/src/modules/agents/codex/codex-session.manager.ts +357 -0
  47. package/apps/server/src/modules/agents/codex/codex.controller.ts +64 -0
  48. package/apps/server/src/modules/agents/codex/codex.gateway.ts +97 -0
  49. package/apps/server/src/modules/agents/codex/codex.module.ts +17 -0
  50. package/apps/server/src/modules/agents/codex/dto/configure-auth.dto.ts +7 -0
  51. package/apps/server/src/modules/agents/gemini/dto/configure-auth.dto.ts +15 -0
  52. package/apps/server/src/modules/agents/gemini/dto/create-session.dto.ts +9 -0
  53. package/apps/server/src/modules/agents/gemini/dto/send-input.dto.ts +9 -0
  54. package/apps/server/src/modules/agents/gemini/gemini-auth.manager.ts +157 -0
  55. package/apps/server/src/modules/agents/gemini/gemini-session.manager.ts +287 -0
  56. package/apps/server/src/modules/agents/gemini/gemini.controller.ts +93 -0
  57. package/apps/server/src/modules/agents/gemini/gemini.gateway.ts +149 -0
  58. package/apps/server/src/modules/agents/gemini/gemini.module.ts +17 -0
  59. package/apps/server/src/modules/agents/gemini/interfaces/gemini-session.interface.ts +18 -0
  60. package/apps/server/src/modules/agents/gemini/interfaces/stream-event.interface.ts +14 -0
  61. package/apps/server/src/modules/agents/session-termination.spec.ts +103 -0
  62. package/apps/server/src/modules/changelog/changelog.controller.ts +20 -0
  63. package/apps/server/src/modules/changelog/changelog.module.ts +14 -0
  64. package/apps/server/src/modules/changelog/changelog.service.spec.ts +531 -0
  65. package/apps/server/src/modules/changelog/changelog.service.ts +690 -0
  66. package/apps/server/src/modules/conversations/conversation.controller.spec.ts +106 -0
  67. package/apps/server/src/modules/conversations/conversation.controller.ts +60 -0
  68. package/apps/server/src/modules/conversations/conversation.module.ts +14 -0
  69. package/apps/server/src/modules/conversations/conversation.service.spec.ts +176 -0
  70. package/apps/server/src/modules/conversations/conversation.service.ts +54 -0
  71. package/apps/server/src/modules/conversations/dto/create-conversation.dto.ts +37 -0
  72. package/apps/server/src/modules/conversations/enums/conversation.enum.ts +13 -0
  73. package/apps/server/src/modules/fs/fs.controller.ts +29 -0
  74. package/apps/server/src/modules/fs/fs.module.ts +8 -0
  75. package/apps/server/src/modules/harness/dto/save-harness.dto.ts +9 -0
  76. package/apps/server/src/modules/harness/harness.controller.spec.ts +95 -0
  77. package/apps/server/src/modules/harness/harness.controller.ts +35 -0
  78. package/apps/server/src/modules/harness/harness.module.ts +11 -0
  79. package/apps/server/src/modules/harness/harness.service.spec.ts +217 -0
  80. package/apps/server/src/modules/harness/harness.service.ts +112 -0
  81. package/apps/server/src/modules/sessions/session.controller.spec.ts +68 -0
  82. package/apps/server/src/modules/sessions/session.controller.ts +43 -0
  83. package/apps/server/src/modules/sessions/session.module.ts +14 -0
  84. package/apps/server/src/modules/sessions/session.service.spec.ts +106 -0
  85. package/apps/server/src/modules/sessions/session.service.ts +35 -0
  86. package/apps/server/src/modules/tasks/dto/create-task.dto.ts +54 -0
  87. package/apps/server/src/modules/tasks/dto/execute-task.dto.ts +22 -0
  88. package/apps/server/src/modules/tasks/dto/merge-file.dto.ts +7 -0
  89. package/apps/server/src/modules/tasks/dto/rerun-task.dto.ts +14 -0
  90. package/apps/server/src/modules/tasks/dto/update-task.dto.ts +55 -0
  91. package/apps/server/src/modules/tasks/task-execution.service.ts +978 -0
  92. package/apps/server/src/modules/tasks/task.gateway.ts +140 -0
  93. package/apps/server/src/modules/tasks/tasks.controller.spec.ts +210 -0
  94. package/apps/server/src/modules/tasks/tasks.controller.ts +139 -0
  95. package/apps/server/src/modules/tasks/tasks.module.ts +30 -0
  96. package/apps/server/src/modules/tasks/tasks.service.spec.ts +552 -0
  97. package/apps/server/src/modules/tasks/tasks.service.ts +333 -0
  98. package/apps/server/test/app.e2e-spec.ts +28 -0
  99. package/apps/server/test/jest-e2e.json +9 -0
  100. package/apps/server/tsconfig.build.json +4 -0
  101. package/apps/server/tsconfig.json +13 -0
  102. package/apps/web/AGENTS.md +7 -0
  103. package/apps/web/CLAUDE.md +1 -0
  104. package/apps/web/README.md +36 -0
  105. package/apps/web/eslint.config.mjs +21 -0
  106. package/apps/web/next-env.d.ts +6 -0
  107. package/apps/web/next.config.ts +7 -0
  108. package/apps/web/package.json +49 -0
  109. package/apps/web/postcss.config.mjs +7 -0
  110. package/apps/web/public/file.svg +1 -0
  111. package/apps/web/public/globe.svg +1 -0
  112. package/apps/web/public/next.svg +1 -0
  113. package/apps/web/public/vercel.svg +1 -0
  114. package/apps/web/public/window.svg +1 -0
  115. package/apps/web/src/app/claude/page.tsx +5 -0
  116. package/apps/web/src/app/codex/page.tsx +126 -0
  117. package/apps/web/src/app/favicon.ico +0 -0
  118. package/apps/web/src/app/gemini/page.tsx +130 -0
  119. package/apps/web/src/app/globals.css +149 -0
  120. package/apps/web/src/app/layout.tsx +40 -0
  121. package/apps/web/src/app/login/page.tsx +67 -0
  122. package/apps/web/src/app/page.tsx +497 -0
  123. package/apps/web/src/app/task/[id]/page.tsx +11 -0
  124. package/apps/web/src/app/test/page.tsx +298 -0
  125. package/apps/web/src/components/ui/Modal.tsx +78 -0
  126. package/apps/web/src/components/ui/WorkingDirPicker.tsx +195 -0
  127. package/apps/web/src/components/ui/__tests__/Modal.test.tsx +68 -0
  128. package/apps/web/src/features/auth/api/__tests__/auth.api.test.ts +83 -0
  129. package/apps/web/src/features/auth/api/auth.api.ts +81 -0
  130. package/apps/web/src/features/auth/hooks/__tests__/useClaudeAuth.test.ts +166 -0
  131. package/apps/web/src/features/auth/hooks/__tests__/useCodexAuth.test.ts +127 -0
  132. package/apps/web/src/features/auth/hooks/__tests__/useGeminiAuth.test.ts +120 -0
  133. package/apps/web/src/features/auth/hooks/useClaudeAuth.ts +88 -0
  134. package/apps/web/src/features/auth/hooks/useCodexAuth.ts +149 -0
  135. package/apps/web/src/features/auth/hooks/useGeminiAuth.ts +125 -0
  136. package/apps/web/src/features/auth/ui/CodexLoginPanel.tsx +302 -0
  137. package/apps/web/src/features/auth/ui/GeminiLoginPanel.tsx +316 -0
  138. package/apps/web/src/features/auth/ui/LoginForm.tsx +190 -0
  139. package/apps/web/src/features/auth/ui/LoginPanel.tsx +114 -0
  140. package/apps/web/src/features/auth/ui/__tests__/LoginPanel.test.tsx +105 -0
  141. package/apps/web/src/features/chat/api/__tests__/sessions.api.test.ts +187 -0
  142. package/apps/web/src/features/chat/api/sessions.api.ts +161 -0
  143. package/apps/web/src/features/chat/container/ClaudePageContainer.tsx +152 -0
  144. package/apps/web/src/features/chat/hooks/__tests__/useCodexSessions.test.ts +131 -0
  145. package/apps/web/src/features/chat/hooks/__tests__/useGeminiSessions.test.ts +130 -0
  146. package/apps/web/src/features/chat/hooks/useAgentModelSettings.ts +54 -0
  147. package/apps/web/src/features/chat/hooks/useClaudeSessions.ts +323 -0
  148. package/apps/web/src/features/chat/hooks/useCodexSessions.ts +275 -0
  149. package/apps/web/src/features/chat/hooks/useGeminiSessions.ts +255 -0
  150. package/apps/web/src/features/chat/hooks/useSessionCommand.ts +66 -0
  151. package/apps/web/src/features/chat/hooks/useSessionRename.ts +61 -0
  152. package/apps/web/src/features/chat/hooks/useSessionWorkingDirectories.ts +34 -0
  153. package/apps/web/src/features/chat/hooks/useUnifiedSessions.ts +156 -0
  154. package/apps/web/src/features/chat/lib/agentModelOptions.ts +72 -0
  155. package/apps/web/src/features/chat/ui/AgentModelPicker.tsx +134 -0
  156. package/apps/web/src/features/chat/ui/AgentSelectModal.tsx +236 -0
  157. package/apps/web/src/features/chat/ui/ChatInput.tsx +162 -0
  158. package/apps/web/src/features/chat/ui/ChatMessage.tsx +204 -0
  159. package/apps/web/src/features/chat/ui/ChatWorkspace.tsx +207 -0
  160. package/apps/web/src/features/chat/ui/CheckingSkeleton.tsx +44 -0
  161. package/apps/web/src/features/chat/ui/ClaudeLoginView.tsx +44 -0
  162. package/apps/web/src/features/chat/ui/PermissionCard.tsx +37 -0
  163. package/apps/web/src/features/chat/ui/SessionSidebar.tsx +280 -0
  164. package/apps/web/src/features/chat/ui/__tests__/AgentSelectModal.test.tsx +58 -0
  165. package/apps/web/src/features/chat/ui/__tests__/ChatInput.test.tsx +134 -0
  166. package/apps/web/src/features/chat/ui/__tests__/ChatMessage.test.tsx +106 -0
  167. package/apps/web/src/features/chat/ui/__tests__/ChatWorkspace.test.tsx +66 -0
  168. package/apps/web/src/features/diff/ui/DiffFileRow.tsx +73 -0
  169. package/apps/web/src/features/diff/ui/DiffHunk.tsx +61 -0
  170. package/apps/web/src/features/diff/ui/FileChangeBadge.tsx +23 -0
  171. package/apps/web/src/features/diff/ui/__tests__/DiffFileRow.test.tsx +40 -0
  172. package/apps/web/src/features/diff/ui/__tests__/DiffHunk.test.tsx +24 -0
  173. package/apps/web/src/features/diff/ui/__tests__/FileChangeBadge.test.tsx +16 -0
  174. package/apps/web/src/features/fs/api/fs.api.ts +14 -0
  175. package/apps/web/src/features/fs/hooks/useDirBrowser.ts +50 -0
  176. package/apps/web/src/features/harness/api/__tests__/harness.api.test.ts +73 -0
  177. package/apps/web/src/features/harness/api/harness.api.ts +46 -0
  178. package/apps/web/src/features/harness/hooks/__tests__/useHarness.test.ts +65 -0
  179. package/apps/web/src/features/harness/hooks/useHarness.ts +66 -0
  180. package/apps/web/src/features/harness/ui/HarnessModal.tsx +171 -0
  181. package/apps/web/src/features/harness/ui/__tests__/HarnessModal.test.tsx +46 -0
  182. package/apps/web/src/features/status/ui/AgentStatusModal.tsx +267 -0
  183. package/apps/web/src/features/status/ui/__tests__/AgentStatusModal.test.tsx +71 -0
  184. package/apps/web/src/features/tasks/api/__tests__/changelog.api.test.ts +89 -0
  185. package/apps/web/src/features/tasks/api/__tests__/tasks.api.test.ts +282 -0
  186. package/apps/web/src/features/tasks/api/changelog.api.ts +52 -0
  187. package/apps/web/src/features/tasks/api/tasks.api.ts +175 -0
  188. package/apps/web/src/features/tasks/container/TaskDetailPageContainer.tsx +69 -0
  189. package/apps/web/src/features/tasks/hooks/__tests__/useChangelogCodeCopy.test.ts +48 -0
  190. package/apps/web/src/features/tasks/hooks/__tests__/useTaskChangelog.test.ts +48 -0
  191. package/apps/web/src/features/tasks/hooks/__tests__/useTaskCreate.test.ts +217 -0
  192. package/apps/web/src/features/tasks/hooks/__tests__/useTaskEdit.test.ts +152 -0
  193. package/apps/web/src/features/tasks/hooks/__tests__/useTaskExecution.test.ts +143 -0
  194. package/apps/web/src/features/tasks/hooks/__tests__/useTaskList.test.ts +168 -0
  195. package/apps/web/src/features/tasks/hooks/__tests__/useTaskNotification.test.ts +125 -0
  196. package/apps/web/src/features/tasks/hooks/__tests__/useTaskRuns.test.ts +51 -0
  197. package/apps/web/src/features/tasks/hooks/useChangelogCodeCopy.ts +52 -0
  198. package/apps/web/src/features/tasks/hooks/useCopyToClipboard.ts +47 -0
  199. package/apps/web/src/features/tasks/hooks/useTaskChangelog.ts +32 -0
  200. package/apps/web/src/features/tasks/hooks/useTaskCreate.ts +137 -0
  201. package/apps/web/src/features/tasks/hooks/useTaskDetail.ts +217 -0
  202. package/apps/web/src/features/tasks/hooks/useTaskEdit.ts +130 -0
  203. package/apps/web/src/features/tasks/hooks/useTaskExecution.ts +137 -0
  204. package/apps/web/src/features/tasks/hooks/useTaskList.ts +159 -0
  205. package/apps/web/src/features/tasks/hooks/useTaskNotification.ts +80 -0
  206. package/apps/web/src/features/tasks/hooks/useTaskRuns.ts +32 -0
  207. package/apps/web/src/features/tasks/ui/AgentOutputPanel.tsx +203 -0
  208. package/apps/web/src/features/tasks/ui/AgentRoleSelect.tsx +97 -0
  209. package/apps/web/src/features/tasks/ui/ChangelogPanel.tsx +321 -0
  210. package/apps/web/src/features/tasks/ui/RunHistoryPanel.tsx +193 -0
  211. package/apps/web/src/features/tasks/ui/TaskCreateModal.tsx +205 -0
  212. package/apps/web/src/features/tasks/ui/TaskDetailView.tsx +413 -0
  213. package/apps/web/src/features/tasks/ui/TaskEditModal.tsx +165 -0
  214. package/apps/web/src/features/tasks/ui/TaskListModal.tsx +591 -0
  215. package/apps/web/src/features/tasks/ui/__tests__/AgentRoleSelect.test.tsx +91 -0
  216. package/apps/web/src/features/tasks/ui/__tests__/ChangelogPanel.test.tsx +94 -0
  217. package/apps/web/src/features/tasks/ui/__tests__/RunHistoryPanel.test.tsx +71 -0
  218. package/apps/web/src/features/tasks/ui/__tests__/TaskCreateModal.test.tsx +153 -0
  219. package/apps/web/src/features/tasks/ui/__tests__/TaskEditModal.test.tsx +75 -0
  220. package/apps/web/src/features/tasks/ui/__tests__/TaskListModal.test.tsx +243 -0
  221. package/apps/web/src/hooks/useWorkingDir.ts +28 -0
  222. package/apps/web/src/lib/__tests__/ansi.test.ts +88 -0
  223. package/apps/web/src/lib/ansi.ts +105 -0
  224. package/apps/web/src/lib/constants.ts +4 -0
  225. package/apps/web/src/lib/quota.ts +22 -0
  226. package/apps/web/src/lib/theme.tsx +78 -0
  227. package/apps/web/src/lib/toast.tsx +175 -0
  228. package/apps/web/src/store/agentStatusStore.ts +38 -0
  229. package/apps/web/tsconfig.json +18 -0
  230. package/apps/web/vitest.config.ts +25 -0
  231. package/apps/web/vitest.setup.ts +10 -0
  232. package/package.json +85 -0
  233. package/packages/cli/dist/commands/check.d.ts +1 -0
  234. package/packages/cli/dist/commands/check.js +89 -0
  235. package/packages/cli/dist/commands/init.d.ts +5 -0
  236. package/packages/cli/dist/commands/init.js +183 -0
  237. package/packages/cli/dist/commands/start.d.ts +4 -0
  238. package/packages/cli/dist/commands/start.js +188 -0
  239. package/packages/cli/dist/index.d.ts +2 -0
  240. package/packages/cli/dist/index.js +71 -0
  241. package/packages/cli/dist/utils/agent-tools.d.ts +28 -0
  242. package/packages/cli/dist/utils/agent-tools.js +193 -0
  243. package/packages/cli/dist/utils/project-init.d.ts +12 -0
  244. package/packages/cli/dist/utils/project-init.js +258 -0
  245. package/packages/cli/dist/utils/proxy.d.ts +8 -0
  246. package/packages/cli/dist/utils/proxy.js +138 -0
  247. package/packages/cli/package.json +30 -0
  248. package/packages/cli/src/commands/check.ts +77 -0
  249. package/packages/cli/src/commands/init.ts +209 -0
  250. package/packages/cli/src/commands/start.ts +183 -0
  251. package/packages/cli/src/index.ts +91 -0
  252. package/packages/cli/src/utils/agent-tools.ts +201 -0
  253. package/packages/cli/src/utils/project-init.ts +252 -0
  254. package/packages/cli/src/utils/proxy.ts +123 -0
  255. package/packages/cli/tsconfig.json +14 -0
  256. package/packages/eslint-config/base.mjs +31 -0
  257. package/packages/eslint-config/nest.mjs +55 -0
  258. package/packages/eslint-config/next.mjs +23 -0
  259. package/packages/eslint-config/package.json +20 -0
  260. package/packages/typescript-config/base.json +16 -0
  261. package/packages/typescript-config/nestjs.json +17 -0
  262. package/packages/typescript-config/nextjs.json +15 -0
  263. package/packages/typescript-config/package.json +11 -0
  264. package/turbo.json +28 -0
@@ -0,0 +1,131 @@
1
+ import { act, renderHook, waitFor } from "@testing-library/react";
2
+ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
3
+
4
+ import * as sessionsApi from "../../api/sessions.api";
5
+ import { useCodexSessions } from "../useCodexSessions";
6
+
7
+ vi.mock("../../api/sessions.api", () => ({
8
+ createCodexSession: vi.fn(),
9
+ deleteCodexSession: vi.fn(),
10
+ fetchConversations: vi.fn(),
11
+ fetchDBSessions: vi.fn(),
12
+ saveCodexConversation: vi.fn(),
13
+ }));
14
+
15
+ const socketMock = vi.hoisted(() => {
16
+ const handlers: Record<string, (payload?: unknown) => void> = {};
17
+ const socket = {
18
+ on: vi.fn((event: string, handler: (payload?: unknown) => void) => {
19
+ handlers[event] = handler;
20
+ return socket;
21
+ }),
22
+ emit: vi.fn(),
23
+ disconnect: vi.fn(),
24
+ };
25
+ return {
26
+ handlers,
27
+ socket,
28
+ io: vi.fn(() => socket),
29
+ reset() {
30
+ for (const key of Object.keys(handlers)) delete handlers[key];
31
+ socket.on.mockClear();
32
+ socket.emit.mockClear();
33
+ socket.disconnect.mockClear();
34
+ this.io.mockClear();
35
+ },
36
+ };
37
+ });
38
+
39
+ vi.mock("socket.io-client", () => ({ io: socketMock.io }));
40
+
41
+ const mockFetchDB = vi.mocked(sessionsApi.fetchDBSessions);
42
+ const mockFetchConversations = vi.mocked(sessionsApi.fetchConversations);
43
+ const mockCreateSession = vi.mocked(sessionsApi.createCodexSession);
44
+ const mockDeleteSession = vi.mocked(sessionsApi.deleteCodexSession);
45
+ const mockSave = vi.mocked(sessionsApi.saveCodexConversation);
46
+
47
+ beforeEach(() => {
48
+ mockFetchDB.mockResolvedValue([{ sessionId: "db-1", title: "DB", createdAt: "2024-01-01" }]);
49
+ mockFetchConversations.mockResolvedValue([
50
+ { id: "c1", sessionId: "db-1", promptId: "p1", type: "agent_message", content: "codex", createdAt: "2024-01-01", agentModel: "codex" },
51
+ { id: "c2", sessionId: "db-1", promptId: "p2", type: "agent_message", content: "gemini", createdAt: "2024-01-01", agentModel: "gemini" },
52
+ ]);
53
+ mockCreateSession.mockResolvedValue({ id: "old-1", title: "Codex", createdAt: "2024-01-02", workingDirectory: "/tmp/codex" });
54
+ });
55
+
56
+ afterEach(() => {
57
+ vi.clearAllMocks();
58
+ socketMock.reset();
59
+ });
60
+
61
+ describe("useCodexSessions", () => {
62
+ it("connects and loads DB sessions", async () => {
63
+ const { result } = renderHook(() => useCodexSessions());
64
+ act(() => { socketMock.handlers.connect?.(); });
65
+
66
+ await waitFor(() => expect(result.current.connectionStatus).toBe("connected"));
67
+ await waitFor(() => expect(result.current.sessions[0].agentId).toBe("codex"));
68
+ });
69
+
70
+ it("creates, sends, saves on result, and supports session replacement", async () => {
71
+ const { result } = renderHook(() => useCodexSessions());
72
+
73
+ await act(async () => { await result.current.createSession("/tmp/codex"); });
74
+ expect(result.current.selectedSessionId).toBe("old-1");
75
+
76
+ act(() => { result.current.sendMessage("old-1", "hello"); });
77
+ expect(socketMock.socket.emit).toHaveBeenCalledWith("session:message", { sessionId: "old-1", input: "hello" });
78
+ expect(mockSave).not.toHaveBeenCalled();
79
+
80
+ act(() => {
81
+ socketMock.handlers["session:text"]?.({ sessionId: "old-1", text: "answer" });
82
+ socketMock.handlers["session:replaced"]?.({ oldSessionId: "old-1", newSessionId: "new-1" });
83
+ socketMock.handlers["session:result"]?.({ sessionId: "new-1", isError: false });
84
+ });
85
+
86
+ expect(result.current.selectedSessionId).toBe("new-1");
87
+ expect(mockSave).toHaveBeenCalledWith("new-1", expect.any(String), "hello", "user_message");
88
+ expect(mockSave).toHaveBeenCalledWith("new-1", expect.any(String), "answer", "agent_message");
89
+ });
90
+
91
+ it("loads codex conversations and terminates selected session", async () => {
92
+ const { result } = renderHook(() => useCodexSessions());
93
+ act(() => { socketMock.handlers.connect?.(); });
94
+ await waitFor(() => expect(result.current.sessions).toHaveLength(1));
95
+
96
+ act(() => { result.current.selectSession("db-1"); });
97
+ await waitFor(() => expect(mockFetchConversations).toHaveBeenCalledWith("db-1"));
98
+ await waitFor(() => expect(result.current.selectedSession?.messages).toHaveLength(1));
99
+
100
+ await act(async () => { await result.current.terminateSession("db-1"); });
101
+ expect(mockDeleteSession).toHaveBeenCalledWith("db-1");
102
+ expect(result.current.selectedSessionId).toBeNull();
103
+ });
104
+
105
+ it("keeps the session visible when terminate fails", async () => {
106
+ mockDeleteSession.mockRejectedValueOnce(new Error("delete failed"));
107
+ const { result } = renderHook(() => useCodexSessions());
108
+ act(() => { socketMock.handlers.connect?.(); });
109
+ await waitFor(() => expect(result.current.sessions).toHaveLength(1));
110
+
111
+ await act(async () => { await result.current.terminateSession("db-1"); });
112
+
113
+ expect(result.current.sessions).toHaveLength(1);
114
+ expect(result.current.error).toBe("delete failed");
115
+ });
116
+
117
+ it("handles exit, disconnect, and socket errors", async () => {
118
+ const { result } = renderHook(() => useCodexSessions());
119
+ await act(async () => { await result.current.createSession(); });
120
+ act(() => {
121
+ socketMock.handlers["session:text"]?.({ sessionId: "old-1", text: "partial" });
122
+ socketMock.handlers["session:exit"]?.({ sessionId: "old-1" });
123
+ socketMock.handlers.disconnect?.();
124
+ socketMock.handlers.error?.({ message: "socket failed" });
125
+ });
126
+
127
+ expect(result.current.selectedSession?.streaming).toBe("");
128
+ expect(result.current.connectionStatus).toBe("disconnected");
129
+ expect(result.current.error).toBe("socket failed");
130
+ });
131
+ });
@@ -0,0 +1,130 @@
1
+ import { act, renderHook, waitFor } from "@testing-library/react";
2
+ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
3
+
4
+ import * as sessionsApi from "../../api/sessions.api";
5
+ import { useGeminiSessions } from "../useGeminiSessions";
6
+
7
+ vi.mock("../../api/sessions.api", () => ({
8
+ createGeminiSession: vi.fn(),
9
+ deleteGeminiSession: vi.fn(),
10
+ fetchConversations: vi.fn(),
11
+ fetchDBSessions: vi.fn(),
12
+ saveGeminiConversation: vi.fn(),
13
+ }));
14
+
15
+ const socketMock = vi.hoisted(() => {
16
+ const handlers: Record<string, (payload?: unknown) => void> = {};
17
+ const socket = {
18
+ on: vi.fn((event: string, handler: (payload?: unknown) => void) => {
19
+ handlers[event] = handler;
20
+ return socket;
21
+ }),
22
+ emit: vi.fn(),
23
+ disconnect: vi.fn(),
24
+ };
25
+ return {
26
+ handlers,
27
+ socket,
28
+ io: vi.fn(() => socket),
29
+ reset() {
30
+ for (const key of Object.keys(handlers)) delete handlers[key];
31
+ socket.on.mockClear();
32
+ socket.emit.mockClear();
33
+ socket.disconnect.mockClear();
34
+ this.io.mockClear();
35
+ },
36
+ };
37
+ });
38
+
39
+ vi.mock("socket.io-client", () => ({ io: socketMock.io }));
40
+
41
+ const mockFetchDB = vi.mocked(sessionsApi.fetchDBSessions);
42
+ const mockFetchConversations = vi.mocked(sessionsApi.fetchConversations);
43
+ const mockCreateSession = vi.mocked(sessionsApi.createGeminiSession);
44
+ const mockDeleteSession = vi.mocked(sessionsApi.deleteGeminiSession);
45
+ const mockSave = vi.mocked(sessionsApi.saveGeminiConversation);
46
+
47
+ beforeEach(() => {
48
+ mockFetchDB.mockResolvedValue([{ sessionId: "db-1", title: "DB", createdAt: "2024-01-01" }]);
49
+ mockFetchConversations.mockResolvedValue([
50
+ { id: "c1", sessionId: "db-1", promptId: "p1", type: "user_message", content: "hi", createdAt: "2024-01-01", agentModel: "gemini" },
51
+ { id: "c2", sessionId: "db-1", promptId: "p2", type: "agent_message", content: "other", createdAt: "2024-01-01", agentModel: "codex" },
52
+ ]);
53
+ mockCreateSession.mockResolvedValue({ id: "new-1", title: "Gemini", createdAt: "2024-01-02", workingDirectory: "/tmp/project" });
54
+ });
55
+
56
+ afterEach(() => {
57
+ vi.clearAllMocks();
58
+ socketMock.reset();
59
+ });
60
+
61
+ describe("useGeminiSessions", () => {
62
+ it("connects and loads DB sessions", async () => {
63
+ const { result } = renderHook(() => useGeminiSessions());
64
+
65
+ expect(result.current.connectionStatus).toBe("connecting");
66
+ act(() => { socketMock.handlers.connect?.(); });
67
+
68
+ await waitFor(() => expect(result.current.connectionStatus).toBe("connected"));
69
+ await waitFor(() => expect(result.current.sessions[0].info.id).toBe("db-1"));
70
+ });
71
+
72
+ it("creates, selects, sends, streams, and finishes a session", async () => {
73
+ const { result } = renderHook(() => useGeminiSessions());
74
+
75
+ let id: string | null = null;
76
+ await act(async () => { id = await result.current.createSession("/tmp/project"); });
77
+ expect(id).toBe("new-1");
78
+ expect(result.current.selectedSession?.info.title).toBe("project");
79
+
80
+ act(() => { result.current.sendMessage("new-1", "hello"); });
81
+ expect(socketMock.socket.emit).toHaveBeenCalledWith("session:message", { sessionId: "new-1", input: "hello" });
82
+ expect(result.current.selectedSession?.messages[0].content).toBe("hello");
83
+
84
+ act(() => {
85
+ socketMock.handlers["session:text"]?.({ sessionId: "new-1", text: "answer" });
86
+ socketMock.handlers["session:result"]?.({ sessionId: "new-1", isError: false });
87
+ });
88
+
89
+ expect(mockSave).toHaveBeenCalled();
90
+ expect(result.current.selectedSession?.messages.at(-1)?.content).toBe("answer");
91
+ expect(result.current.selectedSession?.isWaiting).toBe(false);
92
+ });
93
+
94
+ it("loads conversations when selecting a DB session and terminates it", async () => {
95
+ const { result } = renderHook(() => useGeminiSessions());
96
+ act(() => { socketMock.handlers.connect?.(); });
97
+ await waitFor(() => expect(result.current.sessions).toHaveLength(1));
98
+
99
+ act(() => { result.current.selectSession("db-1"); });
100
+ await waitFor(() => expect(mockFetchConversations).toHaveBeenCalledWith("db-1"));
101
+ await waitFor(() => expect(result.current.selectedSession?.messages).toHaveLength(1));
102
+
103
+ await act(async () => { await result.current.terminateSession("db-1"); });
104
+ expect(mockDeleteSession).toHaveBeenCalledWith("db-1");
105
+ expect(result.current.sessions).toEqual([]);
106
+ });
107
+
108
+ it("keeps the session visible when terminate fails", async () => {
109
+ mockDeleteSession.mockRejectedValueOnce(new Error("delete failed"));
110
+ const { result } = renderHook(() => useGeminiSessions());
111
+ act(() => { socketMock.handlers.connect?.(); });
112
+ await waitFor(() => expect(result.current.sessions).toHaveLength(1));
113
+
114
+ await act(async () => { await result.current.terminateSession("db-1"); });
115
+
116
+ expect(result.current.sessions).toHaveLength(1);
117
+ expect(result.current.error).toBe("delete failed");
118
+ });
119
+
120
+ it("sets errors from socket and create failures", async () => {
121
+ mockCreateSession.mockRejectedValueOnce(new Error("create failed"));
122
+ const { result } = renderHook(() => useGeminiSessions());
123
+
124
+ await act(async () => { await result.current.createSession(); });
125
+ expect(result.current.error).toBe("create failed");
126
+
127
+ act(() => { socketMock.handlers.error?.({ message: "socket failed" }); });
128
+ expect(result.current.error).toBe("socket failed");
129
+ });
130
+ });
@@ -0,0 +1,54 @@
1
+ "use client";
2
+
3
+ import { useCallback, useEffect, useState } from "react";
4
+
5
+ import type { AgentId } from "../ui/AgentSelectModal";
6
+ import type { AgentModelSettings, AgentModelSettingsByAgent } from "../lib/agentModelOptions";
7
+
8
+ const STORAGE_KEY = "ji.agentModelSettings";
9
+
10
+ const DEFAULT_SETTINGS: AgentModelSettingsByAgent = {
11
+ claude: { model: "default", reasoning: "default" },
12
+ codex: { model: "default", reasoning: "default" },
13
+ };
14
+
15
+ function readStoredSettings(): AgentModelSettingsByAgent {
16
+ try {
17
+ const raw = window.localStorage.getItem(STORAGE_KEY);
18
+ if (!raw) return DEFAULT_SETTINGS;
19
+ const parsed = JSON.parse(raw) as AgentModelSettingsByAgent;
20
+ return { ...DEFAULT_SETTINGS, ...parsed };
21
+ } catch {
22
+ return DEFAULT_SETTINGS;
23
+ }
24
+ }
25
+
26
+ export function useAgentModelSettings() {
27
+ const [settingsByAgent, setSettingsByAgent] =
28
+ useState<AgentModelSettingsByAgent>(DEFAULT_SETTINGS);
29
+ const [hydrated, setHydrated] = useState(false);
30
+
31
+ useEffect(() => {
32
+ setSettingsByAgent(readStoredSettings());
33
+ setHydrated(true);
34
+ }, []);
35
+
36
+ useEffect(() => {
37
+ if (!hydrated) return;
38
+ try {
39
+ window.localStorage.setItem(STORAGE_KEY, JSON.stringify(settingsByAgent));
40
+ } catch {}
41
+ }, [hydrated, settingsByAgent]);
42
+
43
+ const updateSettings = useCallback((agentId: AgentId, settings: AgentModelSettings) => {
44
+ setSettingsByAgent((prev) => ({
45
+ ...prev,
46
+ [agentId]: {
47
+ ...(prev[agentId] ?? {}),
48
+ ...settings,
49
+ },
50
+ }));
51
+ }, []);
52
+
53
+ return { settingsByAgent, updateSettings };
54
+ }
@@ -0,0 +1,323 @@
1
+ "use client";
2
+
3
+ import { useCallback, useEffect, useRef, useState } from "react";
4
+ import { io, type Socket } from "socket.io-client";
5
+
6
+ import { CLAUDE_WS_NAMESPACE, SERVER_URL } from "@/lib/constants";
7
+ import {
8
+ createSession as apiCreateSession,
9
+ deleteSession,
10
+ fetchConversations,
11
+ fetchDBSessions,
12
+ saveConversation,
13
+ updateSessionTitle,
14
+ } from "../api/sessions.api";
15
+ import type { DBConversation, SessionInfo } from "../api/sessions.api";
16
+ import type { AgentModelSettings } from "../lib/agentModelOptions";
17
+ import type { AgentId } from "../ui/AgentSelectModal";
18
+
19
+ // ─── 타입 ────────────────────────────────────────────────────────────────────
20
+
21
+ export type ConnectionStatus = "disconnected" | "connecting" | "connected";
22
+ export type MessageRole = "user" | "assistant" | "permission" | "system";
23
+
24
+ export interface ToolUseBlock {
25
+ tool: string;
26
+ input: Record<string, unknown>;
27
+ }
28
+
29
+ export interface ResultMeta {
30
+ result: string;
31
+ isError: boolean;
32
+ durationMs: number;
33
+ costUsd: number;
34
+ }
35
+
36
+ export interface ChatMessage {
37
+ id: string;
38
+ role: MessageRole;
39
+ content: string;
40
+ toolUses?: ToolUseBlock[];
41
+ meta?: ResultMeta;
42
+ createdAt: Date;
43
+ }
44
+
45
+ export interface SessionState {
46
+ info: SessionInfo;
47
+ messages: ChatMessage[];
48
+ streaming: string;
49
+ isWaiting: boolean;
50
+ messagesLoaded: boolean;
51
+ agentId: AgentId;
52
+ }
53
+
54
+ export type { AgentId };
55
+
56
+ export { SessionInfo };
57
+
58
+ // ─── 헬퍼 ────────────────────────────────────────────────────────────────────
59
+
60
+ let msgId = 0;
61
+ const nextId = () => String(++msgId);
62
+
63
+ function toMessages(convos: DBConversation[]): ChatMessage[] {
64
+ return convos.map((c) => ({
65
+ id: c.id,
66
+ role: c.type === "user_message" ? "user" : "assistant",
67
+ content: c.content,
68
+ createdAt: new Date(c.createdAt),
69
+ }));
70
+ }
71
+
72
+ // ─── Hook ────────────────────────────────────────────────────────────────────
73
+
74
+ export function useClaudeSessions() {
75
+ const socketRef = useRef<Socket | null>(null);
76
+ const [connectionStatus, setConnectionStatus] = useState<ConnectionStatus>("disconnected");
77
+ const [sessions, setSessions] = useState<SessionState[]>([]);
78
+ const [selectedSessionId, setSelectedSessionId] = useState<string | null>(null);
79
+ const [error, setError] = useState<string | null>(null);
80
+
81
+ const streamingRef = useRef<Record<string, string>>({});
82
+ const pendingToolsRef = useRef<Record<string, ToolUseBlock[]>>({});
83
+ const pendingPromptIdRef = useRef<Record<string, string>>({});
84
+ const loadingSessionsRef = useRef<Set<string>>(new Set());
85
+
86
+ // ─── DB 세션 로드 ──────────────────────────────────────────────────────────
87
+
88
+ const loadSessionsFromDB = useCallback(async () => {
89
+ try {
90
+ const dbSessions = await fetchDBSessions('claude');
91
+ setSessions((prev) => {
92
+ const existingIds = new Set(prev.map((s) => s.info.id));
93
+ const newStates: SessionState[] = dbSessions
94
+ .filter((s) => !existingIds.has(s.sessionId))
95
+ .map((s) => ({
96
+ info: { id: s.sessionId, title: !s.title || s.title === "server" ? "Claude" : s.title, createdAt: s.createdAt },
97
+ messages: [],
98
+ streaming: "",
99
+ isWaiting: false,
100
+ messagesLoaded: false,
101
+ agentId: "claude" as AgentId,
102
+ }));
103
+ return [...prev, ...newStates].sort(
104
+ (a, b) => new Date(b.info.createdAt).getTime() - new Date(a.info.createdAt).getTime(),
105
+ );
106
+ });
107
+ } catch {}
108
+ }, []);
109
+
110
+ // ─── 대화 기록 로드 ────────────────────────────────────────────────────────
111
+
112
+ const loadConversations = useCallback(async (sessionId: string) => {
113
+ if (loadingSessionsRef.current.has(sessionId)) return;
114
+ loadingSessionsRef.current.add(sessionId);
115
+ try {
116
+ const convos = await fetchConversations(sessionId);
117
+ setSessions((prev) =>
118
+ prev.map((s) =>
119
+ s.info.id === sessionId ? { ...s, messages: toMessages(convos), messagesLoaded: true } : s,
120
+ ),
121
+ );
122
+ } catch {
123
+ setSessions((prev) =>
124
+ prev.map((s) => (s.info.id === sessionId ? { ...s, messagesLoaded: true } : s)),
125
+ );
126
+ }
127
+ }, []);
128
+
129
+ // ─── WebSocket ─────────────────────────────────────────────────────────────
130
+
131
+ useEffect(() => {
132
+ const socket = io(`${SERVER_URL}${CLAUDE_WS_NAMESPACE}`, { transports: ["websocket"] });
133
+ socketRef.current = socket;
134
+ setConnectionStatus("connecting");
135
+
136
+ socket.on("connect", () => {
137
+ setConnectionStatus("connected");
138
+ void loadSessionsFromDB();
139
+ });
140
+
141
+ socket.on("disconnect", () => setConnectionStatus("disconnected"));
142
+
143
+ socket.on("session:text", ({ sessionId, text }: { sessionId: string; text: string }) => {
144
+ streamingRef.current[sessionId] = (streamingRef.current[sessionId] ?? "") + text;
145
+ const accumulated = streamingRef.current[sessionId];
146
+ setSessions((prev) =>
147
+ prev.map((s) =>
148
+ s.info.id === sessionId ? { ...s, streaming: accumulated, isWaiting: true } : s,
149
+ ),
150
+ );
151
+ });
152
+
153
+ socket.on(
154
+ "session:tool",
155
+ ({ sessionId, tool, input }: { sessionId: string; tool: string; input: Record<string, unknown> }) => {
156
+ if (!pendingToolsRef.current[sessionId]) pendingToolsRef.current[sessionId] = [];
157
+ pendingToolsRef.current[sessionId].push({ tool, input });
158
+ },
159
+ );
160
+
161
+ socket.on(
162
+ "session:result",
163
+ ({ sessionId, result, isError, durationMs, costUsd }: { sessionId: string } & ResultMeta) => {
164
+ const content = (streamingRef.current[sessionId] ?? "").trim();
165
+ const toolUses = pendingToolsRef.current[sessionId] ?? [];
166
+ streamingRef.current[sessionId] = "";
167
+ pendingToolsRef.current[sessionId] = [];
168
+
169
+ const promptId = pendingPromptIdRef.current[sessionId];
170
+ if (promptId && content) {
171
+ saveConversation(sessionId, promptId, content, "agent_message");
172
+ delete pendingPromptIdRef.current[sessionId];
173
+ }
174
+
175
+ setSessions((prev) =>
176
+ prev.map((s) => {
177
+ if (s.info.id !== sessionId) return s;
178
+ const newMessages = [...s.messages];
179
+ if (content || toolUses.length > 0) {
180
+ newMessages.push({
181
+ id: nextId(),
182
+ role: "assistant",
183
+ content,
184
+ toolUses: toolUses.length > 0 ? toolUses : undefined,
185
+ meta: { result, isError, durationMs, costUsd },
186
+ createdAt: new Date(),
187
+ });
188
+ }
189
+ return { ...s, messages: newMessages, streaming: "", isWaiting: false };
190
+ }),
191
+ );
192
+ },
193
+ );
194
+
195
+ socket.on("session:exit", ({ sessionId }: { sessionId: string }) => {
196
+ streamingRef.current[sessionId] = "";
197
+ pendingToolsRef.current[sessionId] = [];
198
+ setSessions((prev) =>
199
+ prev.map((s) => (s.info.id === sessionId ? { ...s, streaming: "", isWaiting: false } : s)),
200
+ );
201
+ });
202
+
203
+ socket.on("error", ({ message }: { message: string }) => setError(message));
204
+
205
+ return () => { socket.disconnect(); };
206
+ }, [loadSessionsFromDB]);
207
+
208
+ // ─── 세션 선택 시 대화 기록 로드 ─────────────────────────────────────────
209
+
210
+ useEffect(() => {
211
+ if (!selectedSessionId) return;
212
+ const session = sessions.find((s) => s.info.id === selectedSessionId);
213
+ if (!session || session.messagesLoaded) return;
214
+ void loadConversations(selectedSessionId);
215
+ }, [selectedSessionId, sessions, loadConversations]);
216
+
217
+ // ─── 공개 API ─────────────────────────────────────────────────────────────
218
+
219
+ const renameSession = useCallback((sessionId: string, newTitle: string) => {
220
+ setSessions((prev) =>
221
+ prev.map((s) =>
222
+ s.info.id === sessionId ? { ...s, info: { ...s.info, title: newTitle } } : s,
223
+ ),
224
+ );
225
+ void updateSessionTitle(sessionId, newTitle).catch(() => undefined);
226
+ }, []);
227
+
228
+ const createSession = useCallback(async (
229
+ agentId: AgentId,
230
+ workingDirectory?: string,
231
+ modelSettings?: AgentModelSettings,
232
+ ): Promise<string | null> => {
233
+ setError(null);
234
+ try {
235
+ const raw = await apiCreateSession({ workingDirectory, ...modelSettings });
236
+ const title = raw.workingDirectory
237
+ ? raw.workingDirectory.replace(/[/\\]+$/, "").split(/[/\\]/).filter(Boolean).at(-1) ?? "Claude"
238
+ : "Claude";
239
+
240
+ const newState: SessionState = {
241
+ info: { ...raw, title },
242
+ messages: [],
243
+ streaming: "",
244
+ isWaiting: false,
245
+ messagesLoaded: true,
246
+ agentId,
247
+ };
248
+
249
+ setSessions((prev) => [newState, ...prev]);
250
+ setSelectedSessionId(raw.id);
251
+ return raw.id;
252
+ } catch (e) {
253
+ setError(e instanceof Error ? e.message : "세션 생성 실패");
254
+ return null;
255
+ }
256
+ }, []);
257
+
258
+ const sendMessage = useCallback((sessionId: string, text: string, modelSettings?: AgentModelSettings) => {
259
+ const promptId = crypto.randomUUID();
260
+ pendingPromptIdRef.current[sessionId] = promptId;
261
+
262
+ setSessions((prev) =>
263
+ prev.map((s) =>
264
+ s.info.id === sessionId
265
+ ? {
266
+ ...s,
267
+ messages: [
268
+ ...s.messages,
269
+ { id: nextId(), role: "user", content: text, createdAt: new Date() },
270
+ ],
271
+ isWaiting: true,
272
+ }
273
+ : s,
274
+ ),
275
+ );
276
+
277
+ saveConversation(sessionId, promptId, text, "user_message");
278
+ socketRef.current?.emit("session:message", {
279
+ sessionId,
280
+ input: text,
281
+ ...modelSettings,
282
+ });
283
+ }, []);
284
+
285
+ const terminateSession = useCallback(async (sessionId: string) => {
286
+ try {
287
+ await deleteSession(sessionId);
288
+ setSessions((prev) => prev.filter((s) => s.info.id !== sessionId));
289
+ setSelectedSessionId((prev) => (prev === sessionId ? null : prev));
290
+ } catch (err) {
291
+ setError(err instanceof Error ? err.message : "세션 삭제 실패");
292
+ }
293
+ }, []);
294
+
295
+ const injectMessage = useCallback(
296
+ (sessionId: string, message: Omit<ChatMessage, "id" | "createdAt">) => {
297
+ setSessions((prev) =>
298
+ prev.map((s) =>
299
+ s.info.id === sessionId
300
+ ? { ...s, messages: [...s.messages, { ...message, id: nextId(), createdAt: new Date() }] }
301
+ : s,
302
+ ),
303
+ );
304
+ },
305
+ [],
306
+ );
307
+
308
+ const selectedSession = sessions.find((s) => s.info.id === selectedSessionId) ?? null;
309
+
310
+ return {
311
+ connectionStatus,
312
+ sessions,
313
+ selectedSession,
314
+ selectedSessionId,
315
+ error,
316
+ createSession,
317
+ selectSession: setSelectedSessionId,
318
+ sendMessage,
319
+ terminateSession,
320
+ injectMessage,
321
+ renameSession,
322
+ };
323
+ }