@hs-x/cli 0.3.6 → 0.3.7

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 (124) hide show
  1. package/README.md +6 -0
  2. package/dist/cli/index.d.ts.map +1 -1
  3. package/dist/cli/index.js +20 -49
  4. package/dist/cli/index.js.map +1 -1
  5. package/dist/cli/kit.d.ts.map +1 -1
  6. package/dist/cli/kit.js +1 -1
  7. package/dist/cli/kit.js.map +1 -1
  8. package/dist/cloudflare-auth.d.ts +19 -0
  9. package/dist/cloudflare-auth.d.ts.map +1 -1
  10. package/dist/cloudflare-auth.js +83 -2
  11. package/dist/cloudflare-auth.js.map +1 -1
  12. package/dist/cloudflare-oauth.d.ts.map +1 -1
  13. package/dist/cloudflare-oauth.js +18 -19
  14. package/dist/cloudflare-oauth.js.map +1 -1
  15. package/dist/cloudflare-scoped-resource.d.ts +41 -0
  16. package/dist/cloudflare-scoped-resource.d.ts.map +1 -0
  17. package/dist/cloudflare-scoped-resource.js +74 -0
  18. package/dist/cloudflare-scoped-resource.js.map +1 -0
  19. package/dist/command-catalog.d.ts +13 -0
  20. package/dist/command-catalog.d.ts.map +1 -0
  21. package/dist/command-catalog.js +49 -0
  22. package/dist/command-catalog.js.map +1 -0
  23. package/dist/commands/completion.d.ts.map +1 -1
  24. package/dist/commands/completion.js +22 -34
  25. package/dist/commands/completion.js.map +1 -1
  26. package/dist/commands/connect.d.ts.map +1 -1
  27. package/dist/commands/connect.js +97 -18
  28. package/dist/commands/connect.js.map +1 -1
  29. package/dist/commands/control-plane-read.d.ts +3 -3
  30. package/dist/commands/control-plane-read.d.ts.map +1 -1
  31. package/dist/commands/control-plane-read.js +2 -9
  32. package/dist/commands/control-plane-read.js.map +1 -1
  33. package/dist/commands/deploy-retry.d.ts +20 -0
  34. package/dist/commands/deploy-retry.d.ts.map +1 -0
  35. package/dist/commands/deploy-retry.js +106 -0
  36. package/dist/commands/deploy-retry.js.map +1 -0
  37. package/dist/commands/deploy.d.ts +11 -8
  38. package/dist/commands/deploy.d.ts.map +1 -1
  39. package/dist/commands/deploy.js +423 -272
  40. package/dist/commands/deploy.js.map +1 -1
  41. package/dist/commands/dev.d.ts.map +1 -1
  42. package/dist/commands/dev.js +43 -5
  43. package/dist/commands/dev.js.map +1 -1
  44. package/dist/commands/flags.d.ts +9 -4
  45. package/dist/commands/flags.d.ts.map +1 -1
  46. package/dist/commands/flags.js +208 -80
  47. package/dist/commands/flags.js.map +1 -1
  48. package/dist/commands/help-command.d.ts.map +1 -1
  49. package/dist/commands/help-command.js +41 -60
  50. package/dist/commands/help-command.js.map +1 -1
  51. package/dist/commands/init.d.ts.map +1 -1
  52. package/dist/commands/init.js +5 -0
  53. package/dist/commands/init.js.map +1 -1
  54. package/dist/commands/link.d.ts.map +1 -1
  55. package/dist/commands/link.js +74 -15
  56. package/dist/commands/link.js.map +1 -1
  57. package/dist/commands/secrets.d.ts +2 -2
  58. package/dist/constants.d.ts +1 -1
  59. package/dist/constants.js +1 -1
  60. package/dist/control-plane-tenant-provisioning.d.ts +24 -0
  61. package/dist/control-plane-tenant-provisioning.d.ts.map +1 -0
  62. package/dist/control-plane-tenant-provisioning.js +85 -0
  63. package/dist/control-plane-tenant-provisioning.js.map +1 -0
  64. package/dist/deploy-targets.d.ts +24 -0
  65. package/dist/deploy-targets.d.ts.map +1 -0
  66. package/dist/deploy-targets.js +38 -0
  67. package/dist/deploy-targets.js.map +1 -0
  68. package/dist/dev/compat-shim.d.ts +3 -3
  69. package/dist/dev/compat-shim.d.ts.map +1 -1
  70. package/dist/dev/compat-shim.js +28 -4
  71. package/dist/dev/compat-shim.js.map +1 -1
  72. package/dist/dev/invoke.d.ts +3 -4
  73. package/dist/dev/invoke.d.ts.map +1 -1
  74. package/dist/dev/invoke.js +9 -4
  75. package/dist/dev/invoke.js.map +1 -1
  76. package/dist/dev/loopback-http-listener.d.ts +18 -0
  77. package/dist/dev/loopback-http-listener.d.ts.map +1 -0
  78. package/dist/dev/loopback-http-listener.js +91 -0
  79. package/dist/dev/loopback-http-listener.js.map +1 -0
  80. package/dist/dev/session-manager.d.ts.map +1 -1
  81. package/dist/dev/session-manager.js +3 -2
  82. package/dist/dev/session-manager.js.map +1 -1
  83. package/dist/errors-registry.d.ts.map +1 -1
  84. package/dist/errors-registry.js +33 -0
  85. package/dist/errors-registry.js.map +1 -1
  86. package/dist/help.d.ts.map +1 -1
  87. package/dist/help.js +20 -3
  88. package/dist/help.js.map +1 -1
  89. package/dist/machine-artifact.d.ts +16 -0
  90. package/dist/machine-artifact.d.ts.map +1 -0
  91. package/dist/machine-artifact.js +18 -0
  92. package/dist/machine-artifact.js.map +1 -0
  93. package/dist/machine-id.d.ts +15 -0
  94. package/dist/machine-id.d.ts.map +1 -1
  95. package/dist/machine-id.js +53 -0
  96. package/dist/machine-id.js.map +1 -1
  97. package/dist/mutation-consent.d.ts +20 -0
  98. package/dist/mutation-consent.d.ts.map +1 -0
  99. package/dist/mutation-consent.js +9 -0
  100. package/dist/mutation-consent.js.map +1 -0
  101. package/dist/output-context.d.ts +3 -0
  102. package/dist/output-context.d.ts.map +1 -1
  103. package/dist/output-context.js +6 -0
  104. package/dist/output-context.js.map +1 -1
  105. package/dist/prompt.d.ts.map +1 -1
  106. package/dist/prompt.js +123 -48
  107. package/dist/prompt.js.map +1 -1
  108. package/dist/reporter/index.js +1 -1
  109. package/dist/reporter/index.js.map +1 -1
  110. package/dist/reporter/style.d.ts.map +1 -1
  111. package/dist/reporter/style.js +5 -0
  112. package/dist/reporter/style.js.map +1 -1
  113. package/dist/services/telemetry.d.ts +1 -2
  114. package/dist/services/telemetry.d.ts.map +1 -1
  115. package/dist/services/telemetry.js +1 -10
  116. package/dist/services/telemetry.js.map +1 -1
  117. package/dist/telemetry.d.ts.map +1 -1
  118. package/dist/telemetry.js +1 -7
  119. package/dist/telemetry.js.map +1 -1
  120. package/dist/tenant-data-plane-provisioning.d.ts +35 -0
  121. package/dist/tenant-data-plane-provisioning.d.ts.map +1 -0
  122. package/dist/tenant-data-plane-provisioning.js +38 -0
  123. package/dist/tenant-data-plane-provisioning.js.map +1 -0
  124. package/package.json +11 -11
@@ -1 +1 @@
1
- {"version":3,"file":"cloudflare-oauth.js","sourceRoot":"","sources":["../src/cloudflare-oauth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cloudflare-oauth.js","sourceRoot":"","sources":["../src/cloudflare-oauth.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,EAAE;AACF,6EAA6E;AAC7E,6EAA6E;AAC7E,yEAAyE;AACzE,oEAAoE;AACpE,EAAE;AACF,gEAAgE;AAChE,0EAA0E;AAE1E,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAA0D,YAAY,EAAE,MAAM,WAAW,CAAC;AACjG,OAAO,EACL,yBAAyB,EACzB,UAAU,EACV,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACxF,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAElG,MAAM,iCAAiC,GAAG,6BAA6B,CAAC;AAExE;;;GAGG;AACH,MAAM,uBAAuB,GAAsB;IACjD,uEAAuE;IACvE,oEAAoE;IACpE,uBAAuB;IACvB,mBAAmB;IACnB,uBAAuB;IACvB,0BAA0B;IAC1B,UAAU;IACV,4BAA4B;IAC5B,mBAAmB;IACnB,wBAAwB;CACzB,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,IAAI,CAAC;AAwBlD,MAAM,OAAO,oBAAqB,SAAQ,KAAK;IACpC,IAAI,CAAS;IACb,MAAM,CAAS;IACxB,YAAY,IAAY,EAAE,OAAe,EAAE,MAAM,GAAG,EAAE;QACpD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAC;QACnC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CACF;AAED,MAAM,yBAAyB,GAAG,KAAK,EACrC,OAAsD,EAC1C,EAAE;IACd,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAClD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QACtB,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;QAC3B,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;YACnB,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAC3C,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;gBAAE,MAAM,OAAO,CAAC,KAAK,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACvC,CAAC;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAgBF,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,QAAwC,EAAE;IAE1C,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACrC,2EAA2E;IAC3E,gDAAgD;IAChD,MAAM,WAAW,GAAG,GAAG,CAAC,8BAA8B,CAAC;IACvD,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1C,OAAO,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,6BAA6B,EAAE,WAAW,CAAC,CAAC;IACtF,CAAC;IACD,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;QAC1B,MAAM,OAAO,GAAG,MAAM,gCAAgC,CAAC;YACrD,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC3D,CAAC,CAAC;QACH,OAAO;YACL,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,YAAY,EAAE,iBAAiB,CAAC,OAAO,CAAC,YAAY,CAAC;YACrD,2EAA2E;YAC3E,QAAQ,EAAE,IAAI,GAAG,CAAC,4BAA4B,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE;YACjF,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,WAAW,EAAE,oBAAoB,OAAO,CAAC,YAAY,IAAI,KAAK,CAAC,IAAI,IAAI,6BAA6B,iBAAiB;SACtH,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,oBAAoB,CAC5B,uCAAuC,EACvC,8CAA8C,EAC9C,uLAAuL,CACxL,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CACpB,GAAsB,EACtB,IAAY,EACZ,QAAgB;IAEhB,MAAM,YAAY,GAAG,GAAG,CAAC,6BAA6B,IAAI,iCAAiC,CAAC;IAC5F,MAAM,SAAS,GAAG,GAAG,CAAC,2BAA2B,CAAC;IAClD,MAAM,MAAM,GAAG,SAAS;QACtB,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QACvD,CAAC,CAAC,uBAAuB,CAAC;IAC5B,OAAO;QACL,QAAQ;QACR,YAAY,EAAE,iBAAiB,CAAC,YAAY,CAAC;QAC7C,6EAA6E;QAC7E,QAAQ,EAAE,GAAG,iBAAiB,CAAC,YAAY,CAAC,eAAe;QAC3D,WAAW,EAAE,oBAAoB,IAAI,iBAAiB;QACtD,MAAM;KACP,CAAC;AACJ,CAAC;AASD,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;AAEvF,KAAK,UAAU,gCAAgC,CAAC,KAG/C;IACC,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;QAC5C,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM;aAC3B,OAAO,CACN,iBAAiB,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,6BAA6B,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CACvF,iBAAiB,CAAC,UAAU,CAC7B,CACF;aACA,IAAI,CACH,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,QAAQ,CACb,CAAC,KAAK,EAAE,EAAE,CACR,IAAI,oBAAoB,CACtB,uCAAuC,EACvC,qEAAqE,EACrE,MAAM,CAAC,KAAK,CAAC,CACd,CACJ,CACF,CAAC;QACJ,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,oBAAoB,CACtB,uCAAuC,EACvC,0DAA0D,EAC1D,uFAAuF,CACxF,CACF,CAAC;QACJ,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;YACpD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,oBAAoB,CACtB,uCAAuC,EACvC,mEAAmE,EACnE,QAAQ,QAAQ,CAAC,MAAM,EAAE,CAC1B,CACF,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,kBAAkB,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CACrF,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAA6B,CAAC,CAAC,CACrE,CAAC;QACF,MAAM,QAAQ,GAAG,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,MAAM,YAAY,GAChB,OAAO,IAAI,CAAC,YAAY,KAAK,QAAQ,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC;YACnE,CAAC,CAAC,IAAI,CAAC,YAAY;YACnB,CAAC,CAAC,iCAAiC,CAAC;QACxC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;YACvC,CAAC,CAAE,IAAI,CAAC,MAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;YAC9E,CAAC,CAAC,CAAC,GAAG,uBAAuB,CAAC,CAAC;QACjC,MAAM,YAAY,GAChB,OAAO,IAAI,CAAC,YAAY,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC;YACzE,CAAC,CAAC,IAAI,CAAC,YAAY;YACnB,CAAC,CAAC,SAAS,CAAC;QAChB,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,oBAAoB,CACtB,uCAAuC,EACvC,6DAA6D,EAC7D,6EAA6E,CAC9E,CACF,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IACvF,CAAC,CAAC,CAAC;IACH,OAAO,yBAAyB,CAC9B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,CAAC,CAAC,CAClF,CAAC;AACJ,CAAC;AAQD,MAAM,UAAU,gBAAgB;IAC9B,MAAM,QAAQ,GAAG,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;IAClD,MAAM,SAAS,GAAG,eAAe,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAClF,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,OAAO,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAIjC;IACC,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;QACjC,aAAa,EAAE,MAAM;QACrB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ;QAChC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,WAAW;QACtC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;QACpC,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS;QACpC,qBAAqB,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM;KACzC,CAAC,CAAC;IACH,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,YAAY,gBAAgB,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;AACzE,CAAC;AASD,MAAM,aAAa,GAAG,CACpB,IAAY,EACZ,SAA8D,EACD,EAAE,CAC/D,MAAM,CAAC,cAAc,CACnB,MAAM,CAAC,KAAK,CAAkC,CAAC,MAAM,EAAE,EAAE;IACvD,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,CAAC,GAAU,EAAQ,EAAE;QACnC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,uBAAuB,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3E,CAAC,CAAC;IACF,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC9B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE;QACpC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACxC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC7B,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,EACF,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,CAAC,KAAK,CAAO,CAAC,MAAM,EAAE,EAAE;IAC5B,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC,CAAC,CACL,CAAC;AAEJ,MAAM,eAAe,GAAG,CAAC,KAIxB,EAA6D,EAAE,CAC9D,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAwC,CAAC;IAC9E,KAAK,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5C,MAAM,OAAO,GAAG,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;QAC3D,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YAC1B,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QAC7D,CAAC;aAAM,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACpC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACzD,CAAC;IACH,CAAC,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACtC,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;IAClC,IAAI,SAAS,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CACrB,MAAM,CAAC,WAAW,CAAC;YACjB,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;YACpC,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC;SACzD,CAAC,CACH,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC;AACrB,CAAC,CAAC,CAAC;AAEL,MAAM,sBAAsB,GAAG,CAAC,GAAkB,EAAwB,EAAE;IAC1E,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,sBAAsB;YACzB,OAAO,IAAI,oBAAoB,CAC7B,gCAAgC,EAChC,sDAAsD,EACtD,+BAA+B,GAAG,CAAC,SAAS,KAAK,CAClD,CAAC;QACJ,KAAK,yBAAyB;YAC5B,OAAO,IAAI,oBAAoB,CAC7B,iCAAiC,EACjC,0CAA0C,EAC1C,GAAG,CAAC,KAAK,CACV,CAAC;QACJ,KAAK,sBAAsB;YACzB,OAAO,IAAI,oBAAoB,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACvE,CAAC;AACH,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,KAIrC;IAIC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,IAAI,CACzC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EACvC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CACpB,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAC1D,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QACf,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACnB,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;YACnB,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAC3C,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;gBAAE,MAAM,OAAO,CAAC,KAAK,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACvC,CAAC;KACF,CAAC,CACH,CAAC;IACF,MAAM,KAAK,GAAG,GAAkB,EAAE,CAChC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjG,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACvB,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AAC3B,CAAC;AAiBD,SAAS,gBAAgB,CAAC,GAAoB,EAAE,aAAqB;IACnE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;QACb,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC;IACvE,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;IACjD,IAAI,GAAG,CAAC,QAAQ,KAAK,iBAAiB,EAAE,CAAC;QACvC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;IAC7D,CAAC;IACD,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC5C,wEAAwE;IACxE,0EAA0E;IAC1E,yEAAyE;IACzE,IAAI,KAAK,KAAK,aAAa,EAAE,CAAC;QAC5B,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,GAAG;YACX,IAAI,EAAE,2EAA2E;SAClF,CAAC;IACJ,CAAC;IACD,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC5C,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,WAAW,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;QACpE,OAAO;YACL,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,GAAG;YACX,IAAI,EAAE,uCAAuC,KAAK,EAAE;YACpD,KAAK,EAAE,IAAI,oBAAoB,CAAC;gBAC9B,IAAI,EAAE,kCAAkC;gBACxC,OAAO,EAAE,oCAAoC,KAAK,IAAI;gBACtD,MAAM,EAAE,WAAW;aACpB,CAAC;SACH,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;YACL,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,GAAG;YACX,IAAI,EAAE,6BAA6B;YACnC,KAAK,EAAE,IAAI,oBAAoB,CAAC;gBAC9B,IAAI,EAAE,kCAAkC;gBACxC,OAAO,EAAE,8DAA8D;gBACvE,MAAM,EAAE,EAAE;aACX,CAAC;SACH,CAAC;IACJ,CAAC;IACD,OAAO;QACL,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,uEAAuE;QAC7E,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;KACxB,CAAC;AACJ,CAAC;AAED,SAAS,OAAO,CAAC,GAAmB,EAAE,MAAc,EAAE,IAAY;IAChE,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC;IACxB,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,2BAA2B,CAAC,CAAC;IAC3D,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AASD,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,KAAwB;IAExB,MAAM,IAAI,GAAG,IAAI,eAAe,CAAC;QAC/B,UAAU,EAAE,oBAAoB;QAChC,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,WAAW;QACtC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ;QAChC,aAAa,EAAE,KAAK,CAAC,QAAQ;KAC9B,CAAC,CAAC;IACH,OAAO,MAAM,iBAAiB,CAAC;QAC7B,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,IAAI;QACJ,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,WAAW,EAAE,iCAAiC;QAC9C,cAAc,EAAE,yCAAyC;KAC1D,CAAC,CAAC;AACL,CAAC;AAQD,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,KAAyB;IAC3D,MAAM,IAAI,GAAG,IAAI,eAAe,CAAC;QAC/B,UAAU,EAAE,eAAe;QAC3B,aAAa,EAAE,KAAK,CAAC,YAAY;QACjC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ;KACjC,CAAC,CAAC;IACH,OAAO,MAAM,iBAAiB,CAAC;QAC7B,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,IAAI;QACJ,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,WAAW,EAAE,gCAAgC;QAC7C,cAAc,EACZ,iJAAiJ;KACpJ,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,KAMhC;IACC,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;QAC5C,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;QACvC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM;aAC3B,OAAO,CACN,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CACnC,iBAAiB,CAAC,SAAS,CAAC,QAAQ,EAAE,kBAAkB,CAAC,EACzD,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,mCAAmC,CAAC,CACvF,CACF;aACA,IAAI,CACH,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,QAAQ,CACb,CAAC,KAAK,EAAE,EAAE,CACR,IAAI,oBAAoB,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CACnF,CACF,CAAC;QACJ,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,kBAAkB,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CACpF,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAA6B,CAAC,CAAC,CACrE,CAAC;QACF,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;YACpD,MAAM,MAAM,GACV,OAAO,GAAG,CAAC,iBAAiB,KAAK,QAAQ;gBACvC,CAAC,CAAC,GAAG,CAAC,iBAAiB;gBACvB,CAAC,CAAC,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ;oBAC7B,CAAC,CAAC,GAAG,CAAC,KAAK;oBACX,CAAC,CAAC,QAAQ,QAAQ,CAAC,MAAM,EAAE,CAAC;YAClC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,oBAAoB,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,cAAc,EAAE,MAAM,CAAC,CAC1E,CAAC;QACJ,CAAC;QACD,MAAM,WAAW,GAAG,OAAO,GAAG,CAAC,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;QACxF,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,oBAAoB,CACtB,KAAK,CAAC,WAAW,EACjB,KAAK,CAAC,cAAc,EACpB,wCAAwC,CACzC,CACF,CAAC;QACJ,CAAC;QACD,MAAM,SAAS,GAAG,OAAO,GAAG,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC;QACjF,MAAM,SAAS,GAAG,OAAO,GAAG,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC;QAC7E,MAAM,YAAY,GAAG,OAAO,GAAG,CAAC,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3F,MAAM,KAAK,GAAG,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QACpE,OAAO;YACL,WAAW;YACX,SAAS;YACT,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE;YAChE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC5B,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,yBAAyB,CAC9B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,CAAC,CAAC,CAClF,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,GAAW;IAClC,OAAO,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAC5F,CAAC;AAED,SAAS,iBAAiB,CAAC,CAAS;IAClC,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9C,CAAC"}
@@ -0,0 +1,41 @@
1
+ export declare const CLOUDFLARE_RESOURCE_NAME_MAX_LENGTH = 63;
2
+ export type CloudflareScopedResourceKind = 'install-kv' | 'tenant-d1' | 'flags-kv';
3
+ export interface CloudflareScopedResourceIdentity {
4
+ readonly accountId: string;
5
+ readonly projectId: string;
6
+ readonly environment: string;
7
+ readonly hubSpotAppId: number;
8
+ }
9
+ export interface CloudflareScopedResourceProvisionResult<T> {
10
+ readonly resourceId: string;
11
+ readonly resourceName: string;
12
+ readonly value: T | undefined;
13
+ }
14
+ export declare class CloudflareResourceIdentityRequiredError extends Error {
15
+ readonly resourceKind: CloudflareScopedResourceKind;
16
+ readonly fullNameLength: number;
17
+ readonly name = "CloudflareResourceIdentityRequiredError";
18
+ readonly code: "HSX_E_CLOUDFLARE_RESOURCE_ID_REQUIRED";
19
+ constructor(resourceKind: CloudflareScopedResourceKind, fullNameLength: number);
20
+ }
21
+ export declare function cloudflareNameSlug(value: string): string;
22
+ /** The pre-truncation legacy deterministic name. Kept visible for collision audits. */
23
+ export declare function cloudflareScopedResourceFullName(identity: CloudflareScopedResourceIdentity, kind: CloudflareScopedResourceKind): string;
24
+ /** Byte-compatible with the legacy naming algorithm. Never use it as ownership proof. */
25
+ export declare function legacyTruncatedCloudflareResourceName(fullName: string): string;
26
+ /**
27
+ * Resolve an exact stored resource, or run the complete name-only provisioning
28
+ * callback. Long legacy names are non-injective, so the callback is never
29
+ * entered unless an exact resource id already bypassed name-only resolution.
30
+ */
31
+ export declare function resolveOrProvisionCloudflareScopedResource<T>(input: {
32
+ readonly identity: CloudflareScopedResourceIdentity;
33
+ readonly kind: CloudflareScopedResourceKind;
34
+ readonly exactResourceId?: string;
35
+ readonly exactResourceName?: string;
36
+ readonly provisionByName: (resourceName: string) => Promise<{
37
+ readonly resourceId: string;
38
+ readonly value?: T;
39
+ }>;
40
+ }): Promise<CloudflareScopedResourceProvisionResult<T>>;
41
+ //# sourceMappingURL=cloudflare-scoped-resource.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cloudflare-scoped-resource.d.ts","sourceRoot":"","sources":["../src/cloudflare-scoped-resource.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mCAAmC,KAAK,CAAC;AAEtD,MAAM,MAAM,4BAA4B,GAAG,YAAY,GAAG,WAAW,GAAG,UAAU,CAAC;AAEnF,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,uCAAuC,CAAC,CAAC;IACxD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,CAAC;CAC/B;AAED,qBAAa,uCAAwC,SAAQ,KAAK;IAK9D,QAAQ,CAAC,YAAY,EAAE,4BAA4B;IACnD,QAAQ,CAAC,cAAc,EAAE,MAAM;IALjC,SAAkB,IAAI,6CAA6C;IACnE,QAAQ,CAAC,IAAI,EAAG,uCAAuC,CAAU;gBAGtD,YAAY,EAAE,4BAA4B,EAC1C,cAAc,EAAE,MAAM;CAMlC;AAwBD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAOxD;AAED,uFAAuF;AACvF,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,gCAAgC,EAC1C,IAAI,EAAE,4BAA4B,GACjC,MAAM,CAMR;AAED,yFAAyF;AACzF,wBAAgB,qCAAqC,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAI9E;AAED;;;;GAIG;AACH,wBAAsB,0CAA0C,CAAC,CAAC,EAAE,KAAK,EAAE;IACzE,QAAQ,CAAC,QAAQ,EAAE,gCAAgC,CAAC;IACpD,QAAQ,CAAC,IAAI,EAAE,4BAA4B,CAAC;IAC5C,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,CACxB,YAAY,EAAE,MAAM,KACjB,OAAO,CAAC;QAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;KAAE,CAAC,CAAC;CACnE,GAAG,OAAO,CAAC,uCAAuC,CAAC,CAAC,CAAC,CAAC,CAsBtD"}
@@ -0,0 +1,74 @@
1
+ export const CLOUDFLARE_RESOURCE_NAME_MAX_LENGTH = 63;
2
+ export class CloudflareResourceIdentityRequiredError extends Error {
3
+ resourceKind;
4
+ fullNameLength;
5
+ name = 'CloudflareResourceIdentityRequiredError';
6
+ code = 'HSX_E_CLOUDFLARE_RESOURCE_ID_REQUIRED';
7
+ constructor(resourceKind, fullNameLength) {
8
+ super(`HSX_E_CLOUDFLARE_RESOURCE_ID_REQUIRED: ${resourceLabel(resourceKind)} needs an exact stored Cloudflare resource id because its deterministic name is ${fullNameLength} characters and the legacy 63-character truncation is ambiguous. Restore the local or control-plane binding; HS-X will not create or adopt this resource by name.`);
9
+ this.resourceKind = resourceKind;
10
+ this.fullNameLength = fullNameLength;
11
+ }
12
+ }
13
+ function resourceLabel(kind) {
14
+ switch (kind) {
15
+ case 'install-kv':
16
+ return 'Install KV namespace';
17
+ case 'tenant-d1':
18
+ return 'Tenant D1 database';
19
+ case 'flags-kv':
20
+ return 'Flags KV namespace';
21
+ }
22
+ }
23
+ function resourceSuffix(kind) {
24
+ switch (kind) {
25
+ case 'install-kv':
26
+ return 'install';
27
+ case 'tenant-d1':
28
+ return 'tenant';
29
+ case 'flags-kv':
30
+ return 'flags';
31
+ }
32
+ }
33
+ export function cloudflareNameSlug(value) {
34
+ return (value
35
+ .toLowerCase()
36
+ .replace(/[^a-z0-9]+/g, '-')
37
+ .replace(/^-+|-+$/g, '') || 'x');
38
+ }
39
+ /** The pre-truncation legacy deterministic name. Kept visible for collision audits. */
40
+ export function cloudflareScopedResourceFullName(identity, kind) {
41
+ return `hsx-${cloudflareNameSlug(identity.accountId)}-${cloudflareNameSlug(identity.projectId)}-${cloudflareNameSlug(identity.environment)}-${cloudflareNameSlug(String(identity.hubSpotAppId))}-${resourceSuffix(kind)}`;
42
+ }
43
+ /** Byte-compatible with the legacy naming algorithm. Never use it as ownership proof. */
44
+ export function legacyTruncatedCloudflareResourceName(fullName) {
45
+ return fullName.length <= CLOUDFLARE_RESOURCE_NAME_MAX_LENGTH
46
+ ? fullName
47
+ : fullName.slice(0, CLOUDFLARE_RESOURCE_NAME_MAX_LENGTH).replace(/-+$/g, '');
48
+ }
49
+ /**
50
+ * Resolve an exact stored resource, or run the complete name-only provisioning
51
+ * callback. Long legacy names are non-injective, so the callback is never
52
+ * entered unless an exact resource id already bypassed name-only resolution.
53
+ */
54
+ export async function resolveOrProvisionCloudflareScopedResource(input) {
55
+ const fullName = cloudflareScopedResourceFullName(input.identity, input.kind);
56
+ const resourceName = input.exactResourceName ?? legacyTruncatedCloudflareResourceName(fullName);
57
+ if (input.exactResourceId) {
58
+ return {
59
+ resourceId: input.exactResourceId,
60
+ resourceName,
61
+ value: undefined,
62
+ };
63
+ }
64
+ if (fullName.length > CLOUDFLARE_RESOURCE_NAME_MAX_LENGTH) {
65
+ throw new CloudflareResourceIdentityRequiredError(input.kind, fullName.length);
66
+ }
67
+ const provisioned = await input.provisionByName(resourceName);
68
+ return {
69
+ resourceId: provisioned.resourceId,
70
+ resourceName,
71
+ value: provisioned.value,
72
+ };
73
+ }
74
+ //# sourceMappingURL=cloudflare-scoped-resource.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cloudflare-scoped-resource.js","sourceRoot":"","sources":["../src/cloudflare-scoped-resource.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,mCAAmC,GAAG,EAAE,CAAC;AAiBtD,MAAM,OAAO,uCAAwC,SAAQ,KAAK;IAKrD;IACA;IALO,IAAI,GAAG,yCAAyC,CAAC;IAC1D,IAAI,GAAG,uCAAgD,CAAC;IAEjE,YACW,YAA0C,EAC1C,cAAsB;QAE/B,KAAK,CACH,0CAA0C,aAAa,CAAC,YAAY,CAAC,mFAAmF,cAAc,mKAAmK,CAC1U,CAAC;QALO,iBAAY,GAAZ,YAAY,CAA8B;QAC1C,mBAAc,GAAd,cAAc,CAAQ;IAKjC,CAAC;CACF;AAED,SAAS,aAAa,CAAC,IAAkC;IACvD,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,YAAY;YACf,OAAO,sBAAsB,CAAC;QAChC,KAAK,WAAW;YACd,OAAO,oBAAoB,CAAC;QAC9B,KAAK,UAAU;YACb,OAAO,oBAAoB,CAAC;IAChC,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,IAAkC;IACxD,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,YAAY;YACf,OAAO,SAAS,CAAC;QACnB,KAAK,WAAW;YACd,OAAO,QAAQ,CAAC;QAClB,KAAK,UAAU;YACb,OAAO,OAAO,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAa;IAC9C,OAAO,CACL,KAAK;SACF,WAAW,EAAE;SACb,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,GAAG,CAClC,CAAC;AACJ,CAAC;AAED,uFAAuF;AACvF,MAAM,UAAU,gCAAgC,CAC9C,QAA0C,EAC1C,IAAkC;IAElC,OAAO,OAAO,kBAAkB,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,kBAAkB,CACxE,QAAQ,CAAC,SAAS,CACnB,IAAI,kBAAkB,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,kBAAkB,CACjE,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAC9B,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;AAC9B,CAAC;AAED,yFAAyF;AACzF,MAAM,UAAU,qCAAqC,CAAC,QAAgB;IACpE,OAAO,QAAQ,CAAC,MAAM,IAAI,mCAAmC;QAC3D,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,mCAAmC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACjF,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,0CAA0C,CAAI,KAQnE;IACC,MAAM,QAAQ,GAAG,gCAAgC,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9E,MAAM,YAAY,GAAG,KAAK,CAAC,iBAAiB,IAAI,qCAAqC,CAAC,QAAQ,CAAC,CAAC;IAEhG,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;QAC1B,OAAO;YACL,UAAU,EAAE,KAAK,CAAC,eAAe;YACjC,YAAY;YACZ,KAAK,EAAE,SAAS;SACjB,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ,CAAC,MAAM,GAAG,mCAAmC,EAAE,CAAC;QAC1D,MAAM,IAAI,uCAAuC,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACjF,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAC9D,OAAO;QACL,UAAU,EAAE,WAAW,CAAC,UAAU;QAClC,YAAY;QACZ,KAAK,EAAE,WAAW,CAAC,KAAK;KACzB,CAAC;AACJ,CAAC"}
@@ -0,0 +1,13 @@
1
+ /**
2
+ * Root command names accepted by the native Effect CLI tree.
3
+ *
4
+ * Keep this as the single name catalog for routing, typo suggestions, and
5
+ * generated shell completion. The command implementations still own their
6
+ * option/subcommand metadata.
7
+ */
8
+ export declare const NATIVE_ROOT_COMMANDS: readonly ["account", "accounts", "api", "audit", "check", "checkpoint", "completion", "connect", "create", "deploy", "dev", "doctor", "drift", "flags", "history", "init", "link", "list", "login", "logout", "logs", "migrate", "promote", "rollback", "route", "routes", "routing", "secret", "secrets", "status", "unlink", "update", "upgrade", "validate", "whoami"];
9
+ /** Compatibility spellings served by the small direct dispatcher. */
10
+ export declare const DIRECT_ROOT_COMMANDS: readonly ["completions"];
11
+ /** All word-like root commands users can type and completion should offer. */
12
+ export declare const ROOT_COMMANDS: readonly ["account", "accounts", "api", "audit", "check", "checkpoint", "completion", "connect", "create", "deploy", "dev", "doctor", "drift", "flags", "history", "init", "link", "list", "login", "logout", "logs", "migrate", "promote", "rollback", "route", "routes", "routing", "secret", "secrets", "status", "unlink", "update", "upgrade", "validate", "whoami", "completions", "help"];
13
+ //# sourceMappingURL=command-catalog.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"command-catalog.d.ts","sourceRoot":"","sources":["../src/command-catalog.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,2WAoCvB,CAAC;AAEX,qEAAqE;AACrE,eAAO,MAAM,oBAAoB,0BAA2B,CAAC;AAE7D,8EAA8E;AAC9E,eAAO,MAAM,aAAa,kYAAsE,CAAC"}
@@ -0,0 +1,49 @@
1
+ /**
2
+ * Root command names accepted by the native Effect CLI tree.
3
+ *
4
+ * Keep this as the single name catalog for routing, typo suggestions, and
5
+ * generated shell completion. The command implementations still own their
6
+ * option/subcommand metadata.
7
+ */
8
+ export const NATIVE_ROOT_COMMANDS = [
9
+ 'account',
10
+ 'accounts',
11
+ 'api',
12
+ 'audit',
13
+ 'check',
14
+ 'checkpoint',
15
+ 'completion',
16
+ 'connect',
17
+ 'create',
18
+ 'deploy',
19
+ 'dev',
20
+ 'doctor',
21
+ 'drift',
22
+ 'flags',
23
+ 'history',
24
+ 'init',
25
+ 'link',
26
+ 'list',
27
+ 'login',
28
+ 'logout',
29
+ 'logs',
30
+ 'migrate',
31
+ 'promote',
32
+ 'rollback',
33
+ 'route',
34
+ 'routes',
35
+ 'routing',
36
+ 'secret',
37
+ 'secrets',
38
+ 'status',
39
+ 'unlink',
40
+ 'update',
41
+ 'upgrade',
42
+ 'validate',
43
+ 'whoami',
44
+ ];
45
+ /** Compatibility spellings served by the small direct dispatcher. */
46
+ export const DIRECT_ROOT_COMMANDS = ['completions'];
47
+ /** All word-like root commands users can type and completion should offer. */
48
+ export const ROOT_COMMANDS = [...NATIVE_ROOT_COMMANDS, ...DIRECT_ROOT_COMMANDS, 'help'];
49
+ //# sourceMappingURL=command-catalog.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"command-catalog.js","sourceRoot":"","sources":["../src/command-catalog.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,SAAS;IACT,UAAU;IACV,KAAK;IACL,OAAO;IACP,OAAO;IACP,YAAY;IACZ,YAAY;IACZ,SAAS;IACT,QAAQ;IACR,QAAQ;IACR,KAAK;IACL,QAAQ;IACR,OAAO;IACP,OAAO;IACP,SAAS;IACT,MAAM;IACN,MAAM;IACN,MAAM;IACN,OAAO;IACP,QAAQ;IACR,MAAM;IACN,SAAS;IACT,SAAS;IACT,UAAU;IACV,OAAO;IACP,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,UAAU;IACV,QAAQ;CACA,CAAC;AAEX,qEAAqE;AACrE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,aAAa,CAAU,CAAC;AAE7D,8EAA8E;AAC9E,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,GAAG,oBAAoB,EAAE,GAAG,oBAAoB,EAAE,MAAM,CAAU,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"completion.d.ts","sourceRoot":"","sources":["../../src/commands/completion.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAG/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAIhD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAY9C,eAAO,MAAM,aAAa;;;EAIzB,CAAC;AA2BF,wBAAgB,iBAAiB,CAAC,EAChC,IAAI,EACJ,IAAI,GACL,EAAE;IACD,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CACxB,GAAG,SAAS,CA6BZ;AA8FD,wBAAgB,kBAAkB,IAAI,MAAM,CAU3C"}
1
+ {"version":3,"file":"completion.d.ts","sourceRoot":"","sources":["../../src/commands/completion.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAG/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAMhD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAY9C,eAAO,MAAM,aAAa;;;EAIzB,CAAC;AAgCF,wBAAgB,iBAAiB,CAAC,EAChC,IAAI,EACJ,IAAI,GACL,EAAE;IACD,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CACxB,GAAG,SAAS,CAmCZ;AAqED,wBAAgB,kBAAkB,IAAI,MAAM,CAU3C"}
@@ -3,7 +3,9 @@ import * as Command from '@effect/cli/Command';
3
3
  import { Effect } from 'effect';
4
4
  import { cliError } from '../cli-error.js';
5
5
  import { jsonOption, runHandler } from '../cli/kit.js';
6
+ import { ROOT_COMMANDS } from '../command-catalog.js';
6
7
  import { emitHelp } from '../help.js';
8
+ import { emitReporterTextArtifact, textArtifact } from '../machine-artifact.js';
7
9
  import { createReporter } from '../reporter/index.js';
8
10
  import { Reporter } from '../services/reporter.js';
9
11
  // ─── Native @effect/cli command (Phase 4) ───────────────────────────────────
@@ -30,10 +32,13 @@ function completionBody(shell) {
30
32
  exitCode: 10,
31
33
  }));
32
34
  }
33
- // Completion scripts are raw shell text, not a Reporter envelope; emit the
34
- // exact bytes the legacy path produced. (The bad-shell error above is
35
- // rendered by runHandler, which provides its own Reporter.)
36
- yield* reporter.raw(renderCompletion(shell));
35
+ const script = renderCompletion(shell);
36
+ if (reporter.mode === 'json') {
37
+ yield* emitReporterTextArtifact(reporter, textArtifact('shell-completion', script, { shell }));
38
+ }
39
+ else {
40
+ yield* reporter.raw(script);
41
+ }
37
42
  });
38
43
  }
39
44
  export function completionCommand({ argv, json, }) {
@@ -61,37 +66,18 @@ export function completionCommand({ argv, json, }) {
61
66
  }
62
67
  return { exitCode: 10 };
63
68
  }
64
- reporter.raw(renderCompletion(shell));
65
- if (reporter.mode === 'ndjson')
69
+ const script = renderCompletion(shell);
70
+ if (reporter.mode === 'json') {
71
+ reporter.data(textArtifact('shell-completion', script, { shell }));
66
72
  reporter.done();
73
+ }
74
+ else {
75
+ reporter.raw(script);
76
+ if (reporter.mode === 'ndjson')
77
+ reporter.done();
78
+ }
67
79
  return { exitCode: 0 };
68
80
  }
69
- const COMPLETION_COMMANDS = [
70
- 'init',
71
- 'connect',
72
- 'secrets',
73
- 'secret',
74
- 'dev',
75
- 'deploy',
76
- 'status',
77
- 'logs',
78
- 'drift',
79
- 'routes',
80
- 'promote',
81
- 'rollback',
82
- 'accounts',
83
- 'whoami',
84
- 'logout',
85
- 'check',
86
- 'doctor',
87
- 'migrate',
88
- 'api',
89
- 'audit',
90
- 'history',
91
- 'completion',
92
- 'update',
93
- 'help',
94
- ];
95
81
  const COMPLETION_FLAGS = [
96
82
  '--help',
97
83
  '--help-all',
@@ -101,6 +87,7 @@ const COMPLETION_FLAGS = [
101
87
  '--verbose',
102
88
  '--debug',
103
89
  '--cwd',
90
+ '--no-color',
104
91
  '--no-telemetry',
105
92
  '--no-update-check',
106
93
  '--project',
@@ -109,9 +96,10 @@ const COMPLETION_FLAGS = [
109
96
  '--env',
110
97
  '--yes',
111
98
  '--force',
99
+ '--version',
112
100
  ];
113
101
  function renderCompletion(shell) {
114
- const commands = COMPLETION_COMMANDS.join(' ');
102
+ const commands = ROOT_COMMANDS.join(' ');
115
103
  const flags = COMPLETION_FLAGS.join(' ');
116
104
  switch (shell) {
117
105
  case 'bash':
@@ -141,7 +129,7 @@ compdef _hs_x hs-x hsx
141
129
  `;
142
130
  case 'fish':
143
131
  return `${['hs-x', 'hsx']
144
- .flatMap((binary) => COMPLETION_COMMANDS.map((command) => `complete -c ${binary} -f -n "__fish_use_subcommand" -a ${command}`))
132
+ .flatMap((binary) => ROOT_COMMANDS.map((command) => `complete -c ${binary} -f -n "__fish_use_subcommand" -a ${command}`))
145
133
  .join('\n')}
146
134
  ${['hs-x', 'hsx']
147
135
  .flatMap((binary) => COMPLETION_FLAGS.map((flag) => `complete -c ${binary} -f -l ${flag.slice(2)}`))
@@ -1 +1 @@
1
- {"version":3,"file":"completion.js","sourceRoot":"","sources":["../../src/commands/completion.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"completion.js","sourceRoot":"","sources":["../../src/commands/completion.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/commands/connect.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AA8B9C,wBAAsB,cAAc,CAAC,EACnC,IAAI,EACJ,GAAG,EACH,IAAI,GACL,EAAE;IACD,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CACxB,GAAG,OAAO,CAAC,SAAS,CAAC,CAoBrB;AA+pDD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4DyD,CAAC;AAIjF,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAWhC,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC"}
1
+ {"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/commands/connect.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AA8B9C,wBAAsB,cAAc,CAAC,EACnC,IAAI,EACJ,GAAG,EACH,IAAI,GACL,EAAE;IACD,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CACxB,GAAG,OAAO,CAAC,SAAS,CAAC,CAoBrB;AAmvDD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4DyD,CAAC;AAIjF,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAWhC,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC"}
@@ -7,7 +7,7 @@ import { controlPlaneAuthHeaders } from '../control-plane-fetch.js';
7
7
  import { loadCreateControlPlane } from '../control-plane-loader.js';
8
8
  import { executeCliHttp } from '../effect-http.js';
9
9
  import { emitHelp } from '../help.js';
10
- import { isInteractive, promptConfirm, promptSelect, promptText } from '../prompt.js';
10
+ import { isInteractive, promptConfirm, promptPassword, promptSelect, promptText, } from '../prompt.js';
11
11
  import { createReporter } from '../reporter/index.js';
12
12
  import { connectHelpText } from './help-command.js';
13
13
  async function hostedHttp(input) {
@@ -235,7 +235,7 @@ async function connectHubspotCommand({ argv, cwd, json, }) {
235
235
  personalAccessKey = discoveredDefault.pak;
236
236
  }
237
237
  else {
238
- const answer = await promptText({
238
+ const answer = await promptPassword({
239
239
  message: 'HubSpot personal access key',
240
240
  validate: (v) => (v.length >= 10 ? undefined : 'PAK looks too short.'),
241
241
  });
@@ -758,12 +758,13 @@ async function runCloudflareOAuthFlowBody(input) {
758
758
  controlPlaneUrl,
759
759
  accountId: input.hsxAccountId,
760
760
  userId: resolveFlag(input.argv, '--user-id') ?? process.env.HSX_USER_ID ?? 'local-cli-user',
761
- body: {
761
+ body: Schema.decodeUnknownSync(schemas.CloudflareOAuthCompleteRequest)({
762
762
  code,
763
763
  codeVerifier: pkce.verifier,
764
764
  redirectUri: config.redirectUri,
765
+ ...(input.cloudflareAccountId ? { cloudflareAccountId: input.cloudflareAccountId } : {}),
765
766
  ...(input.displayName ? { displayName: input.displayName } : {}),
766
- },
767
+ }),
767
768
  });
768
769
  reporter
769
770
  .step('Cloudflare OAuth complete')
@@ -810,25 +811,48 @@ async function runCloudflareOAuthFlowBody(input) {
810
811
  }
811
812
  throw error;
812
813
  }
813
- let discoveredAccountId;
814
+ let selectedAccountId;
814
815
  try {
815
- // Resolve the account id via /accounts, NOT verifyCloudflareToken: OAuth
816
- // access tokens 400 on the API-token verify endpoint, which left the id
817
- // undefined and silently skipped persistence below (the credential is keyed
818
- // by account id). /accounts works with the granted account-read scope.
819
- const { resolveCloudflareAccountId } = await import('../cloudflare-auth.js');
820
- discoveredAccountId = await resolveCloudflareAccountId(tokens.accessToken);
816
+ // OAuth access tokens 400 on the API-token verify endpoint. Discover the
817
+ // first visible account when no selector was supplied; when the user did
818
+ // supply one, require Cloudflare to confirm access to that exact account.
819
+ const { selectCloudflareAccountId } = await import('../cloudflare-auth.js');
820
+ const cloudflareApiBaseUrl = process.env.HSX_CLOUDFLARE_API_BASE_URL;
821
+ selectedAccountId = await selectCloudflareAccountId({
822
+ token: tokens.accessToken,
823
+ ...(input.cloudflareAccountId ? { requestedAccountId: input.cloudflareAccountId } : {}),
824
+ ...(cloudflareApiBaseUrl ? { baseUrl: cloudflareApiBaseUrl } : {}),
825
+ });
821
826
  }
822
- catch {
823
- // account discovery is best-effort
827
+ catch (error) {
828
+ const { CloudflareAccountSelectionError } = await import('../cloudflare-auth.js');
829
+ if (error instanceof CloudflareAccountSelectionError) {
830
+ return {
831
+ kind: 'error',
832
+ result: inputValidationError({
833
+ argv: input.argv,
834
+ command: 'connect cloudflare',
835
+ json: input.json,
836
+ code: error.code,
837
+ message: error.message,
838
+ hint: error.reason === 'verification-failed'
839
+ ? 'Check the Cloudflare API connection and retry. The requested account was not selected or stored.'
840
+ : 'Choose a Cloudflare account this OAuth token can access, or omit --cloudflare-account-id to use the first visible account.',
841
+ detail: error.detail,
842
+ }),
843
+ };
844
+ }
845
+ if (input.cloudflareAccountId)
846
+ throw error;
847
+ // Discovery without an explicit selector remains best-effort.
824
848
  }
825
849
  // Persist the credential so a later `hs-x deploy` can reuse this connection
826
850
  // without re-authorizing. Cloudflare OAuth returns no refresh token, so the
827
851
  // access token IS what we store (with its expiry); deploy uses it directly
828
852
  // while valid and prompts a reconnect once it lapses.
829
- if (discoveredAccountId && (tokens.refreshToken || tokens.accessToken)) {
853
+ if (selectedAccountId && (tokens.refreshToken || tokens.accessToken)) {
830
854
  try {
831
- await saveCloudflareOAuthCredential(discoveredAccountId, {
855
+ await saveCloudflareOAuthCredential(selectedAccountId, {
832
856
  ...(tokens.refreshToken ? { refreshToken: tokens.refreshToken } : {}),
833
857
  ...(tokens.accessToken
834
858
  ? { accessToken: tokens.accessToken, accessTokenExpiresAt: tokens.expiresAt }
@@ -842,11 +866,11 @@ async function runCloudflareOAuthFlowBody(input) {
842
866
  }
843
867
  reporter
844
868
  .step('Cloudflare OAuth complete')
845
- .ok(discoveredAccountId ? `account ${discoveredAccountId} (dev)` : 'token acquired (dev)');
869
+ .ok(selectedAccountId ? `account ${selectedAccountId} (dev)` : 'token acquired (dev)');
846
870
  return {
847
871
  kind: 'success-local',
848
872
  accessToken: tokens.accessToken,
849
- ...(discoveredAccountId ? { cloudflareAccountId: discoveredAccountId } : {}),
873
+ ...(selectedAccountId ? { cloudflareAccountId: selectedAccountId } : {}),
850
874
  };
851
875
  }
852
876
  async function postCloudflareOAuthComplete(input) {
@@ -881,7 +905,7 @@ async function promptHubspotBrowserFlow(argv) {
881
905
  await openInBrowser(HUBSPOT_PAK_GENERATION_URL);
882
906
  reporter.info('On the HubSpot page: generate a PAK and copy it.');
883
907
  for (;;) {
884
- const pak = await promptText({
908
+ const pak = await promptPassword({
885
909
  message: 'Paste your HubSpot personal access key',
886
910
  validate: (v) => (v.length >= 20 ? undefined : 'PAK looks too short.'),
887
911
  });
@@ -966,6 +990,60 @@ async function connectCloudflareCommand({ argv, json, }) {
966
990
  const interactive = !json && isInteractive();
967
991
  let cloudflareAccountId = resolveFlag(argv, '--cloudflare-account-id');
968
992
  let displayName = resolveFlag(argv, '--display-name');
993
+ // Linked OAuth mutates the named HS-X account after the user grants consent.
994
+ // Fail before opening the browser when that account is only a stale local
995
+ // record or the current user is not a member. Otherwise the user completes
996
+ // Cloudflare consent only to receive a late 404 from the broker callback.
997
+ if (linked && !localControlPlane) {
998
+ const controlPlaneUrl = resolveControlPlaneUrl(argv);
999
+ const userId = resolveFlag(argv, '--user-id') ?? process.env.HSX_USER_ID ?? 'local-cli-user';
1000
+ let response;
1001
+ try {
1002
+ response = await hostedHttp({
1003
+ url: new URL('/v1/accounts/me', controlPlaneUrl),
1004
+ headers: {
1005
+ accept: 'application/json',
1006
+ 'x-hsx-account-id': accountId,
1007
+ ...(await controlPlaneAuthHeaders(userId)),
1008
+ },
1009
+ });
1010
+ }
1011
+ catch (error) {
1012
+ const detail = error instanceof Error ? error.message : String(error);
1013
+ return inputValidationError({
1014
+ argv,
1015
+ command: 'connect cloudflare',
1016
+ json,
1017
+ code: 'HSX_E_API_NETWORK',
1018
+ message: 'Could not verify the target HS-X account before Cloudflare authorization.',
1019
+ hint: 'Check the control-plane URL and network connection, then retry.',
1020
+ detail,
1021
+ });
1022
+ }
1023
+ if (!response.ok) {
1024
+ const status = response.status;
1025
+ const code = status === 404
1026
+ ? 'HSX_E_API_NOT_FOUND'
1027
+ : status === 401 || status === 403
1028
+ ? 'HSX_E_API_UNAUTHORIZED'
1029
+ : status >= 500
1030
+ ? 'HSX_E_API_SERVER'
1031
+ : 'HSX_E_API_BAD_REQUEST';
1032
+ return inputValidationError({
1033
+ argv,
1034
+ command: 'connect cloudflare',
1035
+ json,
1036
+ code,
1037
+ message: status === 404
1038
+ ? `HS-X account ${accountId} does not exist on this control plane or is not available to the current user.`
1039
+ : `Could not verify HS-X account ${accountId} before Cloudflare authorization.`,
1040
+ hint: status === 404
1041
+ ? 'Run `hs-x api /v1/users/me/accounts` and choose an account returned by the control plane.'
1042
+ : 'Refresh your HS-X login and retry.',
1043
+ detail: `Account preflight returned HTTP ${status}.`,
1044
+ });
1045
+ }
1046
+ }
969
1047
  // OAuth (authorization code + PKCE) is the ONLY connection method — owner
970
1048
  // decision 2026-06-11. No API-token paste path in the CLI or the dashboard:
971
1049
  // the consent screen grants exactly the scopes HS-X needs, and the
@@ -996,6 +1074,7 @@ async function connectCloudflareCommand({ argv, json, }) {
996
1074
  json,
997
1075
  hsxAccountId: accountId,
998
1076
  brokered: linked,
1077
+ ...(cloudflareAccountId ? { cloudflareAccountId } : {}),
999
1078
  ...(displayName ? { displayName } : {}),
1000
1079
  });
1001
1080
  if (oauthOutcome.kind === 'cancelled') {