@machina.ai/cell-cli-core 1.8.2-rc1 → 1.10.0-rc1

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 (237) hide show
  1. package/dist/index.d.ts +1 -1
  2. package/dist/index.js +1 -1
  3. package/dist/index.js.map +1 -1
  4. package/dist/package.json +1 -1
  5. package/dist/src/agents/codebase-investigator.d.ts +36 -1
  6. package/dist/src/agents/codebase-investigator.js +93 -31
  7. package/dist/src/agents/codebase-investigator.js.map +1 -1
  8. package/dist/src/agents/executor.d.ts +15 -11
  9. package/dist/src/agents/executor.js +265 -103
  10. package/dist/src/agents/executor.js.map +1 -1
  11. package/dist/src/agents/executor.test.js +493 -232
  12. package/dist/src/agents/executor.test.js.map +1 -1
  13. package/dist/src/agents/invocation.d.ts +5 -2
  14. package/dist/src/agents/invocation.js +4 -2
  15. package/dist/src/agents/invocation.js.map +1 -1
  16. package/dist/src/agents/invocation.test.js +9 -0
  17. package/dist/src/agents/invocation.test.js.map +1 -1
  18. package/dist/src/agents/registry.d.ts +2 -1
  19. package/dist/src/agents/registry.js +24 -1
  20. package/dist/src/agents/registry.js.map +1 -1
  21. package/dist/src/agents/subagent-tool-wrapper.d.ts +3 -1
  22. package/dist/src/agents/subagent-tool-wrapper.js +4 -3
  23. package/dist/src/agents/subagent-tool-wrapper.js.map +1 -1
  24. package/dist/src/agents/subagent-tool-wrapper.test.js +8 -1
  25. package/dist/src/agents/subagent-tool-wrapper.test.js.map +1 -1
  26. package/dist/src/agents/types.d.ts +35 -6
  27. package/dist/src/agents/types.js +1 -0
  28. package/dist/src/agents/types.js.map +1 -1
  29. package/dist/src/code_assist/oauth-credential-storage.js +1 -1
  30. package/dist/src/code_assist/oauth-credential-storage.js.map +1 -1
  31. package/dist/src/code_assist/oauth-credential-storage.test.js +1 -1
  32. package/dist/src/code_assist/oauth-credential-storage.test.js.map +1 -1
  33. package/dist/src/code_assist/oauth2.test.js +14 -13
  34. package/dist/src/code_assist/oauth2.test.js.map +1 -1
  35. package/dist/src/code_assist/setup.js +4 -2
  36. package/dist/src/code_assist/setup.js.map +1 -1
  37. package/dist/src/config/config.d.ts +48 -9
  38. package/dist/src/config/config.js +91 -16
  39. package/dist/src/config/config.js.map +1 -1
  40. package/dist/src/config/config.test.js +67 -3
  41. package/dist/src/config/config.test.js.map +1 -1
  42. package/dist/src/config/storage.d.ts +0 -1
  43. package/dist/src/config/storage.js +2 -2
  44. package/dist/src/config/storage.js.map +1 -1
  45. package/dist/src/config/storage.test.js +7 -6
  46. package/dist/src/config/storage.test.js.map +1 -1
  47. package/dist/src/core/client.d.ts +3 -1
  48. package/dist/src/core/client.js +67 -17
  49. package/dist/src/core/client.js.map +1 -1
  50. package/dist/src/core/client.test.js +199 -5
  51. package/dist/src/core/client.test.js.map +1 -1
  52. package/dist/src/core/contentGenerator.js +3 -1
  53. package/dist/src/core/contentGenerator.js.map +1 -1
  54. package/dist/src/core/coreToolScheduler.js +12 -12
  55. package/dist/src/core/coreToolScheduler.js.map +1 -1
  56. package/dist/src/core/coreToolScheduler.test.js +227 -0
  57. package/dist/src/core/coreToolScheduler.test.js.map +1 -1
  58. package/dist/src/core/geminiChat.d.ts +7 -11
  59. package/dist/src/core/geminiChat.js +32 -70
  60. package/dist/src/core/geminiChat.js.map +1 -1
  61. package/dist/src/core/geminiChat.test.js +93 -228
  62. package/dist/src/core/geminiChat.test.js.map +1 -1
  63. package/dist/src/core/logger.test.js +2 -2
  64. package/dist/src/core/logger.test.js.map +1 -1
  65. package/dist/src/core/nonInteractiveToolExecutor.d.ts +3 -2
  66. package/dist/src/core/nonInteractiveToolExecutor.js +2 -2
  67. package/dist/src/core/nonInteractiveToolExecutor.js.map +1 -1
  68. package/dist/src/core/nonInteractiveToolExecutor.test.js +8 -8
  69. package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
  70. package/dist/src/core/prompts.d.ts +2 -1
  71. package/dist/src/core/prompts.js +51 -110
  72. package/dist/src/core/prompts.js.map +1 -1
  73. package/dist/src/core/prompts.test.js +83 -29
  74. package/dist/src/core/prompts.test.js.map +1 -1
  75. package/dist/src/core/subagent.js +1 -1
  76. package/dist/src/core/subagent.js.map +1 -1
  77. package/dist/src/core/subagent.test.js +38 -12
  78. package/dist/src/core/subagent.test.js.map +1 -1
  79. package/dist/src/core/turn.d.ts +14 -2
  80. package/dist/src/core/turn.js +12 -1
  81. package/dist/src/core/turn.js.map +1 -1
  82. package/dist/src/core/turn.test.js +14 -2
  83. package/dist/src/core/turn.test.js.map +1 -1
  84. package/dist/src/generated/git-commit.d.ts +2 -2
  85. package/dist/src/generated/git-commit.js +2 -2
  86. package/dist/src/generated/git-commit.js.map +1 -1
  87. package/dist/src/ide/detect-ide.test.js +11 -0
  88. package/dist/src/ide/detect-ide.test.js.map +1 -1
  89. package/dist/src/ide/ide-client.js +3 -3
  90. package/dist/src/ide/ide-client.test.js +4 -4
  91. package/dist/src/ide/ide-installer.js +1 -1
  92. package/dist/src/ide/ide-installer.js.map +1 -1
  93. package/dist/src/ide/ide-installer.test.js +13 -1
  94. package/dist/src/ide/ide-installer.test.js.map +1 -1
  95. package/dist/src/ide/process-utils.js +85 -75
  96. package/dist/src/ide/process-utils.js.map +1 -1
  97. package/dist/src/ide/process-utils.test.js +83 -90
  98. package/dist/src/ide/process-utils.test.js.map +1 -1
  99. package/dist/src/index.d.ts +2 -0
  100. package/dist/src/index.js +2 -0
  101. package/dist/src/index.js.map +1 -1
  102. package/dist/src/mcp/token-storage/file-token-storage.js +2 -1
  103. package/dist/src/mcp/token-storage/file-token-storage.js.map +1 -1
  104. package/dist/src/mcp/token-storage/file-token-storage.test.js +4 -3
  105. package/dist/src/mcp/token-storage/file-token-storage.test.js.map +1 -1
  106. package/dist/src/services/chatRecordingService.d.ts +2 -1
  107. package/dist/src/services/chatRecordingService.js +2 -1
  108. package/dist/src/services/chatRecordingService.js.map +1 -1
  109. package/dist/src/services/shellExecutionService.d.ts +1 -0
  110. package/dist/src/services/shellExecutionService.js +144 -69
  111. package/dist/src/services/shellExecutionService.js.map +1 -1
  112. package/dist/src/services/shellExecutionService.test.js +61 -1
  113. package/dist/src/services/shellExecutionService.test.js.map +1 -1
  114. package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +14 -2
  115. package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +104 -8
  116. package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
  117. package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +81 -1
  118. package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -1
  119. package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +13 -3
  120. package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +32 -5
  121. package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
  122. package/dist/src/telemetry/constants.d.ts +0 -28
  123. package/dist/src/telemetry/constants.js +0 -29
  124. package/dist/src/telemetry/constants.js.map +1 -1
  125. package/dist/src/telemetry/index.d.ts +5 -3
  126. package/dist/src/telemetry/index.js +11 -4
  127. package/dist/src/telemetry/index.js.map +1 -1
  128. package/dist/src/telemetry/loggers.d.ts +8 -2
  129. package/dist/src/telemetry/loggers.js +165 -299
  130. package/dist/src/telemetry/loggers.js.map +1 -1
  131. package/dist/src/telemetry/loggers.test.js +195 -7
  132. package/dist/src/telemetry/loggers.test.js.map +1 -1
  133. package/dist/src/telemetry/memory-monitor.d.ts +149 -0
  134. package/dist/src/telemetry/memory-monitor.js +335 -0
  135. package/dist/src/telemetry/memory-monitor.js.map +1 -0
  136. package/dist/src/telemetry/memory-monitor.test.d.ts +6 -0
  137. package/dist/src/telemetry/memory-monitor.test.js +472 -0
  138. package/dist/src/telemetry/memory-monitor.test.js.map +1 -0
  139. package/dist/src/telemetry/metrics.d.ts +131 -4
  140. package/dist/src/telemetry/metrics.js +182 -6
  141. package/dist/src/telemetry/metrics.js.map +1 -1
  142. package/dist/src/telemetry/metrics.test.js +360 -1
  143. package/dist/src/telemetry/metrics.test.js.map +1 -1
  144. package/dist/src/telemetry/telemetryAttributes.d.ts +8 -0
  145. package/dist/src/telemetry/telemetryAttributes.js +18 -0
  146. package/dist/src/telemetry/telemetryAttributes.js.map +1 -0
  147. package/dist/src/telemetry/types.d.ts +150 -3
  148. package/dist/src/telemetry/types.js +664 -33
  149. package/dist/src/telemetry/types.js.map +1 -1
  150. package/dist/src/telemetry/uiTelemetry.d.ts +1 -1
  151. package/dist/src/telemetry/uiTelemetry.js +1 -1
  152. package/dist/src/telemetry/uiTelemetry.js.map +1 -1
  153. package/dist/src/telemetry/uiTelemetry.test.js +1 -1
  154. package/dist/src/telemetry/uiTelemetry.test.js.map +1 -1
  155. package/dist/src/tools/glob.js +2 -1
  156. package/dist/src/tools/glob.js.map +1 -1
  157. package/dist/src/tools/mcp-client.d.ts +3 -2
  158. package/dist/src/tools/mcp-client.js +29 -33
  159. package/dist/src/tools/mcp-client.js.map +1 -1
  160. package/dist/src/tools/mcp-client.test.js +168 -5
  161. package/dist/src/tools/mcp-client.test.js.map +1 -1
  162. package/dist/src/tools/memoryTool.d.ts +1 -1
  163. package/dist/src/tools/memoryTool.js +1 -2
  164. package/dist/src/tools/memoryTool.js.map +1 -1
  165. package/dist/src/tools/memoryTool.test.js +9 -8
  166. package/dist/src/tools/memoryTool.test.js.map +1 -1
  167. package/dist/src/tools/shell.js +55 -2
  168. package/dist/src/tools/shell.js.map +1 -1
  169. package/dist/src/tools/shell.test.js +2 -1
  170. package/dist/src/tools/shell.test.js.map +1 -1
  171. package/dist/src/tools/smart-edit.d.ts +1 -20
  172. package/dist/src/tools/smart-edit.js +57 -55
  173. package/dist/src/tools/smart-edit.js.map +1 -1
  174. package/dist/src/tools/smart-edit.test.js +70 -86
  175. package/dist/src/tools/smart-edit.test.js.map +1 -1
  176. package/dist/src/tools/tool-error.d.ts +21 -0
  177. package/dist/src/tools/tool-error.js +27 -0
  178. package/dist/src/tools/tool-error.js.map +1 -1
  179. package/dist/src/tools/tool-names.d.ts +9 -0
  180. package/dist/src/tools/tool-names.js +18 -0
  181. package/dist/src/tools/tool-names.js.map +1 -0
  182. package/dist/src/tools/web-fetch.d.ts +7 -0
  183. package/dist/src/tools/web-fetch.js +42 -10
  184. package/dist/src/tools/web-fetch.js.map +1 -1
  185. package/dist/src/tools/web-fetch.test.js +127 -8
  186. package/dist/src/tools/web-fetch.test.js.map +1 -1
  187. package/dist/src/tools/web-search.js +2 -1
  188. package/dist/src/tools/web-search.js.map +1 -1
  189. package/dist/src/tools/write-file.js +2 -1
  190. package/dist/src/tools/write-file.js.map +1 -1
  191. package/dist/src/tools/write-todos.d.ts +1 -1
  192. package/dist/src/tools/write-todos.js +4 -3
  193. package/dist/src/tools/write-todos.js.map +1 -1
  194. package/dist/src/utils/editCorrector.js +2 -2
  195. package/dist/src/utils/editCorrector.js.map +1 -1
  196. package/dist/src/utils/editor.js +1 -0
  197. package/dist/src/utils/editor.js.map +1 -1
  198. package/dist/src/utils/editor.test.js +1 -0
  199. package/dist/src/utils/editor.test.js.map +1 -1
  200. package/dist/src/utils/formatters.d.ts +1 -0
  201. package/dist/src/utils/formatters.js +2 -1
  202. package/dist/src/utils/formatters.js.map +1 -1
  203. package/dist/src/utils/formatters.test.d.ts +6 -0
  204. package/dist/src/utils/formatters.test.js +26 -0
  205. package/dist/src/utils/formatters.test.js.map +1 -0
  206. package/dist/src/utils/getFolderStructure.test.js +7 -6
  207. package/dist/src/utils/getFolderStructure.test.js.map +1 -1
  208. package/dist/src/utils/installationManager.test.js +2 -1
  209. package/dist/src/utils/installationManager.test.js.map +1 -1
  210. package/dist/src/utils/llm-edit-fixer.js +3 -3
  211. package/dist/src/utils/memoryDiscovery.d.ts +1 -0
  212. package/dist/src/utils/memoryDiscovery.js +2 -1
  213. package/dist/src/utils/memoryDiscovery.js.map +1 -1
  214. package/dist/src/utils/memoryDiscovery.test.js +99 -21
  215. package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
  216. package/dist/src/utils/pathCorrector.d.ts +25 -0
  217. package/dist/src/utils/pathCorrector.js +33 -0
  218. package/dist/src/utils/pathCorrector.js.map +1 -0
  219. package/dist/src/utils/pathCorrector.test.d.ts +6 -0
  220. package/dist/src/utils/pathCorrector.test.js +83 -0
  221. package/dist/src/utils/pathCorrector.test.js.map +1 -0
  222. package/dist/src/utils/retry.d.ts +2 -1
  223. package/dist/src/utils/retry.js +22 -14
  224. package/dist/src/utils/retry.js.map +1 -1
  225. package/dist/src/utils/retry.test.js +83 -39
  226. package/dist/src/utils/retry.test.js.map +1 -1
  227. package/dist/src/utils/shell-utils.d.ts +1 -0
  228. package/dist/src/utils/shell-utils.js +1 -1
  229. package/dist/src/utils/shell-utils.js.map +1 -1
  230. package/dist/src/utils/tool-utils.js +2 -2
  231. package/dist/src/utils/tool-utils.js.map +1 -1
  232. package/dist/src/utils/tool-utils.test.js +8 -0
  233. package/dist/src/utils/tool-utils.test.js.map +1 -1
  234. package/dist/src/utils/userAccountManager.test.js +2 -1
  235. package/dist/src/utils/userAccountManager.test.js.map +1 -1
  236. package/dist/tsconfig.tsbuildinfo +1 -1
  237. package/package.json +1 -1
