@cortexkit/opencode-antigravity-auth 3.0.39 → 3.0.41

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 (262) hide show
  1. package/dist/cli.js +535 -112
  2. package/dist/cli.js.map +4 -4
  3. package/dist/cli.meta.json +67 -38
  4. package/dist/index.js +6899 -3288
  5. package/dist/index.js.map +4 -4
  6. package/dist/index.meta.json +1503 -465
  7. package/dist/server.js +7028 -3363
  8. package/dist/server.js.map +4 -4
  9. package/dist/server.meta.json +1 -1
  10. package/dist/src/common-auth-embedded/claustrum/enrollment.d.ts +25 -4
  11. package/dist/src/common-auth-embedded/claustrum/enrollment.js +81 -4
  12. package/dist/src/common-auth-embedded/claustrum/index.d.ts +1 -1
  13. package/dist/src/common-auth-embedded/claustrum/index.js +1 -1
  14. package/dist/src/common-auth-embedded/commands/builtins.d.ts +20 -1
  15. package/dist/src/common-auth-embedded/commands/builtins.js +28 -12
  16. package/dist/src/common-auth-embedded/commands/index.d.ts +1 -1
  17. package/dist/src/common-auth-embedded/commands/menu.d.ts +6 -1
  18. package/dist/src/common-auth-embedded/commands/menu.js +1 -0
  19. package/dist/src/common-auth-embedded/fs/file-read-cache.js +9 -5
  20. package/dist/src/common-auth-embedded/fs/refresh-file-lock.d.ts +11 -0
  21. package/dist/src/common-auth-embedded/fs/refresh-file-lock.js +146 -2
  22. package/dist/src/common-auth-embedded/fs/with-lock.d.ts +2 -0
  23. package/dist/src/common-auth-embedded/fs/with-lock.js +1 -1
  24. package/dist/src/common-auth-embedded/settings/define.d.ts +35 -0
  25. package/dist/src/common-auth-embedded/settings/define.js +52 -0
  26. package/dist/src/common-auth-embedded/settings/descriptors.d.ts +97 -0
  27. package/dist/src/common-auth-embedded/settings/descriptors.js +81 -0
  28. package/dist/src/common-auth-embedded/settings/edit.d.ts +24 -0
  29. package/dist/src/common-auth-embedded/settings/edit.js +229 -0
  30. package/dist/src/common-auth-embedded/settings/fs.js +19 -0
  31. package/dist/src/common-auth-embedded/settings/handle.d.ts +30 -0
  32. package/dist/src/common-auth-embedded/settings/handle.js +228 -0
  33. package/dist/src/common-auth-embedded/settings/index.d.ts +10 -0
  34. package/dist/src/common-auth-embedded/settings/index.js +7 -0
  35. package/dist/src/common-auth-embedded/settings/lock-errors.js +15 -0
  36. package/dist/src/common-auth-embedded/settings/move.d.ts +76 -0
  37. package/dist/src/common-auth-embedded/settings/move.js +351 -0
  38. package/dist/src/common-auth-embedded/settings/parse.d.ts +24 -0
  39. package/dist/src/common-auth-embedded/settings/parse.js +65 -0
  40. package/dist/src/common-auth-embedded/settings/paths.d.ts +12 -0
  41. package/dist/src/common-auth-embedded/settings/paths.js +48 -0
  42. package/dist/src/common-auth-embedded/settings/refusal.d.ts +7 -0
  43. package/dist/src/common-auth-embedded/settings/refusal.js +15 -0
  44. package/dist/src/common-auth-embedded/settings/resolve.d.ts +15 -0
  45. package/dist/src/common-auth-embedded/settings/resolve.js +51 -0
  46. package/dist/src/common-auth-embedded/settings/schema.d.ts +29 -0
  47. package/dist/src/common-auth-embedded/settings/schema.js +81 -0
  48. package/dist/src/common-auth-embedded/settings/snapshot.d.ts +24 -0
  49. package/dist/src/common-auth-embedded/settings/snapshot.js +150 -0
  50. package/dist/src/common-auth-embedded/settings/update.js +139 -0
  51. package/dist/src/common-auth-embedded/settings/write.js +88 -0
  52. package/dist/src/common-auth-embedded/setup/command-error.d.ts +1 -1
  53. package/dist/src/common-auth-embedded/setup/command-error.js +4 -2
  54. package/dist/src/common-auth-embedded/setup/command.js +23 -6
  55. package/dist/src/common-auth-embedded/setup/enroll.d.ts +2 -2
  56. package/dist/src/common-auth-embedded/setup/enroll.js +13 -3
  57. package/dist/src/common-auth-embedded/setup/enrollment-access.js +86 -0
  58. package/dist/src/common-auth-embedded/setup/index.d.ts +1 -1
  59. package/dist/src/common-auth-embedded/setup/types.d.ts +16 -1
  60. package/dist/src/common-auth-embedded/source-output.json +314 -70
  61. package/dist/src/common-auth-embedded/tui-prefs/watcher.js +196 -0
  62. package/dist/src/ga/tui/host-ga.js +1 -1
  63. package/dist/src/ga/tui/host-ga.js.map +1 -1
  64. package/dist/src/plugin/__fixtures__/verified-store.js +2 -2
  65. package/dist/src/plugin/command-apply.d.ts +43 -3
  66. package/dist/src/plugin/command-apply.d.ts.map +1 -1
  67. package/dist/src/plugin/command-apply.js +92 -12
  68. package/dist/src/plugin/command-apply.js.map +1 -1
  69. package/dist/src/plugin/commands.d.ts +5 -1
  70. package/dist/src/plugin/commands.d.ts.map +1 -1
  71. package/dist/src/plugin/commands.js +4 -3
  72. package/dist/src/plugin/commands.js.map +1 -1
  73. package/dist/src/plugin/config/writer.d.ts +10 -3
  74. package/dist/src/plugin/config/writer.d.ts.map +1 -1
  75. package/dist/src/plugin/config/writer.js +30 -22
  76. package/dist/src/plugin/config/writer.js.map +1 -1
  77. package/dist/src/plugin/fetch-interceptor.d.ts +8 -3
  78. package/dist/src/plugin/fetch-interceptor.d.ts.map +1 -1
  79. package/dist/src/plugin/fetch-interceptor.js +1 -0
  80. package/dist/src/plugin/fetch-interceptor.js.map +1 -1
  81. package/dist/src/plugin/ga-location-services.d.ts +3 -1
  82. package/dist/src/plugin/ga-location-services.d.ts.map +1 -1
  83. package/dist/src/plugin/ga-location-services.js +35 -5
  84. package/dist/src/plugin/ga-location-services.js.map +1 -1
  85. package/dist/src/plugin/index.d.ts.map +1 -1
  86. package/dist/src/plugin/index.js +65 -15
  87. package/dist/src/plugin/index.js.map +1 -1
  88. package/dist/src/plugin/killswitch.d.ts +20 -0
  89. package/dist/src/plugin/killswitch.d.ts.map +1 -1
  90. package/dist/src/plugin/killswitch.js +14 -4
  91. package/dist/src/plugin/killswitch.js.map +1 -1
  92. package/dist/src/plugin/logger.d.ts +3 -1
  93. package/dist/src/plugin/logger.d.ts.map +1 -1
  94. package/dist/src/plugin/logger.js +15 -7
  95. package/dist/src/plugin/logger.js.map +1 -1
  96. package/dist/src/plugin/operator-settings.d.ts +6 -0
  97. package/dist/src/plugin/operator-settings.d.ts.map +1 -1
  98. package/dist/src/plugin/operator-settings.js.map +1 -1
  99. package/dist/src/plugin/request-helpers.d.ts +5 -0
  100. package/dist/src/plugin/request-helpers.d.ts.map +1 -1
  101. package/dist/src/plugin/request-helpers.js +11 -2
  102. package/dist/src/plugin/request-helpers.js.map +1 -1
  103. package/dist/src/plugin/shared/request-services.d.ts +10 -1
  104. package/dist/src/plugin/shared/request-services.d.ts.map +1 -1
  105. package/dist/src/plugin/shared/request-services.js +125 -22
  106. package/dist/src/plugin/shared/request-services.js.map +1 -1
  107. package/dist/src/plugin/shared/runtime.d.ts +15 -0
  108. package/dist/src/plugin/shared/runtime.d.ts.map +1 -1
  109. package/dist/src/plugin/shared/runtime.js +43 -11
  110. package/dist/src/plugin/shared/runtime.js.map +1 -1
  111. package/dist/src/plugin/shared/vault-billing.d.ts +30 -0
  112. package/dist/src/plugin/shared/vault-billing.d.ts.map +1 -0
  113. package/dist/src/plugin/shared/vault-billing.js +196 -0
  114. package/dist/src/plugin/shared/vault-billing.js.map +1 -0
  115. package/dist/src/plugin/shared/vault-menu.d.ts +11 -1
  116. package/dist/src/plugin/shared/vault-menu.d.ts.map +1 -1
  117. package/dist/src/plugin/shared/vault-menu.js +33 -7
  118. package/dist/src/plugin/shared/vault-menu.js.map +1 -1
  119. package/dist/src/plugin/vault-custody.d.ts.map +1 -1
  120. package/dist/src/plugin/vault-custody.js +3 -0
  121. package/dist/src/plugin/vault-custody.js.map +1 -1
  122. package/dist/src/settings/core-settings.d.ts +7 -0
  123. package/dist/src/settings/core-settings.d.ts.map +1 -0
  124. package/dist/src/settings/core-settings.js +7 -0
  125. package/dist/src/settings/core-settings.js.map +1 -0
  126. package/dist/src/settings/legacy.d.ts +89 -0
  127. package/dist/src/settings/legacy.d.ts.map +1 -0
  128. package/dist/src/settings/legacy.js +184 -0
  129. package/dist/src/settings/legacy.js.map +1 -0
  130. package/dist/src/settings/location.d.ts +22 -0
  131. package/dist/src/settings/location.d.ts.map +1 -0
  132. package/dist/src/settings/location.js +49 -0
  133. package/dist/src/settings/location.js.map +1 -0
  134. package/dist/src/settings/move.d.ts +38 -0
  135. package/dist/src/settings/move.d.ts.map +1 -0
  136. package/dist/src/settings/move.js +83 -0
  137. package/dist/src/settings/move.js.map +1 -0
  138. package/dist/src/settings/protection.d.ts +11 -0
  139. package/dist/src/settings/protection.d.ts.map +1 -0
  140. package/dist/src/settings/protection.js +17 -0
  141. package/dist/src/settings/protection.js.map +1 -0
  142. package/dist/src/settings/report.d.ts +33 -0
  143. package/dist/src/settings/report.d.ts.map +1 -0
  144. package/dist/src/settings/report.js +103 -0
  145. package/dist/src/settings/report.js.map +1 -0
  146. package/dist/src/settings/runtime.d.ts +145 -0
  147. package/dist/src/settings/runtime.d.ts.map +1 -0
  148. package/dist/src/settings/runtime.js +697 -0
  149. package/dist/src/settings/runtime.js.map +1 -0
  150. package/dist/src/setup.d.ts.map +1 -1
  151. package/dist/src/setup.js +12 -0
  152. package/dist/src/setup.js.map +1 -1
  153. package/dist/tui-build-map.json +1 -1
  154. package/dist/tui-ga-build-map.json +5 -5
  155. package/dist/types/src/common-auth-embedded/claustrum/enrollment.d.ts +25 -4
  156. package/dist/types/src/common-auth-embedded/claustrum/index.d.ts +1 -1
  157. package/dist/types/src/common-auth-embedded/commands/builtins.d.ts +20 -1
  158. package/dist/types/src/common-auth-embedded/commands/index.d.ts +1 -1
  159. package/dist/types/src/common-auth-embedded/commands/menu.d.ts +6 -1
  160. package/dist/types/src/common-auth-embedded/fs/refresh-file-lock.d.ts +11 -0
  161. package/dist/types/src/common-auth-embedded/setup/command-error.d.ts +1 -1
  162. package/dist/types/src/common-auth-embedded/setup/enroll.d.ts +2 -2
  163. package/dist/types/src/common-auth-embedded/setup/index.d.ts +1 -1
  164. package/dist/types/src/common-auth-embedded/setup/types.d.ts +16 -1
  165. package/dist/types/src/plugin/command-apply.d.ts +43 -3
  166. package/dist/types/src/plugin/command-apply.d.ts.map +1 -1
  167. package/dist/types/src/plugin/commands.d.ts +5 -1
  168. package/dist/types/src/plugin/commands.d.ts.map +1 -1
  169. package/dist/types/src/plugin/config/writer.d.ts +10 -3
  170. package/dist/types/src/plugin/config/writer.d.ts.map +1 -1
  171. package/dist/types/src/plugin/fetch-interceptor.d.ts +8 -3
  172. package/dist/types/src/plugin/fetch-interceptor.d.ts.map +1 -1
  173. package/dist/types/src/plugin/ga-location-services.d.ts +3 -1
  174. package/dist/types/src/plugin/ga-location-services.d.ts.map +1 -1
  175. package/dist/types/src/plugin/index.d.ts.map +1 -1
  176. package/dist/types/src/plugin/killswitch.d.ts +20 -0
  177. package/dist/types/src/plugin/killswitch.d.ts.map +1 -1
  178. package/dist/types/src/plugin/logger.d.ts +3 -1
  179. package/dist/types/src/plugin/logger.d.ts.map +1 -1
  180. package/dist/types/src/plugin/operator-settings.d.ts +6 -0
  181. package/dist/types/src/plugin/operator-settings.d.ts.map +1 -1
  182. package/dist/types/src/plugin/request-helpers.d.ts +5 -0
  183. package/dist/types/src/plugin/request-helpers.d.ts.map +1 -1
  184. package/dist/types/src/plugin/shared/request-services.d.ts +10 -1
  185. package/dist/types/src/plugin/shared/request-services.d.ts.map +1 -1
  186. package/dist/types/src/plugin/shared/runtime.d.ts +15 -0
  187. package/dist/types/src/plugin/shared/runtime.d.ts.map +1 -1
  188. package/dist/types/src/plugin/shared/vault-billing.d.ts +30 -0
  189. package/dist/types/src/plugin/shared/vault-billing.d.ts.map +1 -0
  190. package/dist/types/src/plugin/shared/vault-menu.d.ts +11 -1
  191. package/dist/types/src/plugin/shared/vault-menu.d.ts.map +1 -1
  192. package/dist/types/src/plugin/vault-custody.d.ts.map +1 -1
  193. package/dist/types/src/settings/core-settings.d.ts +7 -0
  194. package/dist/types/src/settings/core-settings.d.ts.map +1 -0
  195. package/dist/types/src/settings/legacy.d.ts +89 -0
  196. package/dist/types/src/settings/legacy.d.ts.map +1 -0
  197. package/dist/types/src/settings/location.d.ts +22 -0
  198. package/dist/types/src/settings/location.d.ts.map +1 -0
  199. package/dist/types/src/settings/move.d.ts +38 -0
  200. package/dist/types/src/settings/move.d.ts.map +1 -0
  201. package/dist/types/src/settings/protection.d.ts +11 -0
  202. package/dist/types/src/settings/protection.d.ts.map +1 -0
  203. package/dist/types/src/settings/report.d.ts +33 -0
  204. package/dist/types/src/settings/report.d.ts.map +1 -0
  205. package/dist/types/src/settings/runtime.d.ts +145 -0
  206. package/dist/types/src/settings/runtime.d.ts.map +1 -0
  207. package/dist/types/src/setup.d.ts.map +1 -1
  208. package/package.json +4 -3
  209. package/src/common-auth-embedded/claustrum/enrollment.d.ts +25 -4
  210. package/src/common-auth-embedded/claustrum/enrollment.js +81 -4
  211. package/src/common-auth-embedded/claustrum/index.d.ts +1 -1
  212. package/src/common-auth-embedded/claustrum/index.js +1 -1
  213. package/src/common-auth-embedded/commands/builtins.d.ts +20 -1
  214. package/src/common-auth-embedded/commands/builtins.js +28 -12
  215. package/src/common-auth-embedded/commands/index.d.ts +1 -1
  216. package/src/common-auth-embedded/commands/menu.d.ts +6 -1
  217. package/src/common-auth-embedded/commands/menu.js +1 -0
  218. package/src/common-auth-embedded/fs/file-read-cache.js +9 -5
  219. package/src/common-auth-embedded/fs/refresh-file-lock.d.ts +11 -0
  220. package/src/common-auth-embedded/fs/refresh-file-lock.js +146 -2
  221. package/src/common-auth-embedded/fs/with-lock.d.ts +2 -0
  222. package/src/common-auth-embedded/fs/with-lock.js +1 -1
  223. package/src/common-auth-embedded/settings/define.d.ts +35 -0
  224. package/src/common-auth-embedded/settings/define.js +52 -0
  225. package/src/common-auth-embedded/settings/descriptors.d.ts +97 -0
  226. package/src/common-auth-embedded/settings/descriptors.js +81 -0
  227. package/src/common-auth-embedded/settings/edit.d.ts +24 -0
  228. package/src/common-auth-embedded/settings/edit.js +229 -0
  229. package/src/common-auth-embedded/settings/fs.js +19 -0
  230. package/src/common-auth-embedded/settings/handle.d.ts +30 -0
  231. package/src/common-auth-embedded/settings/handle.js +228 -0
  232. package/src/common-auth-embedded/settings/index.d.ts +10 -0
  233. package/src/common-auth-embedded/settings/index.js +7 -0
  234. package/src/common-auth-embedded/settings/lock-errors.js +15 -0
  235. package/src/common-auth-embedded/settings/move.d.ts +76 -0
  236. package/src/common-auth-embedded/settings/move.js +351 -0
  237. package/src/common-auth-embedded/settings/parse.d.ts +24 -0
  238. package/src/common-auth-embedded/settings/parse.js +65 -0
  239. package/src/common-auth-embedded/settings/paths.d.ts +12 -0
  240. package/src/common-auth-embedded/settings/paths.js +48 -0
  241. package/src/common-auth-embedded/settings/refusal.d.ts +7 -0
  242. package/src/common-auth-embedded/settings/refusal.js +15 -0
  243. package/src/common-auth-embedded/settings/resolve.d.ts +15 -0
  244. package/src/common-auth-embedded/settings/resolve.js +51 -0
  245. package/src/common-auth-embedded/settings/schema.d.ts +29 -0
  246. package/src/common-auth-embedded/settings/schema.js +81 -0
  247. package/src/common-auth-embedded/settings/snapshot.d.ts +24 -0
  248. package/src/common-auth-embedded/settings/snapshot.js +150 -0
  249. package/src/common-auth-embedded/settings/update.js +139 -0
  250. package/src/common-auth-embedded/settings/write.js +88 -0
  251. package/src/common-auth-embedded/setup/command-error.d.ts +1 -1
  252. package/src/common-auth-embedded/setup/command-error.js +4 -2
  253. package/src/common-auth-embedded/setup/command.js +23 -6
  254. package/src/common-auth-embedded/setup/enroll.d.ts +2 -2
  255. package/src/common-auth-embedded/setup/enroll.js +13 -3
  256. package/src/common-auth-embedded/setup/enrollment-access.js +86 -0
  257. package/src/common-auth-embedded/setup/index.d.ts +1 -1
  258. package/src/common-auth-embedded/setup/types.d.ts +16 -1
  259. package/src/common-auth-embedded/source-output.json +314 -70
  260. package/src/common-auth-embedded/tui-prefs/watcher.js +196 -0
  261. package/src/tui-ga-compiled/host-ga.js +1 -1
  262. package/src/tui-ga-raw/host-ga.tsx +1 -1
@@ -0,0 +1,88 @@
1
+ import { randomUUID } from 'node:crypto';
2
+ import { SettingsFs } from './fs.js';
3
+ import { SettingsRefusal } from './refusal.js';
4
+ let stepHook;
5
+ const HARD_LINK_UNSUPPORTED = new Set([
6
+ 'EPERM',
7
+ 'ENOTSUP',
8
+ 'EOPNOTSUPP',
9
+ 'ENOSYS',
10
+ ]);
11
+ /** Internal test hook, deliberately absent from the package entry point. */
12
+ export function setSettingsWriteStepHookForTest(hook) {
13
+ stepHook = hook;
14
+ }
15
+ /** Publish already validated edits while the caller holds the target's lock. */
16
+ export async function writeSettings(options) {
17
+ const { target, text, hasBom, existingMode, lock, logger } = options;
18
+ const platform = options.platform ?? process.platform;
19
+ const temp = `${target}.${randomUUID()}.tmp`;
20
+ let staged = false;
21
+ let published = false;
22
+ try {
23
+ const file = await SettingsFs.open(temp, 'wx', 0o644);
24
+ staged = true;
25
+ try {
26
+ await file.writeFile(`${hasBom ? '\uFEFF' : ''}${text}`, 'utf8');
27
+ if (platform !== 'win32' && existingMode !== undefined) {
28
+ await file.chmod(existingMode & 0o777);
29
+ }
30
+ await file.sync();
31
+ }
32
+ finally {
33
+ await file.close();
34
+ }
35
+ await stepHook?.('staged', { target, temp });
36
+ await lock.assertOwned();
37
+ if (existingMode !== undefined) {
38
+ try {
39
+ await SettingsFs.rename(temp, target);
40
+ }
41
+ catch (error) {
42
+ if (platform === 'win32' &&
43
+ ['EPERM', 'EACCES', 'EBUSY'].includes(error.code ?? '')) {
44
+ throw new SettingsRefusal('settings-busy', `Settings file is busy: ${target}`, { cause: error });
45
+ }
46
+ throw error;
47
+ }
48
+ published = true;
49
+ }
50
+ else {
51
+ try {
52
+ // A hard link never replaces a file created since the locked read.
53
+ await SettingsFs.link(temp, target);
54
+ }
55
+ catch (error) {
56
+ const code = error.code ?? '';
57
+ if (code === 'EEXIST') {
58
+ throw new SettingsRefusal('settings-busy', `Settings file appeared before publication: ${target}`, { cause: error });
59
+ }
60
+ // Some filesystems (FAT, exFAT, some network and user-space mounts) have no
61
+ // hard links. A non-atomic create could expose a half-written file, so
62
+ // refuse instead of falling back.
63
+ if (HARD_LINK_UNSUPPORTED.has(code)) {
64
+ throw new SettingsRefusal('settings-unavailable', `Settings file cannot be created on this filesystem: ${target}`, { cause: error });
65
+ }
66
+ throw error;
67
+ }
68
+ published = true;
69
+ try {
70
+ await SettingsFs.unlink(temp);
71
+ }
72
+ catch (error) {
73
+ // Publication succeeded; an orphaned temp must not turn it into a refusal.
74
+ logger?.warn('Settings temp cleanup failed after publication', {
75
+ target,
76
+ temp,
77
+ error,
78
+ });
79
+ }
80
+ }
81
+ return { outcome: 'updated' };
82
+ }
83
+ finally {
84
+ if (staged && !published) {
85
+ await SettingsFs.unlink(temp).catch(() => { });
86
+ }
87
+ }
88
+ }
@@ -17,7 +17,7 @@ export declare class SetupCommandError extends Error {
17
17
  });
18
18
  }
19
19
  /** The line setup prints for one host's outcome, e.g. `Pi: not connected`. */
20
- export declare function setupEnrollmentLine({ host, outcome, }: SetupHostEnrollment): string;
20
+ export declare function setupEnrollmentLine({ host, outcome, access }: SetupHostEnrollment, grantFallback?: 'setup' | 'plugin'): string;
21
21
  /**
22
22
  * Remember which hosts a failed setup left connected to the vault, against the
23
23
  * thrown value. Only objects can carry a record; a thrown primitive is left as
@@ -1,5 +1,6 @@
1
1
  import { redact } from '../logger/redact.js';
2
2
  import { STDERR_TAIL_MAX_BYTES } from './command-runner.js';
3
+ import { enrollmentAccessLines } from './enrollment-access.js';
3
4
  const PI_INSTALL_ERROR_MESSAGE = 'Pi install failed; run pi install after checking your npm connection.';
4
5
  function utf8Tail(value) {
5
6
  const bytes = Buffer.from(value, 'utf8');
@@ -47,8 +48,9 @@ const OUTCOME_TEXT = {
47
48
  unknown: 'unknown, check with ck auth status',
48
49
  };
49
50
  /** The line setup prints for one host's outcome, e.g. `Pi: not connected`. */
50
- export function setupEnrollmentLine({ host, outcome, }) {
51
- return `${HOST_LABELS[host]}: ${OUTCOME_TEXT[outcome]}`;
51
+ export function setupEnrollmentLine({ host, outcome, access }, grantFallback = 'setup') {
52
+ const lines = access ? enrollmentAccessLines(access, grantFallback) : [];
53
+ return `${HOST_LABELS[host]}: ${OUTCOME_TEXT[outcome]}${lines.length ? ` — ${lines.join('\n')}` : ''}`;
52
54
  }
53
55
  // Outcomes recorded against the value a failed `runSetup` threw. A WeakMap
54
56
  // keeps the thrown value itself untouched: setup never reads, rewrites or
@@ -1,11 +1,12 @@
1
1
  import { select } from '../auth-menu/select.js';
2
2
  import { isInteractive, printLine, processTerminal, } from '../auth-menu/terminal.js';
3
- import { hostEnrollmentPaths, vaultAuthority } from '../claustrum/enrollment.js';
3
+ import { hostEnrollmentPaths, readClaustrumEnrollmentStatus, validEnrollmentRequestedGrants, vaultAuthority, } from '../claustrum/enrollment.js';
4
4
  import { hasVaultHost, VAULT_HOST_CONNECT_REFUSAL } from '../claustrum/host.js';
5
5
  import { recordSetupEnrollment, setupEnrollmentLine } from './command-error.js';
6
6
  import { defaultCommandRunner } from './command-runner.js';
7
7
  import { detectHosts } from './detect.js';
8
8
  import { connectSetupHost, HostNotEnrolledError } from './enroll.js';
9
+ import { confirmEnrollmentAccess } from './enrollment-access.js';
9
10
  import { parseSetupFlags, UNAVAILABLE_HOST_MESSAGE } from './flags.js';
10
11
  import { setupPaths } from './paths.js';
11
12
  import { assertHostsStopped, createProcessFence, ProcessFenceViolationError, ProcessInspectionError, } from './process-fence.js';
@@ -22,6 +23,13 @@ function validatePlugin(plugin) {
22
23
  for (const host of Object.values(plugin.vault.hosts)) {
23
24
  if (!/^[a-z0-9][a-z0-9-]*$/.test(host.name))
24
25
  throw new Error('Setup requires lowercase vault names containing only letters, digits and dashes.');
26
+ if (host.requestedGrants !== undefined &&
27
+ !validEnrollmentRequestedGrants(host.requestedGrants))
28
+ throw new Error('invalid Claustrum enrollment requested grants');
29
+ if (host.grantFallback !== undefined &&
30
+ host.grantFallback !== 'setup' &&
31
+ host.grantFallback !== 'plugin')
32
+ throw new Error('invalid Claustrum enrollment grant fallback');
25
33
  }
26
34
  }
27
35
  /**
@@ -31,10 +39,11 @@ function validatePlugin(plugin) {
31
39
  * authority once with `vaultAuthority`; if that read fails it stays
32
40
  * `unknown`.
33
41
  */
34
- async function enrollmentReport(plugin, hosts, recorded) {
42
+ async function enrollmentReport(plugin, hosts, recorded, recordedAccess) {
35
43
  const report = [];
36
44
  for (const host of hosts) {
37
45
  let outcome = recorded.get(host) ?? 'not-enrolled';
46
+ let access = recordedAccess.get(host);
38
47
  if (outcome === 'unknown') {
39
48
  const { name, paths } = plugin.vault.hosts[host];
40
49
  const authority = await vaultAuthority(hostEnrollmentPaths(paths), name).catch(() => 'unreadable');
@@ -42,8 +51,13 @@ async function enrollmentReport(plugin, hosts, recorded) {
42
51
  outcome = 'enrolled';
43
52
  else if (authority === 'local')
44
53
  outcome = 'not-enrolled';
54
+ if (outcome === 'enrolled') {
55
+ const status = await readClaustrumEnrollmentStatus(hostEnrollmentPaths(paths), name).catch(() => undefined);
56
+ if (status?.state === 'approved')
57
+ access = await confirmEnrollmentAccess({}, status, hostEnrollmentPaths(paths).tokenPath, plugin.vault.hosts[host].requestedGrants);
58
+ }
45
59
  }
46
- report.push({ host, outcome });
60
+ report.push({ host, outcome, ...(access && { access }) });
47
61
  }
48
62
  return report;
49
63
  }
@@ -207,6 +221,7 @@ export async function runSetup(plugin, argv = [], io = {}) {
207
221
  // Each host's vault enrollment as it happens. A host the operator approved
208
222
  // stays enrolled if a later step fails, so a failure reports this record.
209
223
  const enrollment = new Map();
224
+ const enrollmentAccess = new Map();
210
225
  try {
211
226
  for (const host of hosts) {
212
227
  await stopped();
@@ -215,7 +230,9 @@ export async function runSetup(plugin, argv = [], io = {}) {
215
230
  if (useVault) {
216
231
  enrollment.set(host, 'unknown');
217
232
  try {
218
- await connectSetupHost(plugin, host, io, terminal, stopped);
233
+ const access = await connectSetupHost(plugin, host, io, terminal, stopped);
234
+ if (access)
235
+ enrollmentAccess.set(host, access);
219
236
  }
220
237
  catch (error) {
221
238
  if (error instanceof HostNotEnrolledError)
@@ -248,10 +265,10 @@ export async function runSetup(plugin, argv = [], io = {}) {
248
265
  // then rethrow the original value untouched. Reporting must never
249
266
  // replace the failure, so its own errors are ignored.
250
267
  try {
251
- const report = await enrollmentReport(plugin, hosts, enrollment);
268
+ const report = await enrollmentReport(plugin, hosts, enrollment, enrollmentAccess);
252
269
  recordSetupEnrollment(error, report);
253
270
  for (const entry of report)
254
- printLine(terminal, setupEnrollmentLine(entry));
271
+ printLine(terminal, setupEnrollmentLine(entry, plugin.vault.hosts[entry.host].grantFallback));
255
272
  }
256
273
  catch { }
257
274
  throw error;
@@ -1,5 +1,5 @@
1
1
  import { type MenuTerminal } from '../auth-menu/terminal.js';
2
- import type { SetupHost, SetupIO, SetupPlugin } from './types.js';
2
+ import type { SetupEnrollmentAccess, SetupHost, SetupIO, SetupPlugin } from './types.js';
3
3
  /** Fixed text: no version, host or account detail, so it is safe to print anywhere. */
4
4
  export declare const UNSUPPORTED_VAULT_MESSAGE = "This Claustrum vault is too old to connect plugins. Run ck upgrade to move to Claustrum v0.2.0 or newer (read \"Upgrading from v0.1.3\" in its release notes first), or run setup without --claustrum to use local accounts.";
5
5
  /**
@@ -31,4 +31,4 @@ export declare class HostNotEnrolledError extends Error {
31
31
  });
32
32
  }
33
33
  /** Enroll an independently revocable host; plugin callbacks choose its credential store and account permissions. */
34
- export declare function connectSetupHost(plugin: SetupPlugin, host: SetupHost, io: SetupIO, terminal: MenuTerminal, fence: () => Promise<void>): Promise<void>;
34
+ export declare function connectSetupHost(plugin: SetupPlugin, host: SetupHost, io: SetupIO, terminal: MenuTerminal, fence: () => Promise<void>): Promise<SetupEnrollmentAccess | undefined>;
@@ -3,6 +3,7 @@ import { writeEnrollmentTokenFile } from '@cortexkit/claustrum-client';
3
3
  import { printLine } from '../auth-menu/terminal.js';
4
4
  import { ClaustrumEnrollmentManager, connectClaustrumEnrollmentClient, hostEnrollmentPaths, UNSUPPORTED_ENROLLMENT_CODE, } from '../claustrum/enrollment.js';
5
5
  import { hasVaultHost, VAULT_HOST_CONNECT_REFUSAL } from '../claustrum/host.js';
6
+ import { confirmEnrollmentAccess, enrollmentAccessLines, } from './enrollment-access.js';
6
7
  import { ProcessFenceViolationError, ProcessInspectionError, } from './process-fence.js';
7
8
  const ENROLLMENT_INCOMPLETE_MESSAGE = 'Claustrum enrollment did not complete. Inspect and approve with ck, then rerun setup.';
8
9
  /** Fixed text: no version, host or account detail, so it is safe to print anywhere. */
@@ -54,7 +55,7 @@ function approveCommand(requestId, name) {
54
55
  export async function connectSetupHost(plugin, host, io, terminal, fence) {
55
56
  if (hasVaultHost())
56
57
  throw new Error(VAULT_HOST_CONNECT_REFUSAL);
57
- const { name, displayName, paths: input } = plugin.vault.hosts[host];
58
+ const { name, displayName, requestedGrants, grantFallback, paths: input, } = plugin.vault.hosts[host];
58
59
  const paths = hostEnrollmentPaths(input);
59
60
  await fence();
60
61
  const client = await (io.connect ?? connectClaustrumEnrollmentClient)({
@@ -69,6 +70,7 @@ export async function connectSetupHost(plugin, host, io, terminal, fence) {
69
70
  const manager = new ClaustrumEnrollmentManager({
70
71
  proposedName: name,
71
72
  displayName,
73
+ requestedGrants,
72
74
  paths,
73
75
  // Each tick of the wait below checks the fence once, just before
74
76
  // reconcile proposes or polls. Checking again inside every vault call
@@ -85,7 +87,11 @@ export async function connectSetupHost(plugin, host, io, terminal, fence) {
85
87
  const initial = await manager.status();
86
88
  if (initial.state === 'approved') {
87
89
  printLine(terminal, `Already connected as ${initial.approvedName ?? initial.proposedName}.`);
88
- return;
90
+ const access = await confirmEnrollmentAccess(client, initial, paths.tokenPath, requestedGrants);
91
+ if (access)
92
+ for (const line of enrollmentAccessLines(access, grantFallback))
93
+ printLine(terminal, line);
94
+ return access;
89
95
  }
90
96
  printLine(terminal, `Asking the vault to connect ${name}…`);
91
97
  const deadline = now() + ENROLLMENT_WAIT_MS;
@@ -97,7 +103,11 @@ export async function connectSetupHost(plugin, host, io, terminal, fence) {
97
103
  const status = await manager.reconcile();
98
104
  if (status.state === 'approved') {
99
105
  printLine(terminal, `Connected ${host} to Claustrum.`);
100
- return;
106
+ const access = await confirmEnrollmentAccess(client, status, paths.tokenPath, requestedGrants);
107
+ if (access)
108
+ for (const line of enrollmentAccessLines(access, grantFallback))
109
+ printLine(terminal, line);
110
+ return access;
101
111
  }
102
112
  if (status.state === 'unavailable' &&
103
113
  status.code === UNSUPPORTED_ENROLLMENT_CODE)
@@ -0,0 +1,86 @@
1
+ import { readClaustrumEnrollmentToken } from '../claustrum/enrollment.js';
2
+ function shellArgument(value) {
3
+ if (/^[a-zA-Z0-9_:@./-]+$/.test(value))
4
+ return value;
5
+ return process.platform === 'win32'
6
+ ? `'${value.replaceAll("'", "''")}'`
7
+ : `'${value.replaceAll("'", "'\\''")}'`;
8
+ }
9
+ /** Check access on the enrollment connection, after the token has reached disk. */
10
+ export async function confirmEnrollmentAccess(client, status, tokenPath, configuredGrants) {
11
+ const requestedGrants = status.requestedGrants ?? configuredGrants;
12
+ if (!requestedGrants)
13
+ return undefined;
14
+ const grants = requestedGrants.map((grant) => ({
15
+ grant,
16
+ ...(status.approvedName !== undefined && {
17
+ grantCommand: `ck auth grant --principal ${shellArgument(`enrolled:${status.approvedName}`)} --selector-kind ${grant.selector.exact === undefined ? 'category' : 'exact'} --selector ${shellArgument(grant.selector.exact ?? grant.selector.category)} --operation ${grant.operation}`,
18
+ }),
19
+ }));
20
+ const access = {
21
+ grants,
22
+ ...(status.requestedGrantsStatus !== undefined && {
23
+ requestedGrantsStatus: status.requestedGrantsStatus,
24
+ }),
25
+ };
26
+ if (status.requestedGrantsStatus === 'dropped')
27
+ return { ...access, state: 'older-vault' };
28
+ try {
29
+ if (!client.listScoped)
30
+ return { ...access, state: 'unconfirmed' };
31
+ const { token } = await readClaustrumEnrollmentToken(tokenPath);
32
+ const inventory = await client.listScoped(token);
33
+ const confirmed = grants.map((entry) => ({
34
+ ...entry,
35
+ reachableLogins: inventory.rows.filter((row) => row.operations.includes(entry.grant.operation) &&
36
+ (entry.grant.selector.exact !== undefined
37
+ ? row.id === entry.grant.selector.exact
38
+ : row.categories.includes(entry.grant.selector.category))).length,
39
+ }));
40
+ return {
41
+ ...access,
42
+ state: confirmed.every((entry) => entry.reachableLogins > 0)
43
+ ? 'reachable'
44
+ : confirmed.some((entry) => entry.reachableLogins > 0)
45
+ ? 'partial'
46
+ : 'no-logins',
47
+ grants: confirmed.map((entry) => {
48
+ if (entry.reachableLogins === 0)
49
+ return entry;
50
+ const { grantCommand: _, ...reachable } = entry;
51
+ return reachable;
52
+ }),
53
+ };
54
+ }
55
+ catch {
56
+ // A listing failure cannot undo approval, and its error may contain secrets.
57
+ return { ...access, state: 'unconfirmed' };
58
+ }
59
+ }
60
+ export function enrollmentAccessLines(access, grantFallback = 'setup') {
61
+ if (grantFallback === 'plugin' && access.requestedGrantsStatus !== 'sent')
62
+ return [];
63
+ const lines = [];
64
+ const remedy = access.grants.some((entry) => entry.grantCommand)
65
+ ? 'run:'
66
+ : 'check ck auth status for the approved name before granting access.';
67
+ if (access.state === 'older-vault')
68
+ lines.push(`Approved. This vault is too old to grant access with the approval; ${remedy}`);
69
+ else if (access.state === 'no-logins')
70
+ lines.push(`Approved, but no logins are reachable yet; ${remedy}`);
71
+ else if (access.state === 'partial')
72
+ lines.push(`Approved, but some requested access has no reachable logins yet; ${remedy}`);
73
+ else if (access.state === 'unconfirmed')
74
+ lines.push(`Approved, but access could not be confirmed; ${access.grants.some((entry) => entry.grantCommand) ? 'check ck auth status or run:' : remedy}`);
75
+ for (const { grant, reachableLogins, grantCommand } of access.grants) {
76
+ if (reachableLogins !== undefined && reachableLogins > 0) {
77
+ const target = grant.selector.exact === undefined
78
+ ? `the vault's ${JSON.stringify(grant.selector.category)} accounts`
79
+ : `credential ${JSON.stringify(grant.selector.exact)}`;
80
+ lines.push(`Confirmed ${grant.operation} access to ${target} (${reachableLogins} reachable ${reachableLogins === 1 ? 'login' : 'logins'}).`);
81
+ }
82
+ if (grantCommand)
83
+ lines.push(` ${grantCommand}`);
84
+ }
85
+ return lines;
86
+ }
@@ -5,4 +5,4 @@ export { ENROLLMENT_WAIT_MS, HostNotEnrolledError, type HostNotEnrolledReason, U
5
5
  export { setupUsage } from './flags.js';
6
6
  export { assertHostsStopped, createProcessFence, listSetupProcesses, ProcessFenceViolationError, ProcessInspectionError, type ProcessInspectionStep, } from './process-fence.js';
7
7
  export { type PlannedWrite, planOpenCodeRegistration, registerOpenCode, registerPi, updatePluginConfig, } from './register.js';
8
- export type { CommandResult, CommandRunner, HostDetection, OpenCodeGeneration, ProcessFence, SetupCallbackContext, SetupDetection, SetupEnrollmentOutcome, SetupEnvironment, SetupFileSystem, SetupHost, SetupHostEnrollment, SetupIO, SetupPlugin, SetupResult, } from './types.js';
8
+ export type { CommandResult, CommandRunner, HostDetection, OpenCodeGeneration, ProcessFence, SetupCallbackContext, SetupDetection, SetupEnrollmentAccess, SetupEnrollmentOutcome, SetupEnvironment, SetupFileSystem, SetupHost, SetupHostEnrollment, SetupIO, SetupPlugin, SetupResult, } from './types.js';
@@ -1,5 +1,5 @@
1
1
  import type { MenuTerminal } from '../auth-menu/terminal.js';
2
- import type { ClaustrumEnrollmentConnection, hostEnrollmentPaths } from '../claustrum/index.js';
2
+ import type { ClaustrumEnrollmentConnection, ClaustrumRequestedGrant, hostEnrollmentPaths } from '../claustrum/index.js';
3
3
  export type SetupHost = 'opencode' | 'pi';
4
4
  export type OpenCodeGeneration = '1' | '2' | 'both';
5
5
  export type SetupEnvironment = Record<string, string | undefined>;
@@ -11,9 +11,21 @@ export type SetupEnvironment = Record<string, string | undefined>;
11
11
  * flight and the host's token file could not settle it.
12
12
  */
13
13
  export type SetupEnrollmentOutcome = 'enrolled' | 'not-enrolled' | 'unknown';
14
+ export interface SetupEnrollmentAccess {
15
+ state: 'reachable' | 'no-logins' | 'partial' | 'older-vault' | 'unconfirmed';
16
+ /** Whether grants were sent with the proposal or dropped for an older vault. Absent for enrollments made before 0.44.0. */
17
+ requestedGrantsStatus?: 'sent' | 'dropped';
18
+ /** One result per requested grant, in proposal order. No count means unknown. */
19
+ grants: readonly {
20
+ grant: ClaustrumRequestedGrant;
21
+ reachableLogins?: number;
22
+ grantCommand?: string;
23
+ }[];
24
+ }
14
25
  export interface SetupHostEnrollment {
15
26
  host: SetupHost;
16
27
  outcome: SetupEnrollmentOutcome;
28
+ access?: SetupEnrollmentAccess;
17
29
  }
18
30
  /**
19
31
  * What setup decided before calling a plugin callback. The OpenCode generation
@@ -51,6 +63,9 @@ export interface SetupPlugin {
51
63
  hosts: Record<SetupHost, {
52
64
  name: string;
53
65
  displayName?: string;
66
+ requestedGrants?: ReadonlyArray<ClaustrumRequestedGrant>;
67
+ /** Who reports access when grants were not sent with enrollment; defaults to 'setup'. */
68
+ grantFallback?: 'setup' | 'plugin';
54
69
  paths: Parameters<typeof hostEnrollmentPaths>[0];
55
70
  }>;
56
71
  };