@mutates/cli 2.1.1 → 2.1.2

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 (258) hide show
  1. package/bin/mutates.js +5 -4
  2. package/bin/mutates.js.map +1 -1
  3. package/package.json +2 -2
  4. package/src/client/resolve-session.d.ts +17 -0
  5. package/src/client/resolve-session.js +32 -0
  6. package/src/client/resolve-session.js.map +1 -0
  7. package/src/client/rpc-client.js +21 -1
  8. package/src/client/rpc-client.js.map +1 -1
  9. package/src/commands/core/close.js +11 -0
  10. package/src/commands/core/close.js.map +1 -1
  11. package/src/commands/core/diff.js +2 -5
  12. package/src/commands/core/diff.js.map +1 -1
  13. package/src/commands/core/find.js +2 -5
  14. package/src/commands/core/find.js.map +1 -1
  15. package/src/commands/core/list-files.js +2 -5
  16. package/src/commands/core/list-files.js.map +1 -1
  17. package/src/commands/core/reload.js +2 -5
  18. package/src/commands/core/reload.js.map +1 -1
  19. package/src/commands/core/save.js +2 -5
  20. package/src/commands/core/save.js.map +1 -1
  21. package/src/commands/core/sessions.js +11 -2
  22. package/src/commands/core/sessions.js.map +1 -1
  23. package/src/commands/core/snapshot.js +2 -5
  24. package/src/commands/core/snapshot.js.map +1 -1
  25. package/src/commands/generated/accessors/add.js +2 -5
  26. package/src/commands/generated/accessors/add.js.map +1 -1
  27. package/src/commands/generated/accessors/edit.js +2 -5
  28. package/src/commands/generated/accessors/edit.js.map +1 -1
  29. package/src/commands/generated/accessors/get.js +2 -5
  30. package/src/commands/generated/accessors/get.js.map +1 -1
  31. package/src/commands/generated/accessors/remove.js +2 -5
  32. package/src/commands/generated/accessors/remove.js.map +1 -1
  33. package/src/commands/generated/all-decorators/get.js +2 -5
  34. package/src/commands/generated/all-decorators/get.js.map +1 -1
  35. package/src/commands/generated/class-accessors/get.js +2 -5
  36. package/src/commands/generated/class-accessors/get.js.map +1 -1
  37. package/src/commands/generated/class-methods/get.js +2 -5
  38. package/src/commands/generated/class-methods/get.js.map +1 -1
  39. package/src/commands/generated/class-properties/add.js +2 -5
  40. package/src/commands/generated/class-properties/add.js.map +1 -1
  41. package/src/commands/generated/class-properties/edit.js +2 -5
  42. package/src/commands/generated/class-properties/edit.js.map +1 -1
  43. package/src/commands/generated/class-properties/get.js +2 -5
  44. package/src/commands/generated/class-properties/get.js.map +1 -1
  45. package/src/commands/generated/class-properties/remove.js +2 -5
  46. package/src/commands/generated/class-properties/remove.js.map +1 -1
  47. package/src/commands/generated/classes/add.js +2 -5
  48. package/src/commands/generated/classes/add.js.map +1 -1
  49. package/src/commands/generated/classes/edit.js +2 -5
  50. package/src/commands/generated/classes/edit.js.map +1 -1
  51. package/src/commands/generated/classes/get.js +2 -5
  52. package/src/commands/generated/classes/get.js.map +1 -1
  53. package/src/commands/generated/classes/remove.js +2 -5
  54. package/src/commands/generated/classes/remove.js.map +1 -1
  55. package/src/commands/generated/constructors/add.js +2 -5
  56. package/src/commands/generated/constructors/add.js.map +1 -1
  57. package/src/commands/generated/constructors/edit.js +2 -5
  58. package/src/commands/generated/constructors/edit.js.map +1 -1
  59. package/src/commands/generated/constructors/get.js +2 -5
  60. package/src/commands/generated/constructors/get.js.map +1 -1
  61. package/src/commands/generated/constructors/remove.js +2 -5
  62. package/src/commands/generated/constructors/remove.js.map +1 -1
  63. package/src/commands/generated/decorators/add.js +2 -5
  64. package/src/commands/generated/decorators/add.js.map +1 -1
  65. package/src/commands/generated/decorators/edit.js +2 -5
  66. package/src/commands/generated/decorators/edit.js.map +1 -1
  67. package/src/commands/generated/decorators/get.js +2 -5
  68. package/src/commands/generated/decorators/get.js.map +1 -1
  69. package/src/commands/generated/decorators/remove.js +2 -5
  70. package/src/commands/generated/decorators/remove.js.map +1 -1
  71. package/src/commands/generated/enums/add.js +2 -5
  72. package/src/commands/generated/enums/add.js.map +1 -1
  73. package/src/commands/generated/enums/edit.js +2 -5
  74. package/src/commands/generated/enums/edit.js.map +1 -1
  75. package/src/commands/generated/enums/get.js +2 -5
  76. package/src/commands/generated/enums/get.js.map +1 -1
  77. package/src/commands/generated/enums/remove.js +2 -5
  78. package/src/commands/generated/enums/remove.js.map +1 -1
  79. package/src/commands/generated/exports/add.js +2 -5
  80. package/src/commands/generated/exports/add.js.map +1 -1
  81. package/src/commands/generated/exports/edit.js +2 -5
  82. package/src/commands/generated/exports/edit.js.map +1 -1
  83. package/src/commands/generated/exports/get.js +2 -5
  84. package/src/commands/generated/exports/get.js.map +1 -1
  85. package/src/commands/generated/exports/remove.js +2 -5
  86. package/src/commands/generated/exports/remove.js.map +1 -1
  87. package/src/commands/generated/functions/add.js +2 -5
  88. package/src/commands/generated/functions/add.js.map +1 -1
  89. package/src/commands/generated/functions/edit.js +2 -5
  90. package/src/commands/generated/functions/edit.js.map +1 -1
  91. package/src/commands/generated/functions/get.js +2 -5
  92. package/src/commands/generated/functions/get.js.map +1 -1
  93. package/src/commands/generated/functions/remove.js +2 -5
  94. package/src/commands/generated/functions/remove.js.map +1 -1
  95. package/src/commands/generated/import-refs/get.js +2 -5
  96. package/src/commands/generated/import-refs/get.js.map +1 -1
  97. package/src/commands/generated/imports/add.js +2 -5
  98. package/src/commands/generated/imports/add.js.map +1 -1
  99. package/src/commands/generated/imports/edit.js +2 -5
  100. package/src/commands/generated/imports/edit.js.map +1 -1
  101. package/src/commands/generated/imports/get.js +2 -5
  102. package/src/commands/generated/imports/get.js.map +1 -1
  103. package/src/commands/generated/imports/remove.js +2 -5
  104. package/src/commands/generated/imports/remove.js.map +1 -1
  105. package/src/commands/generated/interfaces/add.js +2 -5
  106. package/src/commands/generated/interfaces/add.js.map +1 -1
  107. package/src/commands/generated/interfaces/edit.js +2 -5
  108. package/src/commands/generated/interfaces/edit.js.map +1 -1
  109. package/src/commands/generated/interfaces/get.js +2 -5
  110. package/src/commands/generated/interfaces/get.js.map +1 -1
  111. package/src/commands/generated/interfaces/remove.js +2 -5
  112. package/src/commands/generated/interfaces/remove.js.map +1 -1
  113. package/src/commands/generated/methods/add.js +2 -5
  114. package/src/commands/generated/methods/add.js.map +1 -1
  115. package/src/commands/generated/methods/edit.js +2 -5
  116. package/src/commands/generated/methods/edit.js.map +1 -1
  117. package/src/commands/generated/methods/get.js +2 -5
  118. package/src/commands/generated/methods/get.js.map +1 -1
  119. package/src/commands/generated/methods/remove.js +2 -5
  120. package/src/commands/generated/methods/remove.js.map +1 -1
  121. package/src/commands/generated/named-imports/get.js +2 -5
  122. package/src/commands/generated/named-imports/get.js.map +1 -1
  123. package/src/commands/generated/object-accessors/get.js +2 -5
  124. package/src/commands/generated/object-accessors/get.js.map +1 -1
  125. package/src/commands/generated/object-methods/get.js +2 -5
  126. package/src/commands/generated/object-methods/get.js.map +1 -1
  127. package/src/commands/generated/object-properties/edit.js +2 -5
  128. package/src/commands/generated/object-properties/edit.js.map +1 -1
  129. package/src/commands/generated/object-properties/get.js +2 -5
  130. package/src/commands/generated/object-properties/get.js.map +1 -1
  131. package/src/commands/generated/object-properties/remove.js +2 -5
  132. package/src/commands/generated/object-properties/remove.js.map +1 -1
  133. package/src/commands/generated/object-property/add.js +2 -5
  134. package/src/commands/generated/object-property/add.js.map +1 -1
  135. package/src/commands/generated/params/add.js +2 -5
  136. package/src/commands/generated/params/add.js.map +1 -1
  137. package/src/commands/generated/params/edit.js +2 -5
  138. package/src/commands/generated/params/edit.js.map +1 -1
  139. package/src/commands/generated/params/get.js +2 -5
  140. package/src/commands/generated/params/get.js.map +1 -1
  141. package/src/commands/generated/params/remove.js +2 -5
  142. package/src/commands/generated/params/remove.js.map +1 -1
  143. package/src/commands/generated/source-file/get.js +2 -5
  144. package/src/commands/generated/source-file/get.js.map +1 -1
  145. package/src/commands/generated/source-files/add.js +2 -5
  146. package/src/commands/generated/source-files/add.js.map +1 -1
  147. package/src/commands/generated/source-files/get.js +2 -5
  148. package/src/commands/generated/source-files/get.js.map +1 -1
  149. package/src/commands/generated/variables/add.js +2 -5
  150. package/src/commands/generated/variables/add.js.map +1 -1
  151. package/src/commands/generated/variables/edit.js +2 -5
  152. package/src/commands/generated/variables/edit.js.map +1 -1
  153. package/src/commands/generated/variables/get.js +2 -5
  154. package/src/commands/generated/variables/get.js.map +1 -1
  155. package/src/commands/generated/variables/remove.js +2 -5
  156. package/src/commands/generated/variables/remove.js.map +1 -1
  157. package/src/daemon/dispatcher.d.ts +7 -0
  158. package/src/daemon/dispatcher.js +10 -0
  159. package/src/daemon/dispatcher.js.map +1 -1
  160. package/src/daemon/entry.d.ts +7 -0
  161. package/src/daemon/entry.js +51 -9
  162. package/src/daemon/entry.js.map +1 -1
  163. package/src/daemon/handlers/generated/_runtime.js +36 -15
  164. package/src/daemon/handlers/generated/_runtime.js.map +1 -1
  165. package/src/daemon/handlers/generated/accessors/add.js +3 -0
  166. package/src/daemon/handlers/generated/accessors/add.js.map +1 -1
  167. package/src/daemon/handlers/generated/accessors/edit.js +3 -0
  168. package/src/daemon/handlers/generated/accessors/edit.js.map +1 -1
  169. package/src/daemon/handlers/generated/accessors/get.js +3 -0
  170. package/src/daemon/handlers/generated/accessors/get.js.map +1 -1
  171. package/src/daemon/handlers/generated/accessors/remove.js +3 -0
  172. package/src/daemon/handlers/generated/accessors/remove.js.map +1 -1
  173. package/src/daemon/handlers/generated/class-accessors/get.js +3 -0
  174. package/src/daemon/handlers/generated/class-accessors/get.js.map +1 -1
  175. package/src/daemon/handlers/generated/class-methods/get.js +3 -0
  176. package/src/daemon/handlers/generated/class-methods/get.js.map +1 -1
  177. package/src/daemon/handlers/generated/class-properties/add.js +3 -0
  178. package/src/daemon/handlers/generated/class-properties/add.js.map +1 -1
  179. package/src/daemon/handlers/generated/class-properties/edit.js +3 -0
  180. package/src/daemon/handlers/generated/class-properties/edit.js.map +1 -1
  181. package/src/daemon/handlers/generated/class-properties/remove.js +3 -0
  182. package/src/daemon/handlers/generated/class-properties/remove.js.map +1 -1
  183. package/src/daemon/handlers/generated/classes/edit.js +3 -0
  184. package/src/daemon/handlers/generated/classes/edit.js.map +1 -1
  185. package/src/daemon/handlers/generated/classes/remove.js +3 -0
  186. package/src/daemon/handlers/generated/classes/remove.js.map +1 -1
  187. package/src/daemon/handlers/generated/constructors/add.js +3 -0
  188. package/src/daemon/handlers/generated/constructors/add.js.map +1 -1
  189. package/src/daemon/handlers/generated/constructors/edit.js +3 -0
  190. package/src/daemon/handlers/generated/constructors/edit.js.map +1 -1
  191. package/src/daemon/handlers/generated/constructors/get.js +3 -0
  192. package/src/daemon/handlers/generated/constructors/get.js.map +1 -1
  193. package/src/daemon/handlers/generated/constructors/remove.js +3 -0
  194. package/src/daemon/handlers/generated/constructors/remove.js.map +1 -1
  195. package/src/daemon/handlers/generated/decorators/add.js +3 -0
  196. package/src/daemon/handlers/generated/decorators/add.js.map +1 -1
  197. package/src/daemon/handlers/generated/decorators/edit.js +3 -0
  198. package/src/daemon/handlers/generated/decorators/edit.js.map +1 -1
  199. package/src/daemon/handlers/generated/decorators/get.js +3 -0
  200. package/src/daemon/handlers/generated/decorators/get.js.map +1 -1
  201. package/src/daemon/handlers/generated/decorators/remove.js +3 -0
  202. package/src/daemon/handlers/generated/decorators/remove.js.map +1 -1
  203. package/src/daemon/handlers/generated/enums/edit.js +3 -0
  204. package/src/daemon/handlers/generated/enums/edit.js.map +1 -1
  205. package/src/daemon/handlers/generated/enums/remove.js +3 -0
  206. package/src/daemon/handlers/generated/enums/remove.js.map +1 -1
  207. package/src/daemon/handlers/generated/exports/edit.js +3 -0
  208. package/src/daemon/handlers/generated/exports/edit.js.map +1 -1
  209. package/src/daemon/handlers/generated/exports/remove.js +3 -0
  210. package/src/daemon/handlers/generated/exports/remove.js.map +1 -1
  211. package/src/daemon/handlers/generated/functions/edit.js +3 -0
  212. package/src/daemon/handlers/generated/functions/edit.js.map +1 -1
  213. package/src/daemon/handlers/generated/functions/remove.js +3 -0
  214. package/src/daemon/handlers/generated/functions/remove.js.map +1 -1
  215. package/src/daemon/handlers/generated/import-refs/get.js +3 -0
  216. package/src/daemon/handlers/generated/import-refs/get.js.map +1 -1
  217. package/src/daemon/handlers/generated/imports/edit.js +3 -0
  218. package/src/daemon/handlers/generated/imports/edit.js.map +1 -1
  219. package/src/daemon/handlers/generated/imports/remove.js +3 -0
  220. package/src/daemon/handlers/generated/imports/remove.js.map +1 -1
  221. package/src/daemon/handlers/generated/interfaces/edit.js +3 -0
  222. package/src/daemon/handlers/generated/interfaces/edit.js.map +1 -1
  223. package/src/daemon/handlers/generated/interfaces/remove.js +3 -0
  224. package/src/daemon/handlers/generated/interfaces/remove.js.map +1 -1
  225. package/src/daemon/handlers/generated/methods/add.js +3 -0
  226. package/src/daemon/handlers/generated/methods/add.js.map +1 -1
  227. package/src/daemon/handlers/generated/methods/edit.js +3 -0
  228. package/src/daemon/handlers/generated/methods/edit.js.map +1 -1
  229. package/src/daemon/handlers/generated/methods/get.js +3 -0
  230. package/src/daemon/handlers/generated/methods/get.js.map +1 -1
  231. package/src/daemon/handlers/generated/methods/remove.js +3 -0
  232. package/src/daemon/handlers/generated/methods/remove.js.map +1 -1
  233. package/src/daemon/handlers/generated/named-imports/get.js +3 -0
  234. package/src/daemon/handlers/generated/named-imports/get.js.map +1 -1
  235. package/src/daemon/handlers/generated/object-accessors/get.js +3 -0
  236. package/src/daemon/handlers/generated/object-accessors/get.js.map +1 -1
  237. package/src/daemon/handlers/generated/object-methods/get.js +3 -0
  238. package/src/daemon/handlers/generated/object-methods/get.js.map +1 -1
  239. package/src/daemon/handlers/generated/object-properties/edit.js +3 -0
  240. package/src/daemon/handlers/generated/object-properties/edit.js.map +1 -1
  241. package/src/daemon/handlers/generated/object-properties/remove.js +3 -0
  242. package/src/daemon/handlers/generated/object-properties/remove.js.map +1 -1
  243. package/src/daemon/handlers/generated/object-property/add.js +3 -0
  244. package/src/daemon/handlers/generated/object-property/add.js.map +1 -1
  245. package/src/daemon/handlers/generated/params/add.js +3 -0
  246. package/src/daemon/handlers/generated/params/add.js.map +1 -1
  247. package/src/daemon/handlers/generated/params/edit.js +3 -0
  248. package/src/daemon/handlers/generated/params/edit.js.map +1 -1
  249. package/src/daemon/handlers/generated/params/get.js +3 -0
  250. package/src/daemon/handlers/generated/params/get.js.map +1 -1
  251. package/src/daemon/handlers/generated/params/remove.js +3 -0
  252. package/src/daemon/handlers/generated/params/remove.js.map +1 -1
  253. package/src/daemon/handlers/generated/variables/edit.js +3 -0
  254. package/src/daemon/handlers/generated/variables/edit.js.map +1 -1
  255. package/src/daemon/handlers/generated/variables/remove.js +3 -0
  256. package/src/daemon/handlers/generated/variables/remove.js.map +1 -1
  257. package/src/generated/op-schemas.js +7526 -0
  258. package/src/generated/op-schemas.js.map +1 -1
package/bin/mutates.js CHANGED
@@ -27,10 +27,11 @@ exports.main = (0, citty_1.defineCommand)({
27
27
  skills: () => Promise.resolve().then(() => tslib_1.__importStar(require('../src/commands/core/skills'))).then((m) => m.default),
28
28
  ...generated_1.GENERATED_COMMANDS,
29
29
  },
30
- run() {
31
- // eslint-disable-next-line no-console
32
- console.log('Run `mutates --help` to see available commands.');
33
- },
30
+ // Citty (v0.1.x) runs a parent `run()` even after a subcommand handled
31
+ // the call, so anything printed here leaks into stdout on every
32
+ // invocation. We rely on `--help` interception in `runMain` and on
33
+ // citty throwing `E_NO_COMMAND` (which prints usage) when called with
34
+ // no args, so no parent run is needed.
34
35
  });
35
36
  if (require.main === module) {
36
37
  (0, citty_1.runMain)(exports.main);
@@ -1 +1 @@
1
- {"version":3,"file":"mutates.js","sourceRoot":"","sources":["../../../../packages/cli/bin/mutates.ts"],"names":[],"mappings":";;;;;AACA,iCAA+C;AAE/C,2EAAkC;AAClC,6EAA6C;AAC7C,yDAA+D;AAElD,QAAA,IAAI,GAAG,IAAA,qBAAa,EAAC;IAChC,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,sBAAG,CAAC,OAAO;QACpB,WAAW,EAAE,gCAAgC;KAC9C;IACD,WAAW,EAAE;QACX,IAAI,EAAJ,cAAI;QACJ,KAAK,EAAE,GAAG,EAAE,CAAC,0DAAO,4BAA4B,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACxE,QAAQ,EAAE,GAAG,EAAE,CAAC,0DAAO,+BAA+B,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC9E,QAAQ,EAAE,GAAG,EAAE,CAAC,0DAAO,+BAA+B,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC9E,IAAI,EAAE,GAAG,EAAE,CAAC,0DAAO,2BAA2B,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACtE,IAAI,EAAE,GAAG,EAAE,CAAC,0DAAO,2BAA2B,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACtE,IAAI,EAAE,GAAG,EAAE,CAAC,0DAAO,2BAA2B,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACtE,MAAM,EAAE,GAAG,EAAE,CAAC,0DAAO,6BAA6B,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC1E,YAAY,EAAE,GAAG,EAAE,CAAC,0DAAO,iCAAiC,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACpF,MAAM,EAAE,GAAG,EAAE,CAAC,0DAAO,6BAA6B,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC1E,MAAM,EAAE,GAAG,EAAE,CAAC,0DAAO,6BAA6B,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC1E,GAAG,8BAAkB;KACtB;IACD,GAAG;QACD,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC;IACjE,CAAC;CACF,CAAC,CAAC;AAEH,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;IAC5B,IAAA,eAAO,EAAC,YAAI,CAAC,CAAC;AAChB,CAAC"}
1
+ {"version":3,"file":"mutates.js","sourceRoot":"","sources":["../../../../packages/cli/bin/mutates.ts"],"names":[],"mappings":";;;;;AACA,iCAA+C;AAE/C,2EAAkC;AAClC,6EAA6C;AAC7C,yDAA+D;AAElD,QAAA,IAAI,GAAG,IAAA,qBAAa,EAAC;IAChC,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,sBAAG,CAAC,OAAO;QACpB,WAAW,EAAE,gCAAgC;KAC9C;IACD,WAAW,EAAE;QACX,IAAI,EAAJ,cAAI;QACJ,KAAK,EAAE,GAAG,EAAE,CAAC,0DAAO,4BAA4B,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACxE,QAAQ,EAAE,GAAG,EAAE,CAAC,0DAAO,+BAA+B,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC9E,QAAQ,EAAE,GAAG,EAAE,CAAC,0DAAO,+BAA+B,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC9E,IAAI,EAAE,GAAG,EAAE,CAAC,0DAAO,2BAA2B,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACtE,IAAI,EAAE,GAAG,EAAE,CAAC,0DAAO,2BAA2B,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACtE,IAAI,EAAE,GAAG,EAAE,CAAC,0DAAO,2BAA2B,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACtE,MAAM,EAAE,GAAG,EAAE,CAAC,0DAAO,6BAA6B,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC1E,YAAY,EAAE,GAAG,EAAE,CAAC,0DAAO,iCAAiC,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACpF,MAAM,EAAE,GAAG,EAAE,CAAC,0DAAO,6BAA6B,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC1E,MAAM,EAAE,GAAG,EAAE,CAAC,0DAAO,6BAA6B,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC1E,GAAG,8BAAkB;KACtB;IACD,uEAAuE;IACvE,gEAAgE;IAChE,mEAAmE;IACnE,sEAAsE;IACtE,uCAAuC;CACxC,CAAC,CAAC;AAEH,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;IAC5B,IAAA,eAAO,EAAC,YAAI,CAAC,CAAC;AAChB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mutates/cli",
3
- "version": "2.1.1",
3
+ "version": "2.1.2",
4
4
  "keywords": [
5
5
  "ast",
6
6
  "cli",
@@ -30,7 +30,7 @@
30
30
  "mutates": "./bin/mutates.js"
31
31
  },
32
32
  "dependencies": {
33
- "@mutates/core": "2.1.1",
33
+ "@mutates/core": "2.1.2",
34
34
  "ajv": "^8.17.1",
35
35
  "citty": "^0.1.6",
36
36
  "diff": "^4.0.2",
@@ -0,0 +1,17 @@
1
+ /**
2
+ * Resolve the session id to use for a CLI command.
3
+ *
4
+ * The contract for agents (`mutates skills get core`) promises that the
5
+ * `snapshot → mutate → save` loop works across separate CLI
6
+ * invocations. To honour that, when `--session` isn't pinned we look up
7
+ * any session that the daemon already has open for this root and reuse
8
+ * it. Only if zero sessions exist do we open a fresh one — and then
9
+ * future invocations will pick that one up via the same lookup.
10
+ *
11
+ * Without this logic each `mutates …` command would open its own
12
+ * session, and mutations applied by one invocation would never be
13
+ * visible to the next.
14
+ */
15
+ export declare function resolveSessionId(conn: {
16
+ call: <R>(method: string, params?: unknown) => Promise<R>;
17
+ }, root: string, explicit: string | undefined): Promise<string>;
@@ -0,0 +1,32 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.resolveSessionId = resolveSessionId;
4
+ /**
5
+ * Resolve the session id to use for a CLI command.
6
+ *
7
+ * The contract for agents (`mutates skills get core`) promises that the
8
+ * `snapshot → mutate → save` loop works across separate CLI
9
+ * invocations. To honour that, when `--session` isn't pinned we look up
10
+ * any session that the daemon already has open for this root and reuse
11
+ * it. Only if zero sessions exist do we open a fresh one — and then
12
+ * future invocations will pick that one up via the same lookup.
13
+ *
14
+ * Without this logic each `mutates …` command would open its own
15
+ * session, and mutations applied by one invocation would never be
16
+ * visible to the next.
17
+ */
18
+ async function resolveSessionId(conn, root, explicit) {
19
+ if (explicit)
20
+ return explicit;
21
+ const sessions = await conn.call('session.list', {});
22
+ // The daemon is per-root (Req 10.1) so every session it carries
23
+ // already belongs to `root`; nonetheless filter defensively in case a
24
+ // future change relaxes that and to keep this helper independent of
25
+ // the daemon's invariant.
26
+ const match = sessions.find((s) => s.root === root) ?? sessions[0];
27
+ if (match)
28
+ return match.id;
29
+ const opened = await conn.call('session.open', { root });
30
+ return opened.sessionId;
31
+ }
32
+ //# sourceMappingURL=resolve-session.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"resolve-session.js","sourceRoot":"","sources":["../../../../../packages/cli/src/client/resolve-session.ts"],"names":[],"mappings":";;AAcA,4CAeC;AA7BD;;;;;;;;;;;;;GAaG;AACI,KAAK,UAAU,gBAAgB,CACpC,IAAmE,EACnE,IAAY,EACZ,QAA4B;IAE5B,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAsC,cAAc,EAAE,EAAE,CAAC,CAAC;IAC1F,gEAAgE;IAChE,sEAAsE;IACtE,oEAAoE;IACpE,0BAA0B;IAC1B,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC;IACnE,IAAI,KAAK;QAAE,OAAO,KAAK,CAAC,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAwB,cAAc,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAChF,OAAO,MAAM,CAAC,SAAS,CAAC;AAC1B,CAAC"}
@@ -54,9 +54,29 @@ async function connectClient(opts) {
54
54
  const absRoot = (0, node_path_1.resolve)(opts.root);
55
55
  let lock = (0, lockfile_1.read)(absRoot);
56
56
  if (!lock) {
57
- // Clear any stale entry left by a crashed daemon.
57
+ // If the caller is pinning to a specific session id and no daemon
58
+ // is alive for this root, the session cannot possibly exist — fail
59
+ // fast instead of spawning a fresh daemon just to validate a id
60
+ // that we already know is dead.
61
+ if (opts.sessionId) {
62
+ throw new jsonrpc_1.RpcError(error_codes_1.ErrorCode.SessionNotFound, `session not found: ${opts.sessionId}`, {
63
+ sessionId: opts.sessionId,
64
+ });
65
+ }
66
+ // Clear any stale entry left by a crashed daemon. We unlink both the
67
+ // lockfile JSON and the Unix socket file — otherwise the fresh
68
+ // daemon fails to bind with EADDRINUSE on the old socket path.
58
69
  (0, lockfile_1.unlink)(absRoot);
59
70
  const sock = deriveSocketPath(absRoot);
71
+ if (process.platform !== 'win32') {
72
+ try {
73
+ (0, node_fs_1.unlinkSync)(sock);
74
+ }
75
+ catch (err) {
76
+ if (err.code !== 'ENOENT')
77
+ throw err;
78
+ }
79
+ }
60
80
  spawnDaemon(absRoot, sock, opts);
61
81
  lock = await waitForLockfile(absRoot);
62
82
  }
@@ -1 +1 @@
1
- {"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../../../../packages/cli/src/client/rpc-client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../../../../packages/cli/src/client/rpc-client.ts"],"names":[],"mappings":"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"}
@@ -54,6 +54,17 @@ exports.default = (0, citty_1.defineCommand)({
54
54
  await conn.call('session.close', { sessionId: s.id });
55
55
  closed.push(s.id);
56
56
  }
57
+ // `--all` is the user saying "I'm done with this daemon" — shut it
58
+ // down so the lockfile and socket clean up immediately, instead
59
+ // of leaving the daemon hanging until its idle timer fires.
60
+ try {
61
+ await conn.call('daemon.shutdown', {});
62
+ }
63
+ catch {
64
+ // Older daemons (or a daemon that races us closing first) may
65
+ // not handle daemon.shutdown. Either way the close above has
66
+ // already removed every session — non-fatal.
67
+ }
57
68
  }
58
69
  else if (args.session) {
59
70
  await conn.call('session.close', { sessionId: args.session });
@@ -1 +1 @@
1
- {"version":3,"file":"close.js","sourceRoot":"","sources":["../../../../../../packages/cli/src/commands/core/close.ts"],"names":[],"mappings":";;AAAA,yCAAoC;AACpC,iCAAsC;AAEtC,gDAA6E;AAC7E,wDAAwD;AACxD,iDAA+C;AAE/C;;;;;;GAMG;AACH,kBAAe,IAAA,qBAAa,EAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,8CAA8C;KAC5D;IACD,IAAI,EAAE;QACJ,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,qBAAqB;SACnC;QACD,GAAG,EAAE;YACH,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,wCAAwC;YACrD,OAAO,EAAE,KAAK;SACf;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,gCAAgC;SAC9C;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,sBAAsB;YACnC,OAAO,EAAE,KAAK;SACf;KACF;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YAC/B,IAAA,oBAAW,EAAC,IAAI,kBAAQ,CAAC,CAAC,KAAK,EAAE,6CAA6C,CAAC,CAAC,CAAC;YACjF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3C,IAAI,CAAC;gBACH,MAAM,MAAM,GAAa,EAAE,CAAC;gBAC5B,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;oBACb,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAwB,cAAc,EAAE,EAAE,CAAC,CAAC;oBAC5E,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;wBACzB,MAAM,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;wBACtD,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACpB,CAAC;gBACH,CAAC;qBAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;oBACxB,MAAM,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;oBAC9D,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC5B,CAAC;gBACD,IAAA,qBAAY,EAAC,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACxD,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,QAAQ,GAAG,GAAG,YAAY,kBAAQ,CAAC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;CACF,CAAC,CAAC"}
1
+ {"version":3,"file":"close.js","sourceRoot":"","sources":["../../../../../../packages/cli/src/commands/core/close.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const node_path_1 = require("node:path");
4
4
  const citty_1 = require("citty");
5
5
  const output_1 = require("../../client/output");
6
+ const resolve_session_1 = require("../../client/resolve-session");
6
7
  const rpc_client_1 = require("../../client/rpc-client");
7
8
  const jsonrpc_1 = require("../../proto/jsonrpc");
8
9
  /**
@@ -39,7 +40,7 @@ exports.default = (0, citty_1.defineCommand)({
39
40
  try {
40
41
  const conn = await (0, rpc_client_1.connectClient)({ root, sessionId: args.session });
41
42
  try {
42
- const sessionId = args.session ?? (await openSession(conn, root));
43
+ const sessionId = await (0, resolve_session_1.resolveSessionId)(conn, root, args.session);
43
44
  const params = { sessionId };
44
45
  if (args.file)
45
46
  params.file = (0, node_path_1.resolve)(args.file);
@@ -64,8 +65,4 @@ exports.default = (0, citty_1.defineCommand)({
64
65
  }
65
66
  },
66
67
  });
67
- async function openSession(conn, root) {
68
- const opened = await conn.call('session.open', { root });
69
- return opened.sessionId;
70
- }
71
68
  //# sourceMappingURL=diff.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../../../../packages/cli/src/commands/core/diff.ts"],"names":[],"mappings":";;AAAA,yCAAoC;AACpC,iCAAsC;AAEtC,gDAA6E;AAC7E,wDAAwD;AACxD,iDAA+C;AAE/C;;;;GAIG;AACH,kBAAe,IAAA,qBAAa,EAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,0DAA0D;KACxE;IACD,IAAI,EAAE;QACJ,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,wBAAwB;SACtC;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,gCAAgC;SAC9C;QACD,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,YAAY;SAC1B;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,eAAe;YAC5B,OAAO,EAAE,KAAK;SACf;KACF;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;gBAClE,MAAM,MAAM,GAAyC,EAAE,SAAS,EAAE,CAAC;gBACnE,IAAI,IAAI,CAAC,IAAI;oBAAE,MAAM,CAAC,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAChD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAA2C,MAAM,EAAE,MAAM,CAAC,CAAC;gBACzF,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBACd,IAAA,qBAAY,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAC/B,CAAC;qBAAM,CAAC;oBACN,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;wBAC3B,IAAI,KAAK,CAAC,OAAO;4BAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBACzD,CAAC;gBACH,CAAC;YACH,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,QAAQ,GAAG,GAAG,YAAY,kBAAQ,CAAC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;CACF,CAAC,CAAC;AAEH,KAAK,UAAU,WAAW,CACxB,IAAmE,EACnE,IAAY;IAEZ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAwB,cAAc,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAChF,OAAO,MAAM,CAAC,SAAS,CAAC;AAC1B,CAAC"}
1
+ {"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../../../../packages/cli/src/commands/core/diff.ts"],"names":[],"mappings":";;AAAA,yCAAoC;AACpC,iCAAsC;AAEtC,gDAA6E;AAC7E,kEAAgE;AAChE,wDAAwD;AACxD,iDAA+C;AAE/C;;;;GAIG;AACH,kBAAe,IAAA,qBAAa,EAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,0DAA0D;KACxE;IACD,IAAI,EAAE;QACJ,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,wBAAwB;SACtC;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,gCAAgC;SAC9C;QACD,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,YAAY;SAC1B;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,eAAe;YAC5B,OAAO,EAAE,KAAK;SACf;KACF;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,MAAM,IAAA,kCAAgB,EAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnE,MAAM,MAAM,GAAyC,EAAE,SAAS,EAAE,CAAC;gBACnE,IAAI,IAAI,CAAC,IAAI;oBAAE,MAAM,CAAC,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAChD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAA2C,MAAM,EAAE,MAAM,CAAC,CAAC;gBACzF,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBACd,IAAA,qBAAY,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAC/B,CAAC;qBAAM,CAAC;oBACN,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;wBAC3B,IAAI,KAAK,CAAC,OAAO;4BAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBACzD,CAAC;gBACH,CAAC;YACH,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,QAAQ,GAAG,GAAG,YAAY,kBAAQ,CAAC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;CACF,CAAC,CAAC"}
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const node_path_1 = require("node:path");
4
4
  const citty_1 = require("citty");
5
5
  const output_1 = require("../../client/output");
6
+ const resolve_session_1 = require("../../client/resolve-session");
6
7
  const rpc_client_1 = require("../../client/rpc-client");
7
8
  const jsonrpc_1 = require("../../proto/jsonrpc");
8
9
  /**
@@ -55,7 +56,7 @@ exports.default = (0, citty_1.defineCommand)({
55
56
  try {
56
57
  const conn = await (0, rpc_client_1.connectClient)({ root, sessionId: args.session });
57
58
  try {
58
- const sessionId = args.session ?? (await openSession(conn, root));
59
+ const sessionId = await (0, resolve_session_1.resolveSessionId)(conn, root, args.session);
59
60
  const result = await conn.call('find', {
60
61
  sessionId,
61
62
  kind: args.kind,
@@ -73,8 +74,4 @@ exports.default = (0, citty_1.defineCommand)({
73
74
  }
74
75
  },
75
76
  });
76
- async function openSession(conn, root) {
77
- const opened = await conn.call('session.open', { root });
78
- return opened.sessionId;
79
- }
80
77
  //# sourceMappingURL=find.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"find.js","sourceRoot":"","sources":["../../../../../../packages/cli/src/commands/core/find.ts"],"names":[],"mappings":";;AAAA,yCAAoC;AACpC,iCAAsC;AAEtC,gDAA6E;AAC7E,wDAAwD;AACxD,iDAA+C;AAE/C;;;;GAIG;AACH,kBAAe,IAAA,qBAAa,EAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,4CAA4C;KAC1D;IACD,IAAI,EAAE;QACJ,IAAI,EAAE;YACJ,IAAI,EAAE,YAAY;YAClB,WAAW,EAAE,8EAA8E;YAC3F,QAAQ,EAAE,IAAI;SACf;QACD,KAAK,EAAE;YACL,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,yDAAyD;SACvE;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,gCAAgC;SAC9C;QACD,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,YAAY;SAC1B;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,eAAe;YAC5B,OAAO,EAAE,KAAK;SACf;KACF;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACjD,IAAI,WAAW,GAA4B,EAAE,CAAC;QAC9C,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAA4B,CAAC;YAClE,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAA,oBAAW,EAAC,IAAI,kBAAQ,CAAC,CAAC,KAAK,EAAE,+BAAgC,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;gBAC3F,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;gBACrB,OAAO;YACT,CAAC;QACH,CAAC;QACD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;gBAClE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;oBACrC,SAAS;oBACT,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,KAAK,EAAE,WAAW;iBACnB,CAAC,CAAC;gBACH,IAAA,qBAAY,EAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACpD,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,QAAQ,GAAG,GAAG,YAAY,kBAAQ,CAAC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;CACF,CAAC,CAAC;AAEH,KAAK,UAAU,WAAW,CACxB,IAAmE,EACnE,IAAY;IAEZ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAwB,cAAc,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAChF,OAAO,MAAM,CAAC,SAAS,CAAC;AAC1B,CAAC"}
1
+ {"version":3,"file":"find.js","sourceRoot":"","sources":["../../../../../../packages/cli/src/commands/core/find.ts"],"names":[],"mappings":";;AAAA,yCAAoC;AACpC,iCAAsC;AAEtC,gDAA6E;AAC7E,kEAAgE;AAChE,wDAAwD;AACxD,iDAA+C;AAE/C;;;;GAIG;AACH,kBAAe,IAAA,qBAAa,EAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,4CAA4C;KAC1D;IACD,IAAI,EAAE;QACJ,IAAI,EAAE;YACJ,IAAI,EAAE,YAAY;YAClB,WAAW,EAAE,8EAA8E;YAC3F,QAAQ,EAAE,IAAI;SACf;QACD,KAAK,EAAE;YACL,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,yDAAyD;SACvE;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,gCAAgC;SAC9C;QACD,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,YAAY;SAC1B;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,eAAe;YAC5B,OAAO,EAAE,KAAK;SACf;KACF;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACjD,IAAI,WAAW,GAA4B,EAAE,CAAC;QAC9C,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAA4B,CAAC;YAClE,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAA,oBAAW,EAAC,IAAI,kBAAQ,CAAC,CAAC,KAAK,EAAE,+BAAgC,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;gBAC3F,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;gBACrB,OAAO;YACT,CAAC;QACH,CAAC;QACD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,MAAM,IAAA,kCAAgB,EAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;oBACrC,SAAS;oBACT,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,KAAK,EAAE,WAAW;iBACnB,CAAC,CAAC;gBACH,IAAA,qBAAY,EAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACpD,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,QAAQ,GAAG,GAAG,YAAY,kBAAQ,CAAC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;CACF,CAAC,CAAC"}
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const node_path_1 = require("node:path");
4
4
  const citty_1 = require("citty");
5
5
  const output_1 = require("../../client/output");
6
+ const resolve_session_1 = require("../../client/resolve-session");
6
7
  const rpc_client_1 = require("../../client/rpc-client");
7
8
  const jsonrpc_1 = require("../../proto/jsonrpc");
8
9
  /**
@@ -38,7 +39,7 @@ exports.default = (0, citty_1.defineCommand)({
38
39
  try {
39
40
  const conn = await (0, rpc_client_1.connectClient)({ root, sessionId: args.session });
40
41
  try {
41
- const sessionId = args.session ?? (await openSession(conn, root));
42
+ const sessionId = await (0, resolve_session_1.resolveSessionId)(conn, root, args.session);
42
43
  const params = { sessionId };
43
44
  if (args.glob)
44
45
  params.glob = args.glob;
@@ -55,8 +56,4 @@ exports.default = (0, citty_1.defineCommand)({
55
56
  }
56
57
  },
57
58
  });
58
- async function openSession(conn, root) {
59
- const opened = await conn.call('session.open', { root });
60
- return opened.sessionId;
61
- }
62
59
  //# sourceMappingURL=list-files.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"list-files.js","sourceRoot":"","sources":["../../../../../../packages/cli/src/commands/core/list-files.ts"],"names":[],"mappings":";;AAAA,yCAAoC;AACpC,iCAAsC;AAEtC,gDAA6E;AAC7E,wDAAwD;AACxD,iDAA+C;AAE/C;;;GAGG;AACH,kBAAe,IAAA,qBAAa,EAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY;QAClB,WAAW,EAAE,wCAAwC;KACtD;IACD,IAAI,EAAE;QACJ,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,wBAAwB;SACtC;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,gCAAgC;SAC9C;QACD,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,YAAY;SAC1B;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,eAAe;YAC5B,OAAO,EAAE,KAAK;SACf;KACF;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;gBAClE,MAAM,MAAM,GAAyC,EAAE,SAAS,EAAE,CAAC;gBACnE,IAAI,IAAI,CAAC,IAAI;oBAAE,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;gBACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;gBACpD,IAAA,qBAAY,EAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACpD,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,QAAQ,GAAG,GAAG,YAAY,kBAAQ,CAAC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;CACF,CAAC,CAAC;AAEH,KAAK,UAAU,WAAW,CACxB,IAAmE,EACnE,IAAY;IAEZ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAwB,cAAc,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAChF,OAAO,MAAM,CAAC,SAAS,CAAC;AAC1B,CAAC"}
1
+ {"version":3,"file":"list-files.js","sourceRoot":"","sources":["../../../../../../packages/cli/src/commands/core/list-files.ts"],"names":[],"mappings":";;AAAA,yCAAoC;AACpC,iCAAsC;AAEtC,gDAA6E;AAC7E,kEAAgE;AAChE,wDAAwD;AACxD,iDAA+C;AAE/C;;;GAGG;AACH,kBAAe,IAAA,qBAAa,EAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY;QAClB,WAAW,EAAE,wCAAwC;KACtD;IACD,IAAI,EAAE;QACJ,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,wBAAwB;SACtC;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,gCAAgC;SAC9C;QACD,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,YAAY;SAC1B;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,eAAe;YAC5B,OAAO,EAAE,KAAK;SACf;KACF;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,MAAM,IAAA,kCAAgB,EAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnE,MAAM,MAAM,GAAyC,EAAE,SAAS,EAAE,CAAC;gBACnE,IAAI,IAAI,CAAC,IAAI;oBAAE,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;gBACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;gBACpD,IAAA,qBAAY,EAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACpD,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,QAAQ,GAAG,GAAG,YAAY,kBAAQ,CAAC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;CACF,CAAC,CAAC"}
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const node_path_1 = require("node:path");
4
4
  const citty_1 = require("citty");
5
5
  const output_1 = require("../../client/output");
6
+ const resolve_session_1 = require("../../client/resolve-session");
6
7
  const rpc_client_1 = require("../../client/rpc-client");
7
8
  const jsonrpc_1 = require("../../proto/jsonrpc");
8
9
  /**
@@ -40,7 +41,7 @@ exports.default = (0, citty_1.defineCommand)({
40
41
  try {
41
42
  const conn = await (0, rpc_client_1.connectClient)({ root, sessionId: args.session });
42
43
  try {
43
- const sessionId = args.session ?? (await openSession(conn, root));
44
+ const sessionId = await (0, resolve_session_1.resolveSessionId)(conn, root, args.session);
44
45
  const result = await conn.call('reload', {
45
46
  sessionId,
46
47
  file: (0, node_path_1.resolve)(args.file),
@@ -57,8 +58,4 @@ exports.default = (0, citty_1.defineCommand)({
57
58
  }
58
59
  },
59
60
  });
60
- async function openSession(conn, root) {
61
- const opened = await conn.call('session.open', { root });
62
- return opened.sessionId;
63
- }
64
61
  //# sourceMappingURL=reload.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"reload.js","sourceRoot":"","sources":["../../../../../../packages/cli/src/commands/core/reload.ts"],"names":[],"mappings":";;AAAA,yCAAoC;AACpC,iCAAsC;AAEtC,gDAA6E;AAC7E,wDAAwD;AACxD,iDAA+C;AAE/C;;;;GAIG;AACH,kBAAe,IAAA,qBAAa,EAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,yCAAyC;KACvD;IACD,IAAI,EAAE;QACJ,IAAI,EAAE;YACJ,IAAI,EAAE,YAAY;YAClB,WAAW,EAAE,iBAAiB;YAC9B,QAAQ,EAAE,IAAI;SACf;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,gCAAgC;SAC9C;QACD,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,YAAY;SAC1B;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,eAAe;YAC5B,OAAO,EAAE,KAAK;SACf;KACF;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;gBAClE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;oBACvC,SAAS;oBACT,IAAI,EAAE,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,CAAC;iBACzB,CAAC,CAAC;gBACH,IAAA,qBAAY,EAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACpD,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,QAAQ,GAAG,GAAG,YAAY,kBAAQ,CAAC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;CACF,CAAC,CAAC;AAEH,KAAK,UAAU,WAAW,CACxB,IAAmE,EACnE,IAAY;IAEZ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAwB,cAAc,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAChF,OAAO,MAAM,CAAC,SAAS,CAAC;AAC1B,CAAC"}
1
+ {"version":3,"file":"reload.js","sourceRoot":"","sources":["../../../../../../packages/cli/src/commands/core/reload.ts"],"names":[],"mappings":";;AAAA,yCAAoC;AACpC,iCAAsC;AAEtC,gDAA6E;AAC7E,kEAAgE;AAChE,wDAAwD;AACxD,iDAA+C;AAE/C;;;;GAIG;AACH,kBAAe,IAAA,qBAAa,EAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,yCAAyC;KACvD;IACD,IAAI,EAAE;QACJ,IAAI,EAAE;YACJ,IAAI,EAAE,YAAY;YAClB,WAAW,EAAE,iBAAiB;YAC9B,QAAQ,EAAE,IAAI;SACf;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,gCAAgC;SAC9C;QACD,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,YAAY;SAC1B;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,eAAe;YAC5B,OAAO,EAAE,KAAK;SACf;KACF;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,MAAM,IAAA,kCAAgB,EAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;oBACvC,SAAS;oBACT,IAAI,EAAE,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,CAAC;iBACzB,CAAC,CAAC;gBACH,IAAA,qBAAY,EAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACpD,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,QAAQ,GAAG,GAAG,YAAY,kBAAQ,CAAC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;CACF,CAAC,CAAC"}
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const node_path_1 = require("node:path");
4
4
  const citty_1 = require("citty");
5
5
  const output_1 = require("../../client/output");
6
+ const resolve_session_1 = require("../../client/resolve-session");
6
7
  const rpc_client_1 = require("../../client/rpc-client");
7
8
  const jsonrpc_1 = require("../../proto/jsonrpc");
8
9
  /**
@@ -43,7 +44,7 @@ exports.default = (0, citty_1.defineCommand)({
43
44
  try {
44
45
  const conn = await (0, rpc_client_1.connectClient)({ root, sessionId: args.session });
45
46
  try {
46
- const sessionId = args.session ?? (await openSession(conn, root));
47
+ const sessionId = await (0, resolve_session_1.resolveSessionId)(conn, root, args.session);
47
48
  const params = { sessionId };
48
49
  if (args.file)
49
50
  params.file = (0, node_path_1.resolve)(args.file);
@@ -62,8 +63,4 @@ exports.default = (0, citty_1.defineCommand)({
62
63
  }
63
64
  },
64
65
  });
65
- async function openSession(conn, root) {
66
- const opened = await conn.call('session.open', { root });
67
- return opened.sessionId;
68
- }
69
66
  //# sourceMappingURL=save.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"save.js","sourceRoot":"","sources":["../../../../../../packages/cli/src/commands/core/save.ts"],"names":[],"mappings":";;AAAA,yCAAoC;AACpC,iCAAsC;AAEtC,gDAA6E;AAC7E,wDAAwD;AACxD,iDAA+C;AAE/C;;;GAGG;AACH,kBAAe,IAAA,qBAAa,EAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,+BAA+B;KAC7C;IACD,IAAI,EAAE;QACJ,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,wBAAwB;SACtC;QACD,SAAS,EAAE;YACT,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,yBAAyB;YACtC,OAAO,EAAE,KAAK;SACf;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,gCAAgC;SAC9C;QACD,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,YAAY;SAC1B;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,eAAe;YAC5B,OAAO,EAAE,KAAK;SACf;KACF;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;gBAClE,MAAM,MAAM,GAA2D,EAAE,SAAS,EAAE,CAAC;gBACrF,IAAI,IAAI,CAAC,IAAI;oBAAE,MAAM,CAAC,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAChD,IAAI,IAAI,CAAC,SAAS,CAAC;oBAAE,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;gBAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAC/C,IAAA,qBAAY,EAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACpD,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,QAAQ,GAAG,GAAG,YAAY,kBAAQ,CAAC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;CACF,CAAC,CAAC;AAEH,KAAK,UAAU,WAAW,CACxB,IAAmE,EACnE,IAAY;IAEZ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAwB,cAAc,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAChF,OAAO,MAAM,CAAC,SAAS,CAAC;AAC1B,CAAC"}
1
+ {"version":3,"file":"save.js","sourceRoot":"","sources":["../../../../../../packages/cli/src/commands/core/save.ts"],"names":[],"mappings":";;AAAA,yCAAoC;AACpC,iCAAsC;AAEtC,gDAA6E;AAC7E,kEAAgE;AAChE,wDAAwD;AACxD,iDAA+C;AAE/C;;;GAGG;AACH,kBAAe,IAAA,qBAAa,EAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,+BAA+B;KAC7C;IACD,IAAI,EAAE;QACJ,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,wBAAwB;SACtC;QACD,SAAS,EAAE;YACT,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,yBAAyB;YACtC,OAAO,EAAE,KAAK;SACf;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,gCAAgC;SAC9C;QACD,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,YAAY;SAC1B;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,eAAe;YAC5B,OAAO,EAAE,KAAK;SACf;KACF;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,MAAM,IAAA,kCAAgB,EAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnE,MAAM,MAAM,GAA2D,EAAE,SAAS,EAAE,CAAC;gBACrF,IAAI,IAAI,CAAC,IAAI;oBAAE,MAAM,CAAC,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAChD,IAAI,IAAI,CAAC,SAAS,CAAC;oBAAE,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;gBAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAC/C,IAAA,qBAAY,EAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACpD,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,QAAQ,GAAG,GAAG,YAAY,kBAAQ,CAAC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;CACF,CAAC,CAAC"}
@@ -21,6 +21,10 @@ const list = (0, citty_1.defineCommand)({
21
21
  description: 'List every live daemon across all roots (reads the lockfile dir directly)',
22
22
  default: false,
23
23
  },
24
+ session: {
25
+ type: 'string',
26
+ description: 'Restrict the listing to one session id (validated against the daemon)',
27
+ },
24
28
  json: {
25
29
  type: 'boolean',
26
30
  description: 'Print as JSON',
@@ -52,10 +56,15 @@ const list = (0, citty_1.defineCommand)({
52
56
  }
53
57
  const root = (0, node_path_1.resolve)(args.root ?? process.cwd());
54
58
  try {
55
- const conn = await (0, rpc_client_1.connectClient)({ root });
59
+ // Passing `sessionId` makes `connectClient` validate that the id
60
+ // is actually live on the daemon, raising SESSION_NOT_FOUND when
61
+ // it isn't. Without this the command would silently filter to an
62
+ // empty list and exit 0 — masking the agent's mistake.
63
+ const conn = await (0, rpc_client_1.connectClient)({ root, sessionId: args.session });
56
64
  try {
57
65
  const result = await conn.call('session.list', {});
58
- (0, output_1.renderResult)(result, args.json ? 'json' : 'text');
66
+ const filtered = args.session ? result.filter((s) => s.id === args.session) : result;
67
+ (0, output_1.renderResult)(filtered, args.json ? 'json' : 'text');
59
68
  }
60
69
  finally {
61
70
  await conn.close();
@@ -1 +1 @@
1
- {"version":3,"file":"sessions.js","sourceRoot":"","sources":["../../../../../../packages/cli/src/commands/core/sessions.ts"],"names":[],"mappings":";;AAAA,yCAAoC;AACpC,iCAAsC;AAEtC,gDAA6E;AAC7E,wDAAwD;AACxD,uDAAuE;AACvE,iDAA+C;AAE/C,MAAM,IAAI,GAAG,IAAA,qBAAa,EAAC;IACzB,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,gDAAgD;KAC9D;IACD,IAAI,EAAE;QACJ,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,gCAAgC;SAC9C;QACD,GAAG,EAAE;YACH,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,2EAA2E;YACxF,OAAO,EAAE,KAAK;SACf;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,eAAe;YAC5B,OAAO,EAAE,KAAK;SACf;KACF;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,gEAAgE;QAChE,+DAA+D;QAC/D,kEAAkE;QAClE,6DAA6D;QAC7D,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACb,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,IAAA,kBAAgB,GAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBAChD,GAAG,EAAE,IAAI,CAAC,GAAG;oBACb,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS;iBACnC,CAAC,CAAC,CAAC;gBACJ,IAAA,qBAAY,EAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACrD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;gBACjB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACvB,CAAC;YACD,OAAO;QACT,CAAC;QAED,MAAM,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3C,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;gBACnD,IAAA,qBAAY,EAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACpD,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,QAAQ,GAAG,GAAG,YAAY,kBAAQ,CAAC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;CACF,CAAC,CAAC;AAEH,kBAAe,IAAA,qBAAa,EAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,UAAU;QAChB,WAAW,EAAE,0BAA0B;KACxC;IACD,WAAW,EAAE;QACX,IAAI;KACL;CACF,CAAC,CAAC"}
1
+ {"version":3,"file":"sessions.js","sourceRoot":"","sources":["../../../../../../packages/cli/src/commands/core/sessions.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ const node_path_1 = require("node:path");
4
4
  const citty_1 = require("citty");
5
5
  const format_snapshot_1 = require("../../client/format-snapshot");
6
6
  const output_1 = require("../../client/output");
7
+ const resolve_session_1 = require("../../client/resolve-session");
7
8
  const rpc_client_1 = require("../../client/rpc-client");
8
9
  const jsonrpc_1 = require("../../proto/jsonrpc");
9
10
  /**
@@ -49,7 +50,7 @@ exports.default = (0, citty_1.defineCommand)({
49
50
  const target = args.target.startsWith('@n')
50
51
  ? { ref: args.target }
51
52
  : { file: (0, node_path_1.resolve)(args.target) };
52
- const sessionId = args.session ?? (await openSession(conn, root));
53
+ const sessionId = await (0, resolve_session_1.resolveSessionId)(conn, root, args.session);
53
54
  const result = await conn.call('snapshot', { sessionId, target });
54
55
  if (args.json)
55
56
  (0, output_1.renderResult)(result, 'json');
@@ -66,8 +67,4 @@ exports.default = (0, citty_1.defineCommand)({
66
67
  }
67
68
  },
68
69
  });
69
- async function openSession(conn, root) {
70
- const opened = await conn.call('session.open', { root });
71
- return opened.sessionId;
72
- }
73
70
  //# sourceMappingURL=snapshot.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../../../../../packages/cli/src/commands/core/snapshot.ts"],"names":[],"mappings":";;AAAA,yCAAoC;AACpC,iCAAsC;AAEtC,kEAA8D;AAC9D,gDAA6E;AAC7E,wDAAwD;AACxD,iDAA+C;AAG/C;;;;;;;;;GASG;AACH,kBAAe,IAAA,qBAAa,EAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,UAAU;QAChB,WAAW,EAAE,gDAAgD;KAC9D;IACD,IAAI,EAAE;QACJ,MAAM,EAAE;YACN,IAAI,EAAE,YAAY;YAClB,WAAW,EAAE,0BAA0B;YACvC,QAAQ,EAAE,IAAI;SACf;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,gCAAgC;SAC9C;QACD,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,YAAY;SAC1B;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,+BAA+B;YAC5C,OAAO,EAAE,KAAK;SACf;KACF;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;oBACzC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE;oBACtB,CAAC,CAAC,EAAE,IAAI,EAAE,IAAA,mBAAO,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBACnC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;gBAClE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAiB,UAAU,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;gBAClF,IAAI,IAAI,CAAC,IAAI;oBAAE,IAAA,qBAAY,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;;oBACvC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,gCAAc,EAAC,MAAM,CAAC,CAAC,CAAC;YACpD,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,QAAQ,GAAG,GAAG,YAAY,kBAAQ,CAAC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;CACF,CAAC,CAAC;AAEH,KAAK,UAAU,WAAW,CACxB,IAAmE,EACnE,IAAY;IAEZ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAwB,cAAc,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAChF,OAAO,MAAM,CAAC,SAAS,CAAC;AAC1B,CAAC"}
1
+ {"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../../../../../packages/cli/src/commands/core/snapshot.ts"],"names":[],"mappings":";;AAAA,yCAAoC;AACpC,iCAAsC;AAEtC,kEAA8D;AAC9D,gDAA6E;AAC7E,kEAAgE;AAChE,wDAAwD;AACxD,iDAA+C;AAG/C;;;;;;;;;GASG;AACH,kBAAe,IAAA,qBAAa,EAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,UAAU;QAChB,WAAW,EAAE,gDAAgD;KAC9D;IACD,IAAI,EAAE;QACJ,MAAM,EAAE;YACN,IAAI,EAAE,YAAY;YAClB,WAAW,EAAE,0BAA0B;YACvC,QAAQ,EAAE,IAAI;SACf;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,gCAAgC;SAC9C;QACD,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,YAAY;SAC1B;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,+BAA+B;YAC5C,OAAO,EAAE,KAAK;SACf;KACF;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;oBACzC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE;oBACtB,CAAC,CAAC,EAAE,IAAI,EAAE,IAAA,mBAAO,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBACnC,MAAM,SAAS,GAAG,MAAM,IAAA,kCAAgB,EAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAiB,UAAU,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;gBAClF,IAAI,IAAI,CAAC,IAAI;oBAAE,IAAA,qBAAY,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;;oBACvC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,gCAAc,EAAC,MAAM,CAAC,CAAC,CAAC;YACpD,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,QAAQ,GAAG,GAAG,YAAY,kBAAQ,CAAC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;CACF,CAAC,CAAC"}
@@ -5,6 +5,7 @@ const citty_1 = require("citty");
5
5
  const node_path_1 = require("node:path");
6
6
  const output_1 = require("../../../client/output");
7
7
  const rpc_client_1 = require("../../../client/rpc-client");
8
+ const resolve_session_1 = require("../../../client/resolve-session");
8
9
  const jsonrpc_1 = require("../../../proto/jsonrpc");
9
10
  exports.default = (0, citty_1.defineCommand)({
10
11
  meta: {
@@ -24,7 +25,7 @@ exports.default = (0, citty_1.defineCommand)({
24
25
  try {
25
26
  const conn = await (0, rpc_client_1.connectClient)({ root, sessionId: args.session });
26
27
  try {
27
- const sessionId = args.session ?? (await openSession(conn, root));
28
+ const sessionId = await (0, resolve_session_1.resolveSessionId)(conn, root, args.session);
28
29
  const data = await readJsonArg(args.json);
29
30
  const filter = args.filter ? JSON.parse(args.filter) : undefined;
30
31
  const target = {};
@@ -52,10 +53,6 @@ exports.default = (0, citty_1.defineCommand)({
52
53
  }
53
54
  },
54
55
  });
55
- async function openSession(conn, root) {
56
- const opened = await conn.call('session.open', { root });
57
- return opened.sessionId;
58
- }
59
56
  async function readJsonArg(raw) {
60
57
  if (raw === undefined)
61
58
  return undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/accessors/add.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/accessors/add.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,7 @@ const citty_1 = require("citty");
5
5
  const node_path_1 = require("node:path");
6
6
  const output_1 = require("../../../client/output");
7
7
  const rpc_client_1 = require("../../../client/rpc-client");
8
+ const resolve_session_1 = require("../../../client/resolve-session");
8
9
  const jsonrpc_1 = require("../../../proto/jsonrpc");
9
10
  exports.default = (0, citty_1.defineCommand)({
10
11
  meta: {
@@ -24,7 +25,7 @@ exports.default = (0, citty_1.defineCommand)({
24
25
  try {
25
26
  const conn = await (0, rpc_client_1.connectClient)({ root, sessionId: args.session });
26
27
  try {
27
- const sessionId = args.session ?? (await openSession(conn, root));
28
+ const sessionId = await (0, resolve_session_1.resolveSessionId)(conn, root, args.session);
28
29
  const data = await readJsonArg(args.json);
29
30
  const filter = args.filter ? JSON.parse(args.filter) : undefined;
30
31
  const target = {};
@@ -52,10 +53,6 @@ exports.default = (0, citty_1.defineCommand)({
52
53
  }
53
54
  },
54
55
  });
55
- async function openSession(conn, root) {
56
- const opened = await conn.call('session.open', { root });
57
- return opened.sessionId;
58
- }
59
56
  async function readJsonArg(raw) {
60
57
  if (raw === undefined)
61
58
  return undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"edit.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/accessors/edit.ts"],"names":[],"mappings":";;AAAA,qEAAqE;AACrE,iCAAsC;AACtC,yCAAoC;AAEpC,mDAAgF;AAChF,2DAA2D;AAC3D,oDAAkD;AAElD,kBAAe,IAAA,qBAAa,EAAC;IAC3B,IAAI,EAAE;QACJ,IAAI,EAAE,gBAAgB;QACtB,WAAW,EAAE,uEAAuE;KACrF;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qCAAqC,EAAE;QAC5E,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,wCAAwC,EAAE;QAC9E,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qDAAqD,EAAE;QAC9F,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,kDAAkD,EAAE,QAAQ,EAAE,IAAI,EAAE;QACzG,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,gCAAgC,EAAE;QACvE,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,qDAAqD,EAAE;KAChG;IACD,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;QAChB,MAAM,IAAI,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;gBAClE,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAA6B,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC9F,MAAM,MAAM,GAA4B,EAAE,CAAC;gBAC3C,IAAI,IAAI,CAAC,IAAI;oBAAE,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;gBAC1C,IAAI,IAAI,CAAC,GAAG;oBAAE,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC;gBACvC,IAAI,MAAM;oBAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;gBACtC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;oBACnC,SAAS;oBACT,EAAE,EAAE,eAAe;oBACnB,MAAM;oBACN,IAAI;iBACL,CAAC,CAAC;gBACH,IAAA,qBAAY,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC/B,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,QAAQ,GAAG,GAAG,YAAY,kBAAQ,CAAC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;CACF,CAAC,CAAC;AAEH,KAAK,UAAU,WAAW,CACxB,IAAmE,EACnE,IAAY;IAEZ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAwB,cAAc,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAChF,OAAO,MAAM,CAAC,SAAS,CAAC;AAC1B,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,GAAuB;IAChD,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACxC,IAAI,GAAG,KAAK,GAAG,EAAE,CAAC;QAChB,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,IAAI,KAAK,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,KAAK;YAAE,MAAM,CAAC,IAAI,CAAC,CAAW,CAAC,CAAC;QAC9D,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC"}
1
+ {"version":3,"file":"edit.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/accessors/edit.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,7 @@ const citty_1 = require("citty");
5
5
  const node_path_1 = require("node:path");
6
6
  const output_1 = require("../../../client/output");
7
7
  const rpc_client_1 = require("../../../client/rpc-client");
8
+ const resolve_session_1 = require("../../../client/resolve-session");
8
9
  const jsonrpc_1 = require("../../../proto/jsonrpc");
9
10
  exports.default = (0, citty_1.defineCommand)({
10
11
  meta: {
@@ -24,7 +25,7 @@ exports.default = (0, citty_1.defineCommand)({
24
25
  try {
25
26
  const conn = await (0, rpc_client_1.connectClient)({ root, sessionId: args.session });
26
27
  try {
27
- const sessionId = args.session ?? (await openSession(conn, root));
28
+ const sessionId = await (0, resolve_session_1.resolveSessionId)(conn, root, args.session);
28
29
  const data = await readJsonArg(args.json);
29
30
  const filter = args.filter ? JSON.parse(args.filter) : undefined;
30
31
  const target = {};
@@ -52,10 +53,6 @@ exports.default = (0, citty_1.defineCommand)({
52
53
  }
53
54
  },
54
55
  });
55
- async function openSession(conn, root) {
56
- const opened = await conn.call('session.open', { root });
57
- return opened.sessionId;
58
- }
59
56
  async function readJsonArg(raw) {
60
57
  if (raw === undefined)
61
58
  return undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/accessors/get.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../packages/cli/src/commands/generated/accessors/get.ts"],"names":[],"mappings":"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"}