@@ -10,55 +10,72 @@ import path from 'node:path';
10
10
  const execAsync = promisify(exec);
11
11
  const MAX_TRAVERSAL_DEPTH = 32;
12
12
  /**
13
- * Fetches the parent process ID, name, and command for a given process ID.
13
+ * Fetches the entire process table on Windows.
14
+ */
15
+ async function getProcessTableWindows() {
16
+ const processMap = new Map();
17
+ try {
18
+ // Fetch ProcessId, ParentProcessId, Name, and CommandLine for all processes.
19
+ const powershellCommand = 'Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,Name,CommandLine | ConvertTo-Json -Compress';
20
+ // Increase maxBuffer to handle large process lists (default is 1MB)
21
+ const { stdout } = await execAsync(`powershell "${powershellCommand}"`, {
22
+ maxBuffer: 10 * 1024 * 1024,
23
+ });
24
+ if (!stdout.trim()) {
25
+ return processMap;
26
+ }
27
+ let processes;
28
+ try {
29
+ processes = JSON.parse(stdout);
30
+ }
31
+ catch (_e) {
32
+ return processMap;
33
+ }
34
+ if (!Array.isArray(processes)) {
35
+ processes = [processes];
36
+ }
37
+ for (const p of processes) {
38
+ if (p && typeof p.ProcessId === 'number') {
39
+ processMap.set(p.ProcessId, {
40
+ pid: p.ProcessId,
41
+ parentPid: p.ParentProcessId || 0,
42
+ name: p.Name || '',
43
+ command: p.CommandLine || '',
44
+ });
45
+ }
46
+ }
47
+ }
48
+ catch (_e) {
49
+ // Fallback or error handling if PowerShell fails
50
+ }
51
+ return processMap;
52
+ }
53
+ /**
54
+ * Fetches the parent process ID, name, and command for a given process ID on Unix.
14
55
  *
15
56
  * @param pid The process ID to inspect.
16
57
  * @returns A promise that resolves to the parent's PID, name, and command.
17
58
  */
18
59
  async function getProcessInfo(pid) {
19
60
  try {
20
- const platform = os.platform();
21
- if (platform === 'win32') {
22
- const powershellCommand = [
23
- '$p = Get-CimInstance Win32_Process',
24
- `-Filter 'ProcessId=${pid}'`,
25
- '-ErrorAction SilentlyContinue;',
26
- 'if ($p) {',
27
- '@{Name=$p.Name;ParentProcessId=$p.ParentProcessId;CommandLine=$p.CommandLine}',
28
- '| ConvertTo-Json',
29
- '}',
30
- ].join(' ');
31
- const { stdout } = await execAsync(`powershell "${powershellCommand}"`);
32
- const output = stdout.trim();
33
- if (!output)
34
- return { parentPid: 0, name: '', command: '' };
35
- const { Name = '', ParentProcessId = 0, CommandLine = '', } = JSON.parse(output);
36
- return {
37
- parentPid: ParentProcessId,
38
- name: Name,
39
- command: CommandLine ?? '',
40
- };
41
- }
42
- else {
43
- const command = `ps -o ppid=,command= -p ${pid}`;
44
- const { stdout } = await execAsync(command);
45
- const trimmedStdout = stdout.trim();
46
- if (!trimmedStdout) {
47
- return { parentPid: 0, name: '', command: '' };
48
- }
49
- const ppidString = trimmedStdout.split(/\s+/)[0];
50
- const parentPid = parseInt(ppidString, 10);
51
- const fullCommand = trimmedStdout.substring(ppidString.length).trim();
52
- const processName = path.basename(fullCommand.split(' ')[0]);
53
- return {
54
- parentPid: isNaN(parentPid) ? 1 : parentPid,
55
- name: processName,
56
- command: fullCommand,
57
- };
61
+ const command = `ps -o ppid=,command= -p ${pid}`;
62
+ const { stdout } = await execAsync(command);
63
+ const trimmedStdout = stdout.trim();
64
+ if (!trimmedStdout) {
65
+ return { parentPid: 0, name: '', command: '' };
58
66
  }
67
+ const parts = trimmedStdout.split(/\s+/);
68
+ const ppidString = parts[0];
69
+ const parentPid = parseInt(ppidString, 10);
70
+ const fullCommand = trimmedStdout.substring(ppidString.length).trim();
71
+ const processName = path.basename(fullCommand.split(' ')[0]);
72
+ return {
73
+ parentPid: isNaN(parentPid) ? 1 : parentPid,
74
+ name: processName,
75
+ command: fullCommand,
76
+ };
59
77
  }
60
78
  catch (_e) {
61
- console.debug(`Failed to get process info for pid ${pid}:`, _e);
62
79
  return { parentPid: 0, name: '', command: '' };
63
80
  }
64
81
  }
@@ -109,45 +126,38 @@ async function getIdeProcessInfoForUnix() {
109
126
  return { pid: currentPid, command };
110
127
  }
111
128
  /**
112
- * Finds the IDE process info on Windows.
113
- *
114
- * The strategy is to find the great-grandchild of the root process.
115
- *
116
- * @returns A promise that resolves to the PID and command of the IDE process.
129
+ * Finds the IDE process info on Windows using a snapshot approach.
117
130
  */
118
131
  async function getIdeProcessInfoForWindows() {
119
- let currentPid = process.pid;
120
- let previousPid = process.pid;
121
- for (let i = 0; i < MAX_TRAVERSAL_DEPTH; i++) {
122
- try {
123
- const { parentPid } = await getProcessInfo(currentPid);
124
- if (parentPid > 0) {
125
- try {
126
- const { parentPid: grandParentPid } = await getProcessInfo(parentPid);
127
- if (grandParentPid === 0) {
128
- // We've found the grandchild of the root (`currentPid`). The IDE
129
- // process is its child, which we've stored in `previousPid`.
130
- const { command } = await getProcessInfo(previousPid);
131
- return { pid: previousPid, command };
132
- }
133
- }
134
- catch {
135
- // getting grandparent failed, proceed
136
- }
137
- }
138
- if (parentPid <= 0) {
139
- break; // Reached the root
140
- }
141
- previousPid = currentPid;
142
- currentPid = parentPid;
143
- }
144
- catch {
145
- // Process in chain died
146
- break;
132
+ // Fetch the entire process table in one go.
133
+ const processMap = await getProcessTableWindows();
134
+ const myPid = process.pid;
135
+ const myProc = processMap.get(myPid);
136
+ if (!myProc) {
137
+ // Fallback: try to get info for current process directly if snapshot fails
138
+ const { command } = await getProcessInfo(myPid);
139
+ return { pid: myPid, command };
140
+ }
141
+ // Perform tree traversal in memory.
142
+ // Strategy: Find the great-grandchild of the root process (pid 0 or non-existent parent).
143
+ const ancestors = [];
144
+ let curr = myProc;
145
+ for (let i = 0; i < MAX_TRAVERSAL_DEPTH && curr; i++) {
146
+ ancestors.push(curr);
147
+ if (curr.parentPid === 0 || !processMap.has(curr.parentPid)) {
148
+ break; // Reached root
147
149
  }
150
+ curr = processMap.get(curr.parentPid);
148
151
  }
149
- const { command } = await getProcessInfo(currentPid);
150
- return { pid: currentPid, command };
152
+ if (ancestors.length >= 3) {
153
+ const target = ancestors[ancestors.length - 3];
154
+ return { pid: target.pid, command: target.command };
155
+ }
156
+ else if (ancestors.length > 0) {
157
+ const target = ancestors[ancestors.length - 1];
158
+ return { pid: target.pid, command: target.command };
159
+ }
160
+ return { pid: myPid, command: myProc.command };
151
161
  }
152
162
  /**
153
163
  * Traverses up the process tree to find the process ID and command of the IDE.
@@ -1 +1 @@
1
- {"version":3,"file":"process-utils.js","sourceRoot":"","sources":["../../../src/ide/process-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"process-utils.js","sourceRoot":"","sources":["../../../src/ide/process-utils.ts"],"names":[],"mappings":"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"}
@@ -47,111 +47,104 @@ describe('getIdeProcessInfo', () => {
47
47
  describe('on Windows', () => {
48
48
  it('should traverse up and find the great-grandchild of the root process', async () => {
49
49
  os.platform.mockReturnValue('win32');
50
- const processInfoMap = new Map([
51
- [
52
- 1000,
53
- {
54
- stdout: '{"Name":"node.exe","ParentProcessId":900,"CommandLine":"node.exe"}',
55
- },
56
- ],
57
- [
58
- 900,
59
- {
60
- stdout: '{"Name":"powershell.exe","ParentProcessId":800,"CommandLine":"powershell.exe"}',
61
- },
62
- ],
63
- [
64
- 800,
65
- {
66
- stdout: '{"Name":"code.exe","ParentProcessId":700,"CommandLine":"code.exe"}',
67
- },
68
- ],
69
- [
70
- 700,
71
- {
72
- stdout: '{"Name":"wininit.exe","ParentProcessId":0,"CommandLine":"wininit.exe"}',
73
- },
74
- ],
75
- ]);
76
- mockedExec.mockImplementation((command) => {
77
- const pidMatch = command.match(/ProcessId=(\d+)/);
78
- if (pidMatch) {
79
- const pid = parseInt(pidMatch[1], 10);
80
- return Promise.resolve(processInfoMap.get(pid));
81
- }
82
- return Promise.reject(new Error('Invalid command for mock'));
83
- });
50
+ // process (1000) -> powershell (900) -> code (800) -> wininit (700) -> root (0)
51
+ // Ancestors: [1000, 900, 800, 700]
52
+ // Target (great-grandchild of root): 900
53
+ const processes = [
54
+ {
55
+ ProcessId: 1000,
56
+ ParentProcessId: 900,
57
+ Name: 'node.exe',
58
+ CommandLine: 'node.exe',
59
+ },
60
+ {
61
+ ProcessId: 900,
62
+ ParentProcessId: 800,
63
+ Name: 'powershell.exe',
64
+ CommandLine: 'powershell.exe',
65
+ },
66
+ {
67
+ ProcessId: 800,
68
+ ParentProcessId: 700,
69
+ Name: 'code.exe',
70
+ CommandLine: 'code.exe',
71
+ },
72
+ {
73
+ ProcessId: 700,
74
+ ParentProcessId: 0,
75
+ Name: 'wininit.exe',
76
+ CommandLine: 'wininit.exe',
77
+ },
78
+ ];
79
+ mockedExec.mockResolvedValueOnce({ stdout: JSON.stringify(processes) });
84
80
  const result = await getIdeProcessInfo();
85
81
  expect(result).toEqual({ pid: 900, command: 'powershell.exe' });
82
+ expect(mockedExec).toHaveBeenCalledWith(expect.stringContaining('Get-CimInstance Win32_Process'), expect.anything());
86
83
  });
87
- it('should handle non-existent process gracefully', async () => {
84
+ it('should handle short process chains', async () => {
88
85
  os.platform.mockReturnValue('win32');
89
- mockedExec
90
- .mockResolvedValueOnce({ stdout: '' }) // Non-existent PID returns empty due to -ErrorAction SilentlyContinue
91
- .mockResolvedValueOnce({
92
- stdout: '{"Name":"fallback.exe","ParentProcessId":0,"CommandLine":"fallback.exe"}',
93
- }); // Fallback call
86
+ // process (1000) -> root (0)
87
+ const processes = [
88
+ {
89
+ ProcessId: 1000,
90
+ ParentProcessId: 0,
91
+ Name: 'node.exe',
92
+ CommandLine: 'node.exe',
93
+ },
94
+ ];
95
+ mockedExec.mockResolvedValueOnce({ stdout: JSON.stringify(processes) });
96
+ const result = await getIdeProcessInfo();
97
+ expect(result).toEqual({ pid: 1000, command: 'node.exe' });
98
+ });
99
+ it('should handle PowerShell failure gracefully', async () => {
100
+ os.platform.mockReturnValue('win32');
101
+ mockedExec.mockRejectedValueOnce(new Error('PowerShell failed'));
102
+ // Fallback to getProcessInfo for current PID
103
+ mockedExec.mockResolvedValueOnce({ stdout: '' }); // ps command fails on windows
94
104
  const result = await getIdeProcessInfo();
95
- expect(result).toEqual({ pid: 1000, command: 'fallback.exe' });
105
+ expect(result).toEqual({ pid: 1000, command: '' });
96
106
  });
97
107
  it('should handle malformed JSON output gracefully', async () => {
98
108
  os.platform.mockReturnValue('win32');
99
- mockedExec
100
- .mockResolvedValueOnce({ stdout: '{"invalid":json}' }) // Malformed JSON
101
- .mockResolvedValueOnce({
102
- stdout: '{"Name":"fallback.exe","ParentProcessId":0,"CommandLine":"fallback.exe"}',
103
- }); // Fallback call
109
+ mockedExec.mockResolvedValueOnce({ stdout: '{"invalid":json}' });
110
+ // Fallback to getProcessInfo for current PID
111
+ mockedExec.mockResolvedValueOnce({ stdout: '' });
104
112
  const result = await getIdeProcessInfo();
105
- expect(result).toEqual({ pid: 1000, command: 'fallback.exe' });
113
+ expect(result).toEqual({ pid: 1000, command: '' });
106
114
  });
107
- it('should handle PowerShell errors without crashing the process chain', async () => {
115
+ it('should handle single process output from ConvertTo-Json', async () => {
108
116
  os.platform.mockReturnValue('win32');
109
- const processInfoMap = new Map([
110
- [1000, { stdout: '' }], // First process doesn't exist (empty due to -ErrorAction)
111
- [
112
- 1001,
113
- {
114
- stdout: '{"Name":"parent.exe","ParentProcessId":800,"CommandLine":"parent.exe"}',
115
- },
116
- ],
117
- [
118
- 800,
119
- {
120
- stdout: '{"Name":"ide.exe","ParentProcessId":0,"CommandLine":"ide.exe"}',
121
- },
122
- ],
123
- ]);
124
- // Mock the process.pid to test traversal with missing processes
125
- Object.defineProperty(process, 'pid', {
126
- value: 1001,
127
- configurable: true,
128
- });
129
- mockedExec.mockImplementation((command) => {
130
- const pidMatch = command.match(/ProcessId=(\d+)/);
131
- if (pidMatch) {
132
- const pid = parseInt(pidMatch[1], 10);
133
- return Promise.resolve(processInfoMap.get(pid) || { stdout: '' });
134
- }
135
- return Promise.reject(new Error('Invalid command for mock'));
136
- });
117
+ const process = {
118
+ ProcessId: 1000,
119
+ ParentProcessId: 0,
120
+ Name: 'node.exe',
121
+ CommandLine: 'node.exe',
122
+ };
123
+ mockedExec.mockResolvedValueOnce({ stdout: JSON.stringify(process) });
137
124
  const result = await getIdeProcessInfo();
138
- // Should return the current process command since traversal continues despite missing processes
139
- expect(result).toEqual({ pid: 1001, command: 'parent.exe' });
140
- // Reset process.pid
141
- Object.defineProperty(process, 'pid', {
142
- value: 1000,
143
- configurable: true,
144
- });
125
+ expect(result).toEqual({ pid: 1000, command: 'node.exe' });
145
126
  });
146
- it('should handle partial JSON data with defaults', async () => {
127
+ it('should handle missing process in map during traversal', async () => {
147
128
  os.platform.mockReturnValue('win32');
148
- mockedExec
149
- .mockResolvedValueOnce({ stdout: '{"Name":"partial.exe"}' }) // Missing ParentProcessId, defaults to 0
150
- .mockResolvedValueOnce({
151
- stdout: '{"Name":"root.exe","ParentProcessId":0,"CommandLine":"root.exe"}',
152
- }); // Get grandparent info
129
+ // process (1000) -> parent (900) -> missing (800)
130
+ const processes = [
131
+ {
132
+ ProcessId: 1000,
133
+ ParentProcessId: 900,
134
+ Name: 'node.exe',
135
+ CommandLine: 'node.exe',
136
+ },
137
+ {
138
+ ProcessId: 900,
139
+ ParentProcessId: 800,
140
+ Name: 'parent.exe',
141
+ CommandLine: 'parent.exe',
142
+ },
143
+ ];
144
+ mockedExec.mockResolvedValueOnce({ stdout: JSON.stringify(processes) });
153
145
  const result = await getIdeProcessInfo();
154
- expect(result).toEqual({ pid: 1000, command: 'root.exe' });
146
+ // Ancestors: [1000, 900]. Length < 3, returns last (900)
147
+ expect(result).toEqual({ pid: 900, command: 'parent.exe' });
155
148
  });
156
149
  });
157
150
  });
@@ -1 +1 @@
1
- {"version":3,"file":"process-utils.test.js","sourceRoot":"","sources":["../../../src/ide/process-utils.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"process-utils.test.js","sourceRoot":"","sources":["../../../src/ide/process-utils.test.ts"],"names":[],"mappings":"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"}
@@ -29,6 +29,7 @@ export * from './utils/schemaValidator.js';
29
29
  export * from './utils/errors.js';
30
30
  export * from './utils/getFolderStructure.js';
31
31
  export * from './utils/memoryDiscovery.js';
32
+ export * from './utils/getPty.js';
32
33
  export * from './utils/gitIgnoreParser.js';
33
34
  export * from './utils/gitUtils.js';
34
35
  export * from './utils/editor.js';
@@ -62,6 +63,7 @@ export * from './services/shellExecutionService.js';
62
63
  export * from './tools/tools.js';
63
64
  export * from './tools/tool-error.js';
64
65
  export * from './tools/tool-registry.js';
66
+ export * from './tools/tool-names.js';
65
67
  export * from './prompts/mcp-prompts.js';
66
68
  export * from './tools/read-file.js';
67
69
  export * from './tools/ls.js';
package/dist/src/index.js CHANGED
@@ -32,6 +32,7 @@ export * from './utils/schemaValidator.js';
32
32
  export * from './utils/errors.js';
33
33
  export * from './utils/getFolderStructure.js';
34
34
  export * from './utils/memoryDiscovery.js';
35
+ export * from './utils/getPty.js';
35
36
  export * from './utils/gitIgnoreParser.js';
36
37
  export * from './utils/gitUtils.js';
37
38
  export * from './utils/editor.js';
@@ -69,6 +70,7 @@ export * from './services/shellExecutionService.js';
69
70
  export * from './tools/tools.js';
70
71
  export * from './tools/tool-error.js';
71
72
  export * from './tools/tool-registry.js';
73
+ export * from './tools/tool-names.js';
72
74
  // Export prompt logic
73
75
  export * from './prompts/mcp-prompts.js';
74
76
  // Export specific tool logic
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
@@ -8,12 +8,13 @@ import * as path from 'node:path';
8
8
  import * as os from 'node:os';
9
9
  import * as crypto from 'node:crypto';
10
10
  import { BaseTokenStorage } from './base-token-storage.js';
11
+ import { CELL_DIR } from '../../utils/paths.js';
11
12
  export class FileTokenStorage extends BaseTokenStorage {
12
13
  tokenFilePath;
13
14
  encryptionKey;
14
15
  constructor(serviceName) {
15
16
  super(serviceName);
16
- const configDir = path.join(os.homedir(), '.cell-cli');
17
+ const configDir = path.join(os.homedir(), CELL_DIR);
17
18
  this.tokenFilePath = path.join(configDir, 'mcp-oauth-tokens-v2.json');
18
19
  this.encryptionKey = this.deriveEncryptionKey();
19
20
  }
@@ -1 +1 @@
1
- {"version":3,"file":"file-token-storage.js","sourceRoot":"","sources":["../../../../src/mcp/token-storage/file-token-storage.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D,MAAM,OAAO,gBAAiB,SAAQ,gBAAgB;IACnC,aAAa,CAAS;IACtB,aAAa,CAAS;IAEvC,YAAY,WAAmB;QAC7B,KAAK,CAAC,WAAW,CAAC,CAAC;QACnB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,CAAC,CAAC;QACvD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,0BAA0B,CAAC,CAAC;QACtE,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAClD,CAAC;IAEO,mBAAmB;QACzB,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,aAAa,CAAC;QACrE,OAAO,MAAM,CAAC,UAAU,CAAC,kBAAkB,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IACzD,CAAC;IAEO,OAAO,CAAC,IAAY;QAC1B,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QAE5E,IAAI,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QACnD,SAAS,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAEjC,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAEpC,OAAO,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,SAAS,CAAC;IAC9E,CAAC;IAEO,OAAO,CAAC,aAAqB;QACnC,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACnD,CAAC;QAED,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QACxC,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAE3B,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CACtC,aAAa,EACb,IAAI,CAAC,aAAa,EAClB,EAAE,CACH,CAAC;QACF,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAE7B,IAAI,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1D,SAAS,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEpC,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,qBAAqB;QACjC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC7C,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACxD,CAAC;IAEO,KAAK,CAAC,UAAU;QACtB,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;YAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACrC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAqC,CAAC;YACzE,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,MAAM,GAAG,GAAG,KAAqD,CAAC;YAClE,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAC/C,CAAC;YACD,IACE,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,+BAA+B,CAAC;gBACtD,GAAG,CAAC,OAAO,EAAE,QAAQ,CACnB,kDAAkD,CACnD,EACD,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;YAC1C,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,UAAU,CACtB,MAAqC;QAErC,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAEnC,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAErC,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,UAAkB;QACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACvC,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAE3C,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,WAA6B;QAChD,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAEtC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACvC,MAAM,kBAAkB,GAAqB;YAC3C,GAAG,WAAW;YACd,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC;QAEF,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;QACvD,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,UAAkB;QACxC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAEvC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,4BAA4B,UAAU,EAAE,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAE1B,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC;gBACH,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACtC,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,MAAM,GAAG,GAAG,KAA8B,CAAC;gBAC3C,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC1B,MAAM,KAAK,CAAC;gBACd,CAAC;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACvC,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,IAAI,GAAG,EAA4B,CAAC;QAEnD,KAAK,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,IAAI,MAAM,EAAE,CAAC;YAC/C,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,CAAC;gBACtC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACtC,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,MAAM,GAAG,GAAG,KAA8B,CAAC;YAC3C,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC1B,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
1
+ {"version":3,"file":"file-token-storage.js","sourceRoot":"","sources":["../../../../src/mcp/token-storage/file-token-storage.ts"],"names":[],"mappings":"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"}
@@ -7,6 +7,7 @@ import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
7
7
  import { promises as fs } from 'node:fs';
8
8
  import * as path from 'node:path';
9
9
  import { FileTokenStorage } from './file-token-storage.js';
10
+ import { CELL_DIR } from '../../utils/paths.js';
10
11
  vi.mock('node:fs', () => ({
11
12
  promises: {
12
13
  readFile: vi.fn(),
@@ -98,7 +99,7 @@ describe('FileTokenStorage', () => {
98
99
  updatedAt: Date.now(),
99
100
  };
100
101
  await storage.setCredentials(credentials);
101
- expect(mockFs.mkdir).toHaveBeenCalledWith(path.join('/home/test', '.cell-cli'), { recursive: true, mode: 0o700 });
102
+ expect(mockFs.mkdir).toHaveBeenCalledWith(path.join('/home/test', CELL_DIR), { recursive: true, mode: 0o700 });
102
103
  expect(mockFs.writeFile).toHaveBeenCalled();
103
104
  const writeCall = mockFs.writeFile.mock.calls[0];
104
105
  expect(writeCall[1]).toMatch(/^[0-9a-f]+:[0-9a-f]+:[0-9a-f]+$/);
@@ -143,7 +144,7 @@ describe('FileTokenStorage', () => {
143
144
  mockFs.readFile.mockResolvedValue(encryptedData);
144
145
  mockFs.unlink.mockResolvedValue(undefined);
145
146
  await storage.deleteCredentials('test-server');
146
- expect(mockFs.unlink).toHaveBeenCalledWith(path.join('/home/test', '.cell-cli', 'mcp-oauth-tokens-v2.json'));
147
+ expect(mockFs.unlink).toHaveBeenCalledWith(path.join('/home/test', CELL_DIR, 'mcp-oauth-tokens-v2.json'));
147
148
  });
148
149
  it('should update file when other credentials remain', async () => {
149
150
  const credentials1 = {
@@ -203,7 +204,7 @@ describe('FileTokenStorage', () => {
203
204
  it('should delete the token file', async () => {
204
205
  mockFs.unlink.mockResolvedValue(undefined);
205
206
  await storage.clearAll();
206
- expect(mockFs.unlink).toHaveBeenCalledWith(path.join('/home/test', '.cell-cli', 'mcp-oauth-tokens-v2.json'));
207
+ expect(mockFs.unlink).toHaveBeenCalledWith(path.join('/home/test', CELL_DIR, 'mcp-oauth-tokens-v2.json'));
207
208
  });
208
209
  it('should not throw when file does not exist', async () => {
209
210
  mockFs.unlink.mockRejectedValue({ code: 'ENOENT' });