@kaitranntt/ccs 8.8.1 → 8.9.0-dev.10

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 (429) hide show
  1. package/README.md +9 -7
  2. package/dist/api/services/profile-lifecycle-validation.d.ts.map +1 -1
  3. package/dist/api/services/profile-lifecycle-validation.js +3 -8
  4. package/dist/api/services/profile-lifecycle-validation.js.map +1 -1
  5. package/dist/auth/auth-commands.js +3 -3
  6. package/dist/auth/auth-commands.js.map +1 -1
  7. package/dist/auth/resume-lane-diagnostics.d.ts +9 -0
  8. package/dist/auth/resume-lane-diagnostics.d.ts.map +1 -1
  9. package/dist/auth/resume-lane-diagnostics.js +105 -1
  10. package/dist/auth/resume-lane-diagnostics.js.map +1 -1
  11. package/dist/auth/resume-lane-warning.d.ts +9 -1
  12. package/dist/auth/resume-lane-warning.d.ts.map +1 -1
  13. package/dist/auth/resume-lane-warning.js +72 -5
  14. package/dist/auth/resume-lane-warning.js.map +1 -1
  15. package/dist/ccs.d.ts +1 -1
  16. package/dist/ccs.d.ts.map +1 -1
  17. package/dist/ccs.js +5 -1
  18. package/dist/ccs.js.map +1 -1
  19. package/dist/cliproxy/accounts/registry.d.ts.map +1 -1
  20. package/dist/cliproxy/accounts/registry.js +14 -16
  21. package/dist/cliproxy/accounts/registry.js.map +1 -1
  22. package/dist/cliproxy/ai-providers/model-id-normalizer.d.ts +1 -1
  23. package/dist/cliproxy/ai-providers/model-id-normalizer.d.ts.map +1 -1
  24. package/dist/cliproxy/auth/oauth-cli-args.d.ts +11 -0
  25. package/dist/cliproxy/auth/oauth-cli-args.d.ts.map +1 -0
  26. package/dist/cliproxy/auth/oauth-cli-args.js +53 -0
  27. package/dist/cliproxy/auth/oauth-cli-args.js.map +1 -0
  28. package/dist/cliproxy/auth/oauth-cli-capabilities.d.ts +11 -0
  29. package/dist/cliproxy/auth/oauth-cli-capabilities.d.ts.map +1 -0
  30. package/dist/cliproxy/auth/oauth-cli-capabilities.js +101 -0
  31. package/dist/cliproxy/auth/oauth-cli-capabilities.js.map +1 -0
  32. package/dist/cliproxy/auth/oauth-handler.d.ts +0 -6
  33. package/dist/cliproxy/auth/oauth-handler.d.ts.map +1 -1
  34. package/dist/cliproxy/auth/oauth-handler.js +70 -43
  35. package/dist/cliproxy/auth/oauth-handler.js.map +1 -1
  36. package/dist/cliproxy/auth/test-fixtures/gemini-backend-guidance-child.scenario.d.ts +2 -0
  37. package/dist/cliproxy/auth/test-fixtures/gemini-backend-guidance-child.scenario.d.ts.map +1 -0
  38. package/dist/cliproxy/auth/test-fixtures/gemini-backend-guidance-child.scenario.js +207 -0
  39. package/dist/cliproxy/auth/test-fixtures/gemini-backend-guidance-child.scenario.js.map +1 -0
  40. package/dist/cliproxy/binary/install-lifecycle-lock.d.ts +2 -0
  41. package/dist/cliproxy/binary/install-lifecycle-lock.d.ts.map +1 -0
  42. package/dist/cliproxy/binary/install-lifecycle-lock.js +63 -0
  43. package/dist/cliproxy/binary/install-lifecycle-lock.js.map +1 -0
  44. package/dist/cliproxy/binary/installer.d.ts +13 -1
  45. package/dist/cliproxy/binary/installer.d.ts.map +1 -1
  46. package/dist/cliproxy/binary/installer.js +81 -42
  47. package/dist/cliproxy/binary/installer.js.map +1 -1
  48. package/dist/cliproxy/binary/lifecycle.d.ts +6 -1
  49. package/dist/cliproxy/binary/lifecycle.d.ts.map +1 -1
  50. package/dist/cliproxy/binary/lifecycle.js +13 -10
  51. package/dist/cliproxy/binary/lifecycle.js.map +1 -1
  52. package/dist/cliproxy/binary-manager.d.ts +3 -0
  53. package/dist/cliproxy/binary-manager.d.ts.map +1 -1
  54. package/dist/cliproxy/binary-manager.js +32 -30
  55. package/dist/cliproxy/binary-manager.js.map +1 -1
  56. package/dist/cliproxy/config/env-builder.d.ts +5 -0
  57. package/dist/cliproxy/config/env-builder.d.ts.map +1 -1
  58. package/dist/cliproxy/config/env-builder.js +24 -1
  59. package/dist/cliproxy/config/env-builder.js.map +1 -1
  60. package/dist/cliproxy/config/extended-context-config.d.ts.map +1 -1
  61. package/dist/cliproxy/config/extended-context-config.js +38 -1
  62. package/dist/cliproxy/config/extended-context-config.js.map +1 -1
  63. package/dist/cliproxy/config/generator.d.ts +2 -1
  64. package/dist/cliproxy/config/generator.d.ts.map +1 -1
  65. package/dist/cliproxy/config/generator.js +81 -11
  66. package/dist/cliproxy/config/generator.js.map +1 -1
  67. package/dist/cliproxy/config/oauth-model-alias-config.d.ts +6 -0
  68. package/dist/cliproxy/config/oauth-model-alias-config.d.ts.map +1 -0
  69. package/dist/cliproxy/config/oauth-model-alias-config.js +136 -0
  70. package/dist/cliproxy/config/oauth-model-alias-config.js.map +1 -0
  71. package/dist/cliproxy/config/payload-rule-config.d.ts +6 -0
  72. package/dist/cliproxy/config/payload-rule-config.d.ts.map +1 -0
  73. package/dist/cliproxy/config/payload-rule-config.js +137 -0
  74. package/dist/cliproxy/config/payload-rule-config.js.map +1 -0
  75. package/dist/cliproxy/executor/claude-launcher.d.ts +3 -0
  76. package/dist/cliproxy/executor/claude-launcher.d.ts.map +1 -1
  77. package/dist/cliproxy/executor/claude-launcher.js +7 -3
  78. package/dist/cliproxy/executor/claude-launcher.js.map +1 -1
  79. package/dist/cliproxy/executor/env-resolver.d.ts +2 -0
  80. package/dist/cliproxy/executor/env-resolver.d.ts.map +1 -1
  81. package/dist/cliproxy/executor/env-resolver.js +6 -4
  82. package/dist/cliproxy/executor/env-resolver.js.map +1 -1
  83. package/dist/cliproxy/executor/index.d.ts.map +1 -1
  84. package/dist/cliproxy/executor/index.js +7 -5
  85. package/dist/cliproxy/executor/index.js.map +1 -1
  86. package/dist/cliproxy/executor/launch-settings.d.ts.map +1 -1
  87. package/dist/cliproxy/executor/launch-settings.js +9 -2
  88. package/dist/cliproxy/executor/launch-settings.js.map +1 -1
  89. package/dist/cliproxy/model-catalog.d.ts +8 -0
  90. package/dist/cliproxy/model-catalog.d.ts.map +1 -1
  91. package/dist/cliproxy/model-catalog.js +109 -2
  92. package/dist/cliproxy/model-catalog.js.map +1 -1
  93. package/dist/cliproxy/quota/quota-fetcher-claude.d.ts.map +1 -1
  94. package/dist/cliproxy/quota/quota-fetcher-claude.js +11 -1
  95. package/dist/cliproxy/quota/quota-fetcher-claude.js.map +1 -1
  96. package/dist/cliproxy/routing/retry-settings.d.ts +18 -0
  97. package/dist/cliproxy/routing/retry-settings.d.ts.map +1 -0
  98. package/dist/cliproxy/routing/retry-settings.js +185 -0
  99. package/dist/cliproxy/routing/retry-settings.js.map +1 -0
  100. package/dist/cliproxy/routing/routing-strategy-http.d.ts +3 -0
  101. package/dist/cliproxy/routing/routing-strategy-http.d.ts.map +1 -1
  102. package/dist/cliproxy/routing/routing-strategy-http.js +13 -3
  103. package/dist/cliproxy/routing/routing-strategy-http.js.map +1 -1
  104. package/dist/cliproxy/services/binary-service.d.ts.map +1 -1
  105. package/dist/cliproxy/services/binary-service.js +24 -20
  106. package/dist/cliproxy/services/binary-service.js.map +1 -1
  107. package/dist/cliproxy/services/catalog-cache.d.ts.map +1 -1
  108. package/dist/cliproxy/services/catalog-cache.js +8 -0
  109. package/dist/cliproxy/services/catalog-cache.js.map +1 -1
  110. package/dist/cliproxy/session-tracker.d.ts.map +1 -1
  111. package/dist/cliproxy/session-tracker.js +4 -18
  112. package/dist/cliproxy/session-tracker.js.map +1 -1
  113. package/dist/cliproxy/types/binary-types.d.ts +1 -0
  114. package/dist/cliproxy/types/binary-types.d.ts.map +1 -1
  115. package/dist/cliproxy/types/config-types.d.ts +3 -0
  116. package/dist/cliproxy/types/config-types.d.ts.map +1 -1
  117. package/dist/codex-auth/shell-detect.d.ts +2 -0
  118. package/dist/codex-auth/shell-detect.d.ts.map +1 -1
  119. package/dist/codex-auth/shell-detect.js +15 -1
  120. package/dist/codex-auth/shell-detect.js.map +1 -1
  121. package/dist/commands/bar/bar-process-control.d.ts +43 -0
  122. package/dist/commands/bar/bar-process-control.d.ts.map +1 -0
  123. package/dist/commands/bar/bar-process-control.js +255 -0
  124. package/dist/commands/bar/bar-process-control.js.map +1 -0
  125. package/dist/commands/bar/bar-server-probe.d.ts +5 -2
  126. package/dist/commands/bar/bar-server-probe.d.ts.map +1 -1
  127. package/dist/commands/bar/bar-server-probe.js +38 -12
  128. package/dist/commands/bar/bar-server-probe.js.map +1 -1
  129. package/dist/commands/bar/help-subcommand.d.ts.map +1 -1
  130. package/dist/commands/bar/help-subcommand.js +2 -0
  131. package/dist/commands/bar/help-subcommand.js.map +1 -1
  132. package/dist/commands/bar/index.d.ts.map +1 -1
  133. package/dist/commands/bar/index.js +13 -3
  134. package/dist/commands/bar/index.js.map +1 -1
  135. package/dist/commands/bar/launch-descriptor.d.ts +2 -0
  136. package/dist/commands/bar/launch-descriptor.d.ts.map +1 -1
  137. package/dist/commands/bar/launch-descriptor.js +6 -1
  138. package/dist/commands/bar/launch-descriptor.js.map +1 -1
  139. package/dist/commands/bar/launch-subcommand.d.ts +18 -1
  140. package/dist/commands/bar/launch-subcommand.d.ts.map +1 -1
  141. package/dist/commands/bar/launch-subcommand.js +149 -45
  142. package/dist/commands/bar/launch-subcommand.js.map +1 -1
  143. package/dist/commands/bar/port-arg.d.ts +16 -0
  144. package/dist/commands/bar/port-arg.d.ts.map +1 -0
  145. package/dist/commands/bar/port-arg.js +41 -0
  146. package/dist/commands/bar/port-arg.js.map +1 -0
  147. package/dist/commands/bar/serve-subcommand.d.ts +5 -0
  148. package/dist/commands/bar/serve-subcommand.d.ts.map +1 -1
  149. package/dist/commands/bar/serve-subcommand.js +47 -29
  150. package/dist/commands/bar/serve-subcommand.js.map +1 -1
  151. package/dist/commands/bar/status-subcommand.d.ts.map +1 -1
  152. package/dist/commands/bar/status-subcommand.js +11 -2
  153. package/dist/commands/bar/status-subcommand.js.map +1 -1
  154. package/dist/commands/bar/stop-subcommand.d.ts +5 -0
  155. package/dist/commands/bar/stop-subcommand.d.ts.map +1 -1
  156. package/dist/commands/bar/stop-subcommand.js +71 -27
  157. package/dist/commands/bar/stop-subcommand.js.map +1 -1
  158. package/dist/commands/cliproxy/catalog-subcommand.d.ts.map +1 -1
  159. package/dist/commands/cliproxy/catalog-subcommand.js +2 -0
  160. package/dist/commands/cliproxy/catalog-subcommand.js.map +1 -1
  161. package/dist/commands/cliproxy/quota-subcommand/format-helpers.js +1 -1
  162. package/dist/commands/cliproxy/quota-subcommand/handlers.js +1 -1
  163. package/dist/commands/cliproxy/quota-subcommand/handlers.js.map +1 -1
  164. package/dist/commands/cliproxy/quota-subcommand/sections/claude.d.ts.map +1 -1
  165. package/dist/commands/cliproxy/quota-subcommand/sections/claude.js +3 -2
  166. package/dist/commands/cliproxy/quota-subcommand/sections/claude.js.map +1 -1
  167. package/dist/commands/cliproxy/quota-subcommand/sections/codex.js +1 -1
  168. package/dist/commands/cliproxy/quota-subcommand/sections/codex.js.map +1 -1
  169. package/dist/commands/cliproxy/quota-subcommand/sections/gemini-cli.js +1 -1
  170. package/dist/commands/cliproxy/quota-subcommand/sections/gemini-cli.js.map +1 -1
  171. package/dist/commands/setup-command.js +1 -1
  172. package/dist/commands/setup-command.js.map +1 -1
  173. package/dist/commands/version-command.js +1 -1
  174. package/dist/commands/version-command.js.map +1 -1
  175. package/dist/config/schemas/auth.d.ts +2 -2
  176. package/dist/config/schemas/auth.d.ts.map +1 -1
  177. package/dist/config/schemas/cliproxy.d.ts +66 -0
  178. package/dist/config/schemas/cliproxy.d.ts.map +1 -1
  179. package/dist/config/schemas/cliproxy.js +13 -1
  180. package/dist/config/schemas/cliproxy.js.map +1 -1
  181. package/dist/config/schemas/index.d.ts +1 -1
  182. package/dist/config/schemas/index.d.ts.map +1 -1
  183. package/dist/config/schemas/index.js.map +1 -1
  184. package/dist/config/schemas/version.d.ts +2 -1
  185. package/dist/config/schemas/version.d.ts.map +1 -1
  186. package/dist/config/schemas/version.js +2 -1
  187. package/dist/config/schemas/version.js.map +1 -1
  188. package/dist/copilot/copilot-executor.d.ts +3 -1
  189. package/dist/copilot/copilot-executor.d.ts.map +1 -1
  190. package/dist/copilot/copilot-executor.js +11 -7
  191. package/dist/copilot/copilot-executor.js.map +1 -1
  192. package/dist/cursor/cursor-profile-executor.d.ts +3 -1
  193. package/dist/cursor/cursor-profile-executor.d.ts.map +1 -1
  194. package/dist/cursor/cursor-profile-executor.js +8 -4
  195. package/dist/cursor/cursor-profile-executor.js.map +1 -1
  196. package/dist/delegation/delegation-handler.d.ts.map +1 -1
  197. package/dist/delegation/delegation-handler.js +12 -2
  198. package/dist/delegation/delegation-handler.js.map +1 -1
  199. package/dist/delegation/headless-executor.d.ts.map +1 -1
  200. package/dist/delegation/headless-executor.js +4 -3
  201. package/dist/delegation/headless-executor.js.map +1 -1
  202. package/dist/dispatcher/flows/copilot-flow.d.ts.map +1 -1
  203. package/dist/dispatcher/flows/copilot-flow.js +3 -2
  204. package/dist/dispatcher/flows/copilot-flow.js.map +1 -1
  205. package/dist/dispatcher/flows/cursor-flow.d.ts.map +1 -1
  206. package/dist/dispatcher/flows/cursor-flow.js +3 -2
  207. package/dist/dispatcher/flows/cursor-flow.js.map +1 -1
  208. package/dist/dispatcher/flows/settings-flow.d.ts.map +1 -1
  209. package/dist/dispatcher/flows/settings-flow.js +12 -10
  210. package/dist/dispatcher/flows/settings-flow.js.map +1 -1
  211. package/dist/management/instance-directory.d.ts +19 -0
  212. package/dist/management/instance-directory.d.ts.map +1 -1
  213. package/dist/management/instance-directory.js +130 -7
  214. package/dist/management/instance-directory.js.map +1 -1
  215. package/dist/management/instance-manager.d.ts +2 -5
  216. package/dist/management/instance-manager.d.ts.map +1 -1
  217. package/dist/management/instance-manager.js +26 -27
  218. package/dist/management/instance-manager.js.map +1 -1
  219. package/dist/management/shared-manager/canonical-first-file-claims.d.ts +6 -0
  220. package/dist/management/shared-manager/canonical-first-file-claims.d.ts.map +1 -0
  221. package/dist/management/shared-manager/canonical-first-file-claims.js +143 -0
  222. package/dist/management/shared-manager/canonical-first-file-claims.js.map +1 -0
  223. package/dist/management/shared-manager/canonical-first-file-reconciler.d.ts +15 -0
  224. package/dist/management/shared-manager/canonical-first-file-reconciler.d.ts.map +1 -0
  225. package/dist/management/shared-manager/canonical-first-file-reconciler.js +131 -0
  226. package/dist/management/shared-manager/canonical-first-file-reconciler.js.map +1 -0
  227. package/dist/management/shared-manager/diverged-file-adopter.d.ts +5 -0
  228. package/dist/management/shared-manager/diverged-file-adopter.d.ts.map +1 -0
  229. package/dist/management/shared-manager/diverged-file-adopter.js +391 -0
  230. package/dist/management/shared-manager/diverged-file-adopter.js.map +1 -0
  231. package/dist/management/shared-manager/fs-helpers.d.ts +9 -0
  232. package/dist/management/shared-manager/fs-helpers.d.ts.map +1 -1
  233. package/dist/management/shared-manager/fs-helpers.js +9 -0
  234. package/dist/management/shared-manager/fs-helpers.js.map +1 -1
  235. package/dist/management/shared-manager/plugin-layout-internals.d.ts +1 -1
  236. package/dist/management/shared-manager/plugin-layout-internals.d.ts.map +1 -1
  237. package/dist/management/shared-manager/plugin-layout-internals.js +54 -8
  238. package/dist/management/shared-manager/plugin-layout-internals.js.map +1 -1
  239. package/dist/management/shared-manager/shared-dir-linker.d.ts +1 -1
  240. package/dist/management/shared-manager/shared-dir-linker.d.ts.map +1 -1
  241. package/dist/management/shared-manager/shared-dir-linker.js +147 -75
  242. package/dist/management/shared-manager/shared-dir-linker.js.map +1 -1
  243. package/dist/management/shared-manager/types.d.ts +12 -1
  244. package/dist/management/shared-manager/types.d.ts.map +1 -1
  245. package/dist/management/shared-manager/types.js +12 -1
  246. package/dist/management/shared-manager/types.js.map +1 -1
  247. package/dist/proxy/proxy-daemon-entry.js +10 -2
  248. package/dist/proxy/proxy-daemon-entry.js.map +1 -1
  249. package/dist/proxy/server/messages-route.d.ts +2 -2
  250. package/dist/proxy/server/messages-route.d.ts.map +1 -1
  251. package/dist/proxy/server/messages-route.js +33 -24
  252. package/dist/proxy/server/messages-route.js.map +1 -1
  253. package/dist/proxy/server/proxy-server.d.ts +1 -0
  254. package/dist/proxy/server/proxy-server.d.ts.map +1 -1
  255. package/dist/proxy/server/proxy-server.js +57 -5
  256. package/dist/proxy/server/proxy-server.js.map +1 -1
  257. package/dist/proxy/server/upstream-transport.d.ts +14 -0
  258. package/dist/proxy/server/upstream-transport.d.ts.map +1 -0
  259. package/dist/proxy/server/upstream-transport.js +72 -0
  260. package/dist/proxy/server/upstream-transport.js.map +1 -0
  261. package/dist/proxy/transformers/request-transformer.d.ts.map +1 -1
  262. package/dist/proxy/transformers/request-transformer.js +43 -1
  263. package/dist/proxy/transformers/request-transformer.js.map +1 -1
  264. package/dist/services/logging/log-redaction.d.ts.map +1 -1
  265. package/dist/services/logging/log-redaction.js +4 -1
  266. package/dist/services/logging/log-redaction.js.map +1 -1
  267. package/dist/services/logging/log-types.d.ts +1 -0
  268. package/dist/services/logging/log-types.d.ts.map +1 -1
  269. package/dist/services/logging/log-types.js.map +1 -1
  270. package/dist/shared/extended-context-utils.d.ts +18 -2
  271. package/dist/shared/extended-context-utils.d.ts.map +1 -1
  272. package/dist/shared/extended-context-utils.js +38 -3
  273. package/dist/shared/extended-context-utils.js.map +1 -1
  274. package/dist/shared/provider-preset-catalog.d.ts +2 -1
  275. package/dist/shared/provider-preset-catalog.d.ts.map +1 -1
  276. package/dist/shared/provider-preset-catalog.js +18 -1
  277. package/dist/shared/provider-preset-catalog.js.map +1 -1
  278. package/dist/types/config.d.ts +2 -2
  279. package/dist/types/config.d.ts.map +1 -1
  280. package/dist/ui/assets/{Trans-DTklOPAl.js → Trans-Dv0FgbfN.js} +1 -1
  281. package/dist/ui/assets/{accounts-Cvmw1zaL.js → accounts-DD4gJm5G.js} +1 -1
  282. package/dist/ui/assets/{alert-dialog-xN1Vxm4Q.js → alert-dialog-CfsyUL5i.js} +1 -1
  283. package/dist/ui/assets/{api-UjGDV1dn.js → api-Rml_6r1f.js} +1 -1
  284. package/dist/ui/assets/{auth-section-exE9zovq.js → auth-section-ud23YOqo.js} +1 -1
  285. package/dist/ui/assets/{backups-section-CANdqpNT.js → backups-section-BvojIR_s.js} +1 -1
  286. package/dist/ui/assets/{channels-C8d6AgLN.js → channels-C6JAnQ-P.js} +1 -1
  287. package/dist/ui/assets/{checkbox-B71vxZdD.js → checkbox-e4TE1vtU.js} +1 -1
  288. package/dist/ui/assets/{claude-extension-COD7m8Iq.js → claude-extension-Crqbbisi.js} +1 -1
  289. package/dist/ui/assets/cliproxy-CTzg_fbJ.js +4 -0
  290. package/dist/ui/assets/{cliproxy-ai-providers-C79GuQ92.js → cliproxy-ai-providers-DRfGjeni.js} +5 -5
  291. package/dist/ui/assets/{cliproxy-control-panel-B6_hOtz6.js → cliproxy-control-panel-C0TgmqD6.js} +1 -1
  292. package/dist/ui/assets/{codex-3mlgCMGk.js → codex-CGFN2_Yz.js} +1 -1
  293. package/dist/ui/assets/{confirm-dialog-CHnCNFFP.js → confirm-dialog-CWYwcPu7.js} +1 -1
  294. package/dist/ui/assets/{copilot-CfmS6yON.js → copilot-CDo33AQ9.js} +2 -2
  295. package/dist/ui/assets/{cursor-tzPHgV8J.js → cursor-nVJdycFe.js} +1 -1
  296. package/dist/ui/assets/{droid-Bc8LlbJa.js → droid-C1mg2O8N.js} +1 -1
  297. package/dist/ui/assets/{globalenv-section-DTYeLBoB.js → globalenv-section-D0iUrk5Z.js} +1 -1
  298. package/dist/ui/assets/{health-9Xyzeiyx.js → health-CIcj1Jxy.js} +1 -1
  299. package/dist/ui/assets/{index-B0M7QB1o.js → index-AosRBwPp.js} +1 -1
  300. package/dist/ui/assets/{index-DoHAX6LH.js → index-BCqgbLRB.js} +1 -1
  301. package/dist/ui/assets/{index-CEx6YJb5.js → index-BxcCMHzL.js} +1 -1
  302. package/dist/ui/assets/{index-Bz1gMXk1.js → index-DZbSKKhp.js} +1 -1
  303. package/dist/ui/assets/{index-DuD3QaMG.js → index-DvvpgsgL.js} +1 -1
  304. package/dist/ui/assets/index-DwlqXVPF.js +56 -0
  305. package/dist/ui/assets/{index-Bjg11-rW.js → index-W-L7VU-4.js} +1 -1
  306. package/dist/ui/assets/{logs-CrjUtfDp.js → logs-CLIARnH2.js} +1 -1
  307. package/dist/ui/assets/{masked-input-BAtRbixr.js → masked-input-BRcjJtU3.js} +1 -1
  308. package/dist/ui/assets/proxy-status-widget-CBBs3HmJ.js +1 -0
  309. package/dist/ui/assets/{raw-json-settings-editor-panel-CvJCywnk.js → raw-json-settings-editor-panel-DhDm8jkK.js} +1 -1
  310. package/dist/ui/assets/{searchable-select-Bn50_-2s.js → searchable-select-DW5e6ct1.js} +1 -1
  311. package/dist/ui/assets/{separator-DY36bzud.js → separator-D-2blr1t.js} +1 -1
  312. package/dist/ui/assets/{shared-BynjOvKs.js → shared-BIRVeSaP.js} +1 -1
  313. package/dist/ui/assets/{table-DdcK8yYq.js → table-CEyFyU_X.js} +1 -1
  314. package/dist/ui/assets/{updates-D27A1hQG.js → updates-Dcpm3clh.js} +1 -1
  315. package/dist/ui/assets/{use-accounts-CRxt0j07.js → use-accounts-Cjb9-mnK.js} +1 -1
  316. package/dist/ui/icons/orcarouter.svg +1 -0
  317. package/dist/ui/index.html +2 -2
  318. package/dist/utils/fetch-proxy-setup.d.ts.map +1 -1
  319. package/dist/utils/fetch-proxy-setup.js +10 -6
  320. package/dist/utils/fetch-proxy-setup.js.map +1 -1
  321. package/dist/utils/hooks/image-analysis-backend-resolver.d.ts.map +1 -1
  322. package/dist/utils/hooks/image-analysis-backend-resolver.js +6 -0
  323. package/dist/utils/hooks/image-analysis-backend-resolver.js.map +1 -1
  324. package/dist/utils/hooks/image-analysis-runtime-status.d.ts.map +1 -1
  325. package/dist/utils/hooks/image-analysis-runtime-status.js +8 -3
  326. package/dist/utils/hooks/image-analysis-runtime-status.js.map +1 -1
  327. package/dist/utils/package-manager-detector.d.ts.map +1 -1
  328. package/dist/utils/package-manager-detector.js +6 -2
  329. package/dist/utils/package-manager-detector.js.map +1 -1
  330. package/dist/utils/shell-executor.d.ts +1 -1
  331. package/dist/utils/shell-executor.d.ts.map +1 -1
  332. package/dist/utils/shell-executor.js +5 -8
  333. package/dist/utils/shell-executor.js.map +1 -1
  334. package/dist/utils/sync-lock-retry.d.ts +9 -0
  335. package/dist/utils/sync-lock-retry.d.ts.map +1 -0
  336. package/dist/utils/sync-lock-retry.js +107 -0
  337. package/dist/utils/sync-lock-retry.js.map +1 -0
  338. package/dist/utils/websearch/agy.d.ts +3 -1
  339. package/dist/utils/websearch/agy.d.ts.map +1 -1
  340. package/dist/utils/websearch/agy.js +33 -23
  341. package/dist/utils/websearch/agy.js.map +1 -1
  342. package/dist/utils/websearch/claude-tool-args.d.ts +1 -1
  343. package/dist/utils/websearch/claude-tool-args.d.ts.map +1 -1
  344. package/dist/utils/websearch/claude-tool-args.js +3 -2
  345. package/dist/utils/websearch/claude-tool-args.js.map +1 -1
  346. package/dist/utils/websearch/gemini-cli.d.ts +3 -1
  347. package/dist/utils/websearch/gemini-cli.d.ts.map +1 -1
  348. package/dist/utils/websearch/gemini-cli.js +33 -23
  349. package/dist/utils/websearch/gemini-cli.js.map +1 -1
  350. package/dist/utils/websearch/grok-cli.d.ts +3 -1
  351. package/dist/utils/websearch/grok-cli.d.ts.map +1 -1
  352. package/dist/utils/websearch/grok-cli.js +33 -23
  353. package/dist/utils/websearch/grok-cli.js.map +1 -1
  354. package/dist/utils/websearch/hook-config.d.ts +2 -1
  355. package/dist/utils/websearch/hook-config.d.ts.map +1 -1
  356. package/dist/utils/websearch/hook-config.js +1 -2
  357. package/dist/utils/websearch/hook-config.js.map +1 -1
  358. package/dist/utils/websearch/hook-env.d.ts +2 -1
  359. package/dist/utils/websearch/hook-env.d.ts.map +1 -1
  360. package/dist/utils/websearch/hook-env.js +1 -2
  361. package/dist/utils/websearch/hook-env.js.map +1 -1
  362. package/dist/utils/websearch/hook-installer.d.ts +2 -1
  363. package/dist/utils/websearch/hook-installer.d.ts.map +1 -1
  364. package/dist/utils/websearch/hook-installer.js +1 -2
  365. package/dist/utils/websearch/hook-installer.js.map +1 -1
  366. package/dist/utils/websearch/index.d.ts +2 -0
  367. package/dist/utils/websearch/index.d.ts.map +1 -1
  368. package/dist/utils/websearch/index.js +3 -1
  369. package/dist/utils/websearch/index.js.map +1 -1
  370. package/dist/utils/websearch/launch-state.d.ts +9 -0
  371. package/dist/utils/websearch/launch-state.d.ts.map +1 -0
  372. package/dist/utils/websearch/launch-state.js +15 -0
  373. package/dist/utils/websearch/launch-state.js.map +1 -0
  374. package/dist/utils/websearch/mcp-installer.d.ts +6 -5
  375. package/dist/utils/websearch/mcp-installer.d.ts.map +1 -1
  376. package/dist/utils/websearch/mcp-installer.js +10 -15
  377. package/dist/utils/websearch/mcp-installer.js.map +1 -1
  378. package/dist/utils/websearch/opencode-cli.d.ts +3 -1
  379. package/dist/utils/websearch/opencode-cli.d.ts.map +1 -1
  380. package/dist/utils/websearch/opencode-cli.js +33 -23
  381. package/dist/utils/websearch/opencode-cli.js.map +1 -1
  382. package/dist/utils/websearch/status.d.ts +7 -3
  383. package/dist/utils/websearch/status.d.ts.map +1 -1
  384. package/dist/utils/websearch/status.js +50 -31
  385. package/dist/utils/websearch/status.js.map +1 -1
  386. package/dist/utils/websearch-manager.d.ts +2 -0
  387. package/dist/utils/websearch-manager.d.ts.map +1 -1
  388. package/dist/utils/websearch-manager.js +3 -1
  389. package/dist/utils/websearch-manager.js.map +1 -1
  390. package/dist/web-server/model-pricing.d.ts.map +1 -1
  391. package/dist/web-server/model-pricing.js +43 -10
  392. package/dist/web-server/model-pricing.js.map +1 -1
  393. package/dist/web-server/routes/bar-routes.d.ts.map +1 -1
  394. package/dist/web-server/routes/bar-routes.js +15 -10
  395. package/dist/web-server/routes/bar-routes.js.map +1 -1
  396. package/dist/web-server/routes/cliproxy-routing-routes.d.ts.map +1 -1
  397. package/dist/web-server/routes/cliproxy-routing-routes.js +28 -0
  398. package/dist/web-server/routes/cliproxy-routing-routes.js.map +1 -1
  399. package/dist/web-server/routes/settings-routes.d.ts.map +1 -1
  400. package/dist/web-server/routes/settings-routes.js +1 -0
  401. package/dist/web-server/routes/settings-routes.js.map +1 -1
  402. package/dist/web-server/services/cliproxy-dashboard-install-service.d.ts +5 -0
  403. package/dist/web-server/services/cliproxy-dashboard-install-service.d.ts.map +1 -1
  404. package/dist/web-server/services/cliproxy-dashboard-install-service.js +53 -36
  405. package/dist/web-server/services/cliproxy-dashboard-install-service.js.map +1 -1
  406. package/dist/web-server/usage/claude-native-credentials.d.ts +23 -2
  407. package/dist/web-server/usage/claude-native-credentials.d.ts.map +1 -1
  408. package/dist/web-server/usage/claude-native-credentials.js +78 -14
  409. package/dist/web-server/usage/claude-native-credentials.js.map +1 -1
  410. package/dist/web-server/usage/native-quota-collector.d.ts +10 -9
  411. package/dist/web-server/usage/native-quota-collector.d.ts.map +1 -1
  412. package/dist/web-server/usage/native-quota-collector.js +113 -42
  413. package/dist/web-server/usage/native-quota-collector.js.map +1 -1
  414. package/lib/ccs +1 -1
  415. package/lib/ccs.ps1 +1 -1
  416. package/package.json +6 -2
  417. package/scripts/ci-parity-gate.sh +4 -30
  418. package/scripts/completion/ccs.bash +1 -1
  419. package/scripts/completion/ccs.fish +1 -1
  420. package/scripts/completion/ccs.ps1 +1 -1
  421. package/scripts/completion/ccs.zsh +1 -1
  422. package/scripts/dev-release.sh +1 -1
  423. package/scripts/hardening-inventory.js +37 -4
  424. package/scripts/maintainability-metrics.js +2 -8
  425. package/scripts/run-test-bucket.js +1 -0
  426. package/scripts/runtime-source-classifier.js +12 -0
  427. package/dist/ui/assets/cliproxy-CXDOPGj3.js +0 -4
  428. package/dist/ui/assets/index-EnTQAKOi.js +0 -56
  429. package/dist/ui/assets/proxy-status-widget-D87qCiqo.js +0 -1
@@ -2,6 +2,7 @@
2
2
  * CLIProxy configuration types (config.yaml, executor, proxy resolution)
3
3
  */
4
4
  import type { CompositeTierConfig } from '../../config/unified-config-types';
5
+ import type { CLIProxyOAuthModelAliasConfig, CLIProxyPayloadConfig } from '../../config/schemas/cliproxy';
5
6
  import type { CliproxyRoutingStrategy } from './provider-types';
6
7
  /** CLIProxy config.yaml structure (minimal) */
7
8
  export interface CLIProxyConfig {
@@ -9,6 +10,8 @@ export interface CLIProxyConfig {
9
10
  'api-keys': string[];
10
11
  'auth-dir': string;
11
12
  debug: boolean;
13
+ 'oauth-model-alias'?: CLIProxyOAuthModelAliasConfig;
14
+ payload?: CLIProxyPayloadConfig;
12
15
  routing?: {
13
16
  strategy?: CliproxyRoutingStrategy;
14
17
  'session-affinity'?: boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"config-types.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/types/config-types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config-types.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/types/config-types.ts"],"names":[],"mappings":"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"}
@@ -16,4 +16,6 @@ export declare function detectShell(env?: NodeJS.ProcessEnv, platform?: string,
16
16
  * Used by use-command to emit eval-safe lines.
17
17
  */
18
18
  export declare function formatExport(shell: Shell, key: string, value: string): string;
19
+ /** Format removal of one environment variable for the target shell. */
20
+ export declare function formatUnset(shell: Shell, key: string): string;
19
21
  //# sourceMappingURL=shell-detect.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"shell-detect.d.ts","sourceRoot":"","sources":["../../src/codex-auth/shell-detect.ts"],"names":[],"mappings":"AAAA;;;GAGG;;;AAEH,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC;AAE7D;;;;GAIG;AACH,wBAAgB,WAAW,CACzB,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,QAAQ,GAAE,MAAyB,EACnC,iBAAiB,CAAC,EAAE,MAAM,GACzB,KAAK,CAaP;AAmDD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAY7E"}
1
+ {"version":3,"file":"shell-detect.d.ts","sourceRoot":"","sources":["../../src/codex-auth/shell-detect.ts"],"names":[],"mappings":"AAAA;;;GAGG;;;AAEH,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC;AAE7D;;;;GAIG;AACH,wBAAgB,WAAW,CACzB,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,QAAQ,GAAE,MAAyB,EACnC,iBAAiB,CAAC,EAAE,MAAM,GACzB,KAAK,CAaP;AAmDD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAY7E;AAED,uEAAuE;AACvE,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAW7D"}
@@ -4,7 +4,7 @@
4
4
  * Determines current shell to emit correct eval-safe export syntax.
5
5
  */
6
6
  Object.defineProperty(exports, "__esModule", { value: true });
7
- exports.formatExport = exports.detectShell = void 0;
7
+ exports.formatUnset = exports.formatExport = exports.detectShell = void 0;
8
8
  /**
9
9
  * Detect current shell from environment.
10
10
  * On Windows: inspect explicit shell executable hints, else default to cmd.
@@ -88,4 +88,18 @@ function formatExport(shell, key, value) {
88
88
  }
89
89
  }
90
90
  exports.formatExport = formatExport;
91
+ /** Format removal of one environment variable for the target shell. */
92
+ function formatUnset(shell, key) {
93
+ switch (shell) {
94
+ case 'fish':
95
+ return `set -e ${key};`;
96
+ case 'pwsh':
97
+ return `Remove-Item Env:${key} -ErrorAction SilentlyContinue`;
98
+ case 'cmd':
99
+ return `set "${key}="`;
100
+ default:
101
+ return `unset ${key}`;
102
+ }
103
+ }
104
+ exports.formatUnset = formatUnset;
91
105
  //# sourceMappingURL=shell-detect.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"shell-detect.js","sourceRoot":"","sources":["../../src/codex-auth/shell-detect.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAIH;;;;GAIG;AACH,SAAgB,WAAW,CACzB,MAAyB,OAAO,CAAC,GAAG,EACpC,WAAmB,OAAO,CAAC,QAAQ,EACnC,iBAA0B;IAE1B,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzB,OAAO,CACL,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC;YAC9B,mBAAmB,CAAC,iBAAiB,CAAC;YACtC,mBAAmB,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC;YAC/C,KAAK,CACN,CAAC;IACJ,CAAC;IACD,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IAC3C,IAAI,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;QAAE,OAAO,MAAM,CAAC;IACxC,IAAI,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IACtC,OAAO,MAAM,CAAC,CAAC,kCAAkC;AACnD,CAAC;AAjBD,kCAiBC;AAED,SAAS,mBAAmB,CAAC,KAAyB;IACpD,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,MAAM,IAAI,GAAG,KAAK;SACf,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;SAC3B,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;SACnB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,EAAE;QACN,EAAE,WAAW,EAAE;SACd,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;IAExC,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,MAAM,CAAC;QACZ,KAAK,KAAK,CAAC;QACX,KAAK,MAAM,CAAC;QACZ,KAAK,KAAK;YACR,OAAO,IAAI,CAAC;QACd,KAAK,MAAM,CAAC;QACZ,KAAK,YAAY;YACf,OAAO,MAAM,CAAC;QAChB;YACE,OAAO,IAAI,CAAC;IAChB,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,gBAAgB,CAAC,KAAa;IACrC,OAAO,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,GAAG,CAAC;AAClD,CAAC;AAED;;;;GAIG;AACH,SAAS,eAAe,CAAC,KAAa;IACpC,OAAO,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC;AACxF,CAAC;AAED;;;GAGG;AACH,SAAS,WAAW,CAAC,KAAa;IAChC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACjG,CAAC;AAED;;;GAGG;AACH,SAAgB,YAAY,CAAC,KAAY,EAAE,GAAW,EAAE,KAAa;IACnE,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,MAAM;YACT,OAAO,WAAW,GAAG,IAAI,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC;QACtD,KAAK,MAAM;YACT,OAAO,QAAQ,GAAG,MAAM,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;QACnD,KAAK,KAAK;YACR,OAAO,QAAQ,GAAG,IAAI,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC;QAC9C;YACE,aAAa;YACb,OAAO,UAAU,GAAG,IAAI,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;IACtD,CAAC;AACH,CAAC;AAZD,oCAYC"}
1
+ {"version":3,"file":"shell-detect.js","sourceRoot":"","sources":["../../src/codex-auth/shell-detect.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,43 @@
1
+ export interface BarServerProcessRecord {
2
+ pid: number;
3
+ birthIdentity: string;
4
+ }
5
+ export type BarServerStopResult = 'stopped' | 'stale' | 'legacy-record' | 'invalid-record' | 'identity-mismatch' | 'permission-denied' | 'signal-failed' | 'timeout';
6
+ export interface BarServerStopDeps {
7
+ getProcessBirthIdentity: (pid: number) => string | null;
8
+ killProcess: (pid: number, signal: 'SIGTERM') => void;
9
+ waitForProcessExit: (pid: number, birthIdentity: string, timeoutMs: number) => Promise<'exited' | 'identity-mismatch' | 'timeout'>;
10
+ }
11
+ export declare function parseBarServerProcessRecord(raw: string): BarServerProcessRecord | null;
12
+ export declare function parseLegacyServerPid(raw: string): number | null;
13
+ export declare function serializeBarServerProcessRecord(record: BarServerProcessRecord): string;
14
+ /**
15
+ * Return the OS process birth marker for PID reuse protection. CCS Bar is a
16
+ * macOS app, where `ps lstart` is stable for a process lifetime. Linux uses the
17
+ * same portable ps surface in development and CI.
18
+ */
19
+ export declare function getProcessBirthIdentity(pid: number): string | null;
20
+ export declare function waitForProcessExit(pid: number, birthIdentity: string, timeoutMs: number): Promise<'exited' | 'identity-mismatch' | 'timeout'>;
21
+ export declare function stopRecordedBarServer(rawRecord: string, deps?: Partial<BarServerStopDeps>): Promise<{
22
+ result: BarServerStopResult;
23
+ record: BarServerProcessRecord | null;
24
+ error?: Error;
25
+ }>;
26
+ export interface ClaimedBarServerStopOutcome {
27
+ result: BarServerStopResult | 'no-record';
28
+ record: BarServerProcessRecord | null;
29
+ legacyPid?: number;
30
+ error?: Error;
31
+ recoveryPath?: string;
32
+ }
33
+ /**
34
+ * Atomically claim server.pid before signaling. The serve process therefore
35
+ * sees ENOENT during its signal handler and cannot unlink a new owner's record.
36
+ */
37
+ export declare function stopBarServerProcessFile(pidPath: string, deps?: Partial<BarServerStopDeps>): Promise<ClaimedBarServerStopOutcome>;
38
+ /** Remove server.pid only when it still belongs to this exact serve process. */
39
+ export declare function removeBarServerProcessRecordIfOwned(pidPath: string, expectedRecord: BarServerProcessRecord): void;
40
+ /** Claim stale discovery state so a replacement write can never be unlinked. */
41
+ export declare function removeBarDiscoveryIfNoProcess(barJsonPath: string, pidPath: string): boolean;
42
+ export declare function stopDetachedBarServer(ccsDir: string): Promise<void>;
43
+ //# sourceMappingURL=bar-process-control.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"bar-process-control.d.ts","sourceRoot":"","sources":["../../../src/commands/bar/bar-process-control.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,mBAAmB,GAC3B,SAAS,GACT,OAAO,GACP,eAAe,GACf,gBAAgB,GAChB,mBAAmB,GACnB,mBAAmB,GACnB,eAAe,GACf,SAAS,CAAC;AAEd,MAAM,WAAW,iBAAiB;IAChC,uBAAuB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IACxD,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,KAAK,IAAI,CAAC;IACtD,kBAAkB,EAAE,CAClB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,KACd,OAAO,CAAC,QAAQ,GAAG,mBAAmB,GAAG,SAAS,CAAC,CAAC;CAC1D;AAED,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,GAAG,IAAI,CAUtF;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAK/D;AAED,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,sBAAsB,GAAG,MAAM,CAEtF;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAWlE;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,QAAQ,GAAG,mBAAmB,GAAG,SAAS,CAAC,CASrD;AAED,wBAAsB,qBAAqB,CACzC,SAAS,EAAE,MAAM,EACjB,IAAI,GAAE,OAAO,CAAC,iBAAiB,CAAM,GACpC,OAAO,CAAC;IAAE,MAAM,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC,CAiChG;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,mBAAmB,GAAG,WAAW,CAAC;IAC1C,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AA4BD;;;GAGG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,OAAO,CAAC,iBAAiB,CAAM,GACpC,OAAO,CAAC,2BAA2B,CAAC,CAqCtC;AAED,gFAAgF;AAChF,wBAAgB,mCAAmC,CACjD,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,sBAAsB,GACrC,IAAI,CAwBN;AAED,gFAAgF;AAChF,wBAAgB,6BAA6B,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAc3F;AAED,wBAAsB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBzE"}
@@ -0,0 +1,255 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ exports.stopDetachedBarServer = exports.removeBarDiscoveryIfNoProcess = exports.removeBarServerProcessRecordIfOwned = exports.stopBarServerProcessFile = exports.stopRecordedBarServer = exports.waitForProcessExit = exports.getProcessBirthIdentity = exports.serializeBarServerProcessRecord = exports.parseLegacyServerPid = exports.parseBarServerProcessRecord = void 0;
27
+ const child_process_1 = require("child_process");
28
+ const fs = __importStar(require("fs"));
29
+ const error_types_1 = require("../../errors/error-types");
30
+ const bar_paths_1 = require("./bar-paths");
31
+ function parseBarServerProcessRecord(raw) {
32
+ try {
33
+ const parsed = JSON.parse(raw);
34
+ const pid = parsed.pid;
35
+ if (!Number.isSafeInteger(pid) || (pid ?? 0) <= 0)
36
+ return null;
37
+ if (typeof parsed.birthIdentity !== 'string' || parsed.birthIdentity.trim() === '')
38
+ return null;
39
+ return { pid: pid, birthIdentity: parsed.birthIdentity };
40
+ }
41
+ catch {
42
+ return null;
43
+ }
44
+ }
45
+ exports.parseBarServerProcessRecord = parseBarServerProcessRecord;
46
+ function parseLegacyServerPid(raw) {
47
+ const trimmed = raw.trim();
48
+ if (!/^[1-9]\d*$/.test(trimmed))
49
+ return null;
50
+ const pid = Number(trimmed);
51
+ return Number.isSafeInteger(pid) ? pid : null;
52
+ }
53
+ exports.parseLegacyServerPid = parseLegacyServerPid;
54
+ function serializeBarServerProcessRecord(record) {
55
+ return JSON.stringify(record, null, 2);
56
+ }
57
+ exports.serializeBarServerProcessRecord = serializeBarServerProcessRecord;
58
+ /**
59
+ * Return the OS process birth marker for PID reuse protection. CCS Bar is a
60
+ * macOS app, where `ps lstart` is stable for a process lifetime. Linux uses the
61
+ * same portable ps surface in development and CI.
62
+ */
63
+ function getProcessBirthIdentity(pid) {
64
+ if (!Number.isSafeInteger(pid) || pid <= 0)
65
+ return null;
66
+ try {
67
+ const output = (0, child_process_1.execFileSync)('ps', ['-p', String(pid), '-o', 'lstart='], {
68
+ encoding: 'utf8',
69
+ stdio: ['ignore', 'pipe', 'ignore'],
70
+ }).trim();
71
+ return output || null;
72
+ }
73
+ catch {
74
+ return null;
75
+ }
76
+ }
77
+ exports.getProcessBirthIdentity = getProcessBirthIdentity;
78
+ async function waitForProcessExit(pid, birthIdentity, timeoutMs) {
79
+ const deadline = Date.now() + timeoutMs;
80
+ while (Date.now() < deadline) {
81
+ const currentIdentity = getProcessBirthIdentity(pid);
82
+ if (currentIdentity === null)
83
+ return 'exited';
84
+ if (currentIdentity !== birthIdentity)
85
+ return 'identity-mismatch';
86
+ await new Promise((resolve) => setTimeout(resolve, 100));
87
+ }
88
+ return 'timeout';
89
+ }
90
+ exports.waitForProcessExit = waitForProcessExit;
91
+ async function stopRecordedBarServer(rawRecord, deps = {}) {
92
+ const record = parseBarServerProcessRecord(rawRecord);
93
+ if (record === null) {
94
+ return {
95
+ result: parseLegacyServerPid(rawRecord) === null ? 'invalid-record' : 'legacy-record',
96
+ record: null,
97
+ };
98
+ }
99
+ const getIdentity = deps.getProcessBirthIdentity ?? getProcessBirthIdentity;
100
+ const killProcess = deps.killProcess ?? ((pid, signal) => process.kill(pid, signal));
101
+ const waitForExit = deps.waitForProcessExit ?? waitForProcessExit;
102
+ // Revalidate immediately before SIGTERM. A PID alone is unsafe because the OS
103
+ // can reuse it after the recorded CCS Bar process exits.
104
+ const currentIdentity = getIdentity(record.pid);
105
+ if (currentIdentity === null)
106
+ return { result: 'stale', record };
107
+ if (currentIdentity !== record.birthIdentity)
108
+ return { result: 'identity-mismatch', record };
109
+ try {
110
+ killProcess(record.pid, 'SIGTERM');
111
+ }
112
+ catch (err) {
113
+ const error = err instanceof Error ? err : new Error(String(err));
114
+ const code = err.code;
115
+ if (code === 'ESRCH')
116
+ return { result: 'stale', record };
117
+ if (code === 'EPERM')
118
+ return { result: 'permission-denied', record, error };
119
+ return { result: 'signal-failed', record, error };
120
+ }
121
+ const waitResult = await waitForExit(record.pid, record.birthIdentity, 3000);
122
+ if (waitResult === 'exited')
123
+ return { result: 'stopped', record };
124
+ if (waitResult === 'identity-mismatch')
125
+ return { result: 'identity-mismatch', record };
126
+ return { result: 'timeout', record };
127
+ }
128
+ exports.stopRecordedBarServer = stopRecordedBarServer;
129
+ function isErrno(err, code) {
130
+ return err.code === code;
131
+ }
132
+ function unlinkIfPresent(filePath) {
133
+ try {
134
+ fs.unlinkSync(filePath);
135
+ }
136
+ catch (err) {
137
+ if (!isErrno(err, 'ENOENT'))
138
+ throw err;
139
+ }
140
+ }
141
+ function restoreClaimWithoutOverwrite(claimPath, canonicalPath) {
142
+ try {
143
+ fs.linkSync(claimPath, canonicalPath);
144
+ unlinkIfPresent(claimPath);
145
+ return undefined;
146
+ }
147
+ catch (err) {
148
+ if (isErrno(err, 'EEXIST'))
149
+ return claimPath;
150
+ throw err;
151
+ }
152
+ }
153
+ /**
154
+ * Atomically claim server.pid before signaling. The serve process therefore
155
+ * sees ENOENT during its signal handler and cannot unlink a new owner's record.
156
+ */
157
+ async function stopBarServerProcessFile(pidPath, deps = {}) {
158
+ const claimPath = `${pidPath}.claim-${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2)}`;
159
+ try {
160
+ fs.renameSync(pidPath, claimPath);
161
+ }
162
+ catch (err) {
163
+ if (isErrno(err, 'ENOENT'))
164
+ return { result: 'no-record', record: null };
165
+ throw err;
166
+ }
167
+ let rawRecord;
168
+ try {
169
+ rawRecord = fs.readFileSync(claimPath, 'utf8').trim();
170
+ }
171
+ catch (err) {
172
+ const recoveryPath = restoreClaimWithoutOverwrite(claimPath, pidPath);
173
+ return {
174
+ result: 'invalid-record',
175
+ record: null,
176
+ error: err instanceof Error ? err : new Error(String(err)),
177
+ recoveryPath,
178
+ };
179
+ }
180
+ const outcome = await stopRecordedBarServer(rawRecord, deps);
181
+ if (outcome.result === 'stopped' || outcome.result === 'stale') {
182
+ unlinkIfPresent(claimPath);
183
+ return outcome;
184
+ }
185
+ const recoveryPath = restoreClaimWithoutOverwrite(claimPath, pidPath);
186
+ return {
187
+ ...outcome,
188
+ legacyPid: outcome.result === 'legacy-record'
189
+ ? (parseLegacyServerPid(rawRecord) ?? undefined)
190
+ : undefined,
191
+ recoveryPath,
192
+ };
193
+ }
194
+ exports.stopBarServerProcessFile = stopBarServerProcessFile;
195
+ /** Remove server.pid only when it still belongs to this exact serve process. */
196
+ function removeBarServerProcessRecordIfOwned(pidPath, expectedRecord) {
197
+ const claimPath = `${pidPath}.cleanup-${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2)}`;
198
+ try {
199
+ fs.renameSync(pidPath, claimPath);
200
+ }
201
+ catch (err) {
202
+ if (isErrno(err, 'ENOENT'))
203
+ return;
204
+ throw err;
205
+ }
206
+ let claimedRecord = null;
207
+ try {
208
+ claimedRecord = parseBarServerProcessRecord(fs.readFileSync(claimPath, 'utf8'));
209
+ }
210
+ catch {
211
+ // Preserve unreadable state below.
212
+ }
213
+ if (claimedRecord?.pid === expectedRecord.pid &&
214
+ claimedRecord.birthIdentity === expectedRecord.birthIdentity) {
215
+ unlinkIfPresent(claimPath);
216
+ return;
217
+ }
218
+ restoreClaimWithoutOverwrite(claimPath, pidPath);
219
+ }
220
+ exports.removeBarServerProcessRecordIfOwned = removeBarServerProcessRecordIfOwned;
221
+ /** Claim stale discovery state so a replacement write can never be unlinked. */
222
+ function removeBarDiscoveryIfNoProcess(barJsonPath, pidPath) {
223
+ const claimPath = `${barJsonPath}.cleanup-${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2)}`;
224
+ try {
225
+ fs.renameSync(barJsonPath, claimPath);
226
+ }
227
+ catch (err) {
228
+ if (isErrno(err, 'ENOENT'))
229
+ return true;
230
+ throw err;
231
+ }
232
+ if (fs.existsSync(pidPath)) {
233
+ restoreClaimWithoutOverwrite(claimPath, barJsonPath);
234
+ return false;
235
+ }
236
+ unlinkIfPresent(claimPath);
237
+ return true;
238
+ }
239
+ exports.removeBarDiscoveryIfNoProcess = removeBarDiscoveryIfNoProcess;
240
+ async function stopDetachedBarServer(ccsDir) {
241
+ const pidPath = (0, bar_paths_1.getServerPidPath)(ccsDir);
242
+ try {
243
+ const outcome = await stopBarServerProcessFile(pidPath);
244
+ if (outcome.result !== 'stopped' && outcome.result !== 'stale') {
245
+ throw new error_types_1.ConfigError(`Safe CCS Bar stop aborted (${outcome.result}); recovery state was preserved`, outcome.recoveryPath ?? pidPath);
246
+ }
247
+ }
248
+ catch (err) {
249
+ if (err instanceof error_types_1.ConfigError)
250
+ throw err;
251
+ throw new error_types_1.ConfigError(`Cannot safely stop CCS Bar process: ${err instanceof Error ? err.message : String(err)}`, pidPath);
252
+ }
253
+ }
254
+ exports.stopDetachedBarServer = stopDetachedBarServer;
255
+ //# sourceMappingURL=bar-process-control.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"bar-process-control.js","sourceRoot":"","sources":["../../../src/commands/bar/bar-process-control.ts"],"names":[],"mappings":"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"}
@@ -11,8 +11,11 @@ export interface DashboardInfo {
11
11
  authRequired?: boolean;
12
12
  }
13
13
  /**
14
- * Read the port recorded in an existing bar.json.
15
- * Returns null when the file is absent or malformed.
14
+ * Read the port recorded in an existing bar.json, falling back to the --port
15
+ * in launch.json's args. `ccs bar stop` deletes bar.json but leaves
16
+ * launch.json, so the fallback is what keeps the sticky port (and the probe's
17
+ * ability to find a server on a non-default port) across a stop/start cycle.
18
+ * Returns null when neither file records a port.
16
19
  */
17
20
  export declare function resolveBarPort(ccsDir: string): number | null;
18
21
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"bar-server-probe.d.ts","sourceRoot":"","sources":["../../../src/commands/bar/bar-server-probe.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAeH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;GAGG;AAEH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAS5D;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAiG5F"}
1
+ {"version":3,"file":"bar-server-probe.d.ts","sourceRoot":"","sources":["../../../src/commands/bar/bar-server-probe.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAeH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAMD;;;;;;GAMG;AAEH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA2B5D;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAiG5F"}
@@ -36,20 +36,46 @@ const path = __importStar(require("path"));
36
36
  const bar_auth_token_1 = require("../../utils/bar-auth-token");
37
37
  const PROBE_TIMEOUT_MS = 1500;
38
38
  const MAX_PROBE_RESPONSE_BYTES = 8192;
39
+ function isValidPort(value) {
40
+ return Number.isSafeInteger(value) && value >= 1 && value <= 65535;
41
+ }
39
42
  /**
40
- * Read the port recorded in an existing bar.json.
41
- * Returns null when the file is absent or malformed.
43
+ * Read the port recorded in an existing bar.json, falling back to the --port
44
+ * in launch.json's args. `ccs bar stop` deletes bar.json but leaves
45
+ * launch.json, so the fallback is what keeps the sticky port (and the probe's
46
+ * ability to find a server on a non-default port) across a stop/start cycle.
47
+ * Returns null when neither file records a port.
42
48
  */
43
49
  function resolveBarPort(ccsDir) {
44
50
  const barJsonPath = path.join(ccsDir, 'bar.json');
45
51
  try {
46
52
  const raw = fs.readFileSync(barJsonPath, 'utf8');
47
53
  const parsed = JSON.parse(raw);
48
- return typeof parsed.port === 'number' ? parsed.port : null;
54
+ if (isValidPort(parsed.port))
55
+ return parsed.port;
56
+ }
57
+ catch {
58
+ /* fall through to launch.json */
59
+ }
60
+ const launchJsonPath = path.join(ccsDir, 'bar', 'launch.json');
61
+ try {
62
+ const raw = fs.readFileSync(launchJsonPath, 'utf8');
63
+ const parsed = JSON.parse(raw);
64
+ const args = Array.isArray(parsed.args) ? parsed.args : [];
65
+ const idx = args.indexOf('--port');
66
+ if (idx !== -1 && idx + 1 < args.length) {
67
+ const rawPort = args[idx + 1];
68
+ if (typeof rawPort === 'string' && /^[1-9]\d{0,4}$/.test(rawPort)) {
69
+ const n = Number(rawPort);
70
+ if (isValidPort(n))
71
+ return n;
72
+ }
73
+ }
49
74
  }
50
75
  catch {
51
- return null;
76
+ /* absent or malformed -> null */
52
77
  }
78
+ return null;
53
79
  }
54
80
  exports.resolveBarPort = resolveBarPort;
55
81
  /**
@@ -94,16 +120,16 @@ async function defaultFindRunningServer(ccsDir) {
94
120
  // loopback service that streams forever cannot block discovery from
95
121
  // returning a higher-priority hit.
96
122
  socket.destroy();
97
- const authRequired = statusCode === 401 || statusCode === 403;
123
+ const proofMatch = headerSection.match(new RegExp(`${bar_auth_token_1.BAR_AUTH_TOKEN_HEADER}:\\s*([^\\r\\n]+)`, 'i'));
124
+ const proof = proofMatch ? proofMatch[1].trim() : '';
125
+ const tokenMatched = (0, bar_auth_token_1.isMatchingBarAuthProof)(token, nonce, proof);
126
+ const authRequired = (statusCode === 401 || statusCode === 403) && tokenMatched;
98
127
  if (authRequired) {
99
128
  resolve({ ok: true, authRequired: true });
100
129
  return;
101
130
  }
102
131
  if (statusCode === 200) {
103
- // Accept only when the server includes a correct nonce-bound proof.
104
- const echoMatch = headerSection.match(new RegExp(`${bar_auth_token_1.BAR_AUTH_TOKEN_HEADER}:\\s*([^\\r\\n]+)`, 'i'));
105
- const proof = echoMatch ? echoMatch[1].trim() : '';
106
- resolve({ ok: (0, bar_auth_token_1.isMatchingBarAuthProof)(token, nonce, proof), authRequired: false });
132
+ resolve({ ok: tokenMatched, authRequired: false });
107
133
  return;
108
134
  }
109
135
  resolve({ ok: false, authRequired: false });
@@ -123,12 +149,12 @@ async function defaultFindRunningServer(ccsDir) {
123
149
  const statusMatch = rawResponse.match(/^HTTP\/\d(?:\.\d)?\s+(\d{3})/);
124
150
  if (statusMatch) {
125
151
  const code = Number(statusMatch[1]);
126
- // For non-200 we can finish on the status line alone.
127
- if (code !== 200) {
152
+ // CCS-authenticated 401/403 responses also carry the nonce proof, so
153
+ // wait for their complete headers before deciding identity.
154
+ if (code !== 200 && code !== 401 && code !== 403) {
128
155
  finish(code, rawResponse);
129
156
  return;
130
157
  }
131
- // For 200 we need the headers section to extract the token.
132
158
  if (rawResponse.includes('\r\n\r\n')) {
133
159
  finish(code, rawResponse.split('\r\n\r\n')[0]);
134
160
  }
@@ -1 +1 @@
1
- {"version":3,"file":"bar-server-probe.js","sourceRoot":"","sources":["../../../src/commands/bar/bar-server-probe.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bar-server-probe.js","sourceRoot":"","sources":["../../../src/commands/bar/bar-server-probe.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"help-subcommand.d.ts","sourceRoot":"","sources":["../../../src/commands/bar/help-subcommand.ts"],"names":[],"mappings":"AAEA,wBAAsB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CA0E9C"}
1
+ {"version":3,"file":"help-subcommand.d.ts","sourceRoot":"","sources":["../../../src/commands/bar/help-subcommand.ts"],"names":[],"mappings":"AAEA,wBAAsB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CA4E9C"}
@@ -26,6 +26,7 @@ async function showHelp() {
26
26
  [
27
27
  'Options:',
28
28
  [
29
+ ['--port <n>', 'Run the server on this port (persists; later launches keep the same port)'],
29
30
  ['--help, -h', 'Show this help message'],
30
31
  ['--version', 'Show CLI and installed app versions'],
31
32
  ],
@@ -45,6 +46,7 @@ async function showHelp() {
45
46
  'Examples:',
46
47
  [
47
48
  ['ccs bar', 'Start the server detached and open CCS Bar'],
49
+ ['ccs bar --port 3999', 'Start (or move) the server on port 3999 instead of 3000'],
48
50
  ['ccs bar stop', 'Stop the detached CCS Bar server'],
49
51
  ['ccs bar status', 'Show server running state and PID'],
50
52
  ['ccs bar install', 'Download and install CCS Bar, then prompt to launch'],
@@ -1 +1 @@
1
- {"version":3,"file":"help-subcommand.js","sourceRoot":"","sources":["../../../src/commands/bar/help-subcommand.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"help-subcommand.js","sourceRoot":"","sources":["../../../src/commands/bar/help-subcommand.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/bar/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA4DpE"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/bar/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAqEpE"}
@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
35
35
  Object.defineProperty(exports, "__esModule", { value: true });
36
36
  exports.handleBarCommand = void 0;
37
37
  const arg_extractor_1 = require("../arg-extractor");
38
+ const port_arg_1 = require("./port-arg");
38
39
  async function handleBarCommand(args) {
39
40
  const subcommand = args[0];
40
41
  // --help / -h anywhere in args (e.g. `ccs bar install --help`) → show help.
@@ -76,9 +77,18 @@ async function handleBarCommand(args) {
76
77
  await handleBarUninstall(subArgs);
77
78
  },
78
79
  };
79
- // Bare `ccs bar` → launch
80
- if (!subcommand || subcommand === 'launch') {
81
- await commandHandlers.launch(subcommand ? args.slice(1) : []);
80
+ // Bare `ccs bar` → launch. Bare flags (e.g. `ccs bar --port 3999`) also go to
81
+ // launch with the full arg list preserved (--help/--version were handled above).
82
+ if (!subcommand || subcommand === 'launch' || subcommand.startsWith('-')) {
83
+ const launchArgs = subcommand === 'launch' ? args.slice(1) : args;
84
+ const argError = (0, port_arg_1.validatePortArgs)(launchArgs);
85
+ if (argError !== null) {
86
+ console.error(`[X] ${argError}`);
87
+ console.error('[i] Usage: ccs bar [--port N]');
88
+ process.exitCode = 1;
89
+ return;
90
+ }
91
+ await commandHandlers.launch(launchArgs);
82
92
  return;
83
93
  }
84
94
  const handler = commandHandlers[subcommand];
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/bar/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,oDAA8C;AAEvC,KAAK,UAAU,gBAAgB,CAAC,IAAc;IACnD,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAE3B,4EAA4E;IAC5E,qDAAqD;IACrD,IAAI,IAAA,0BAAU,EAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;QAChE,MAAM,EAAE,QAAQ,EAAE,GAAG,wDAAa,mBAAmB,GAAC,CAAC;QACvD,MAAM,QAAQ,EAAE,CAAC;QACjB,OAAO;IACT,CAAC;IAED,6DAA6D;IAC7D,IAAI,UAAU,KAAK,WAAW,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC3D,MAAM,EAAE,gBAAgB,EAAE,GAAG,wDAAa,sBAAsB,GAAC,CAAC;QAClE,MAAM,gBAAgB,EAAE,CAAC;QACzB,OAAO;IACT,CAAC;IAED,MAAM,eAAe,GAAyD;QAC5E,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACxB,MAAM,EAAE,eAAe,EAAE,GAAG,wDAAa,qBAAqB,GAAC,CAAC;YAChE,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;QACD,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACvB,MAAM,EAAE,cAAc,EAAE,GAAG,wDAAa,oBAAoB,GAAC,CAAC;YAC9D,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACtB,MAAM,EAAE,aAAa,EAAE,GAAG,wDAAa,mBAAmB,GAAC,CAAC;YAC5D,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;QAC/B,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACxB,MAAM,EAAE,eAAe,EAAE,GAAG,wDAAa,qBAAqB,GAAC,CAAC;YAChE,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACzB,MAAM,EAAE,gBAAgB,EAAE,GAAG,wDAAa,sBAAsB,GAAC,CAAC;YAClE,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;QACD,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YAC3B,MAAM,EAAE,kBAAkB,EAAE,GAAG,wDAAa,wBAAwB,GAAC,CAAC;YACtE,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;KACF,CAAC;IAEF,0BAA0B;IAC1B,IAAI,CAAC,UAAU,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC3C,MAAM,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC9D,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;IAC5C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,+BAA+B,UAAU,EAAE,CAAC,CAAC;QAC3D,OAAO,CAAC,KAAK,CAAC,gFAAgF,CAAC,CAAC;QAChG,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,OAAO;IACT,CAAC;IAED,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/B,CAAC;AA5DD,4CA4DC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/bar/index.ts"],"names":[],"mappings":"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"}