@cortexkit/opencode-antigravity-auth 3.0.10 → 3.0.11

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 (53) hide show
  1. package/dist/cli.js +319 -111
  2. package/dist/cli.js.map +3 -3
  3. package/dist/cli.meta.json +48 -23
  4. package/dist/index.js +457 -211
  5. package/dist/index.js.map +3 -3
  6. package/dist/index.meta.json +55 -30
  7. package/dist/server.js +457 -211
  8. package/dist/server.js.map +3 -3
  9. package/dist/server.meta.json +1 -1
  10. package/dist/src/common-auth-embedded/claustrum/enrollment.d.ts +5 -0
  11. package/dist/src/common-auth-embedded/claustrum/enrollment.js +27 -0
  12. package/dist/src/common-auth-embedded/fs/private-files.d.ts +2 -0
  13. package/dist/src/common-auth-embedded/fs/private-files.js +49 -3
  14. package/dist/src/common-auth-embedded/setup/enroll.d.ts +34 -0
  15. package/dist/src/common-auth-embedded/setup/enroll.js +116 -34
  16. package/dist/src/common-auth-embedded/setup/index.d.ts +1 -0
  17. package/dist/src/common-auth-embedded/setup/index.js +1 -0
  18. package/dist/src/common-auth-embedded/setup/process-fence.d.ts +7 -0
  19. package/dist/src/common-auth-embedded/setup/process-fence.js +56 -1
  20. package/dist/src/common-auth-embedded/setup/types.d.ts +5 -0
  21. package/dist/src/common-auth-embedded/source-output.json +45 -37
  22. package/dist/src/plugin/lifecycle.d.ts.map +1 -1
  23. package/dist/src/plugin/lifecycle.js +48 -27
  24. package/dist/src/plugin/lifecycle.js.map +1 -1
  25. package/dist/src/plugin/shared/request-services.js +2 -2
  26. package/dist/src/plugin/shared/request-services.js.map +1 -1
  27. package/dist/src/plugin/vault-custody.d.ts.map +1 -1
  28. package/dist/src/plugin/vault-custody.js +13 -3
  29. package/dist/src/plugin/vault-custody.js.map +1 -1
  30. package/dist/tui-build-map.json +5 -5
  31. package/dist/tui-ga-build-map.json +1 -1
  32. package/dist/types/src/common-auth-embedded/claustrum/enrollment.d.ts +5 -0
  33. package/dist/types/src/common-auth-embedded/setup/enroll.d.ts +34 -0
  34. package/dist/types/src/common-auth-embedded/setup/index.d.ts +1 -0
  35. package/dist/types/src/common-auth-embedded/setup/process-fence.d.ts +7 -0
  36. package/dist/types/src/common-auth-embedded/setup/types.d.ts +5 -0
  37. package/dist/types/src/plugin/lifecycle.d.ts.map +1 -1
  38. package/dist/types/src/plugin/vault-custody.d.ts.map +1 -1
  39. package/package.json +2 -2
  40. package/src/common-auth-embedded/claustrum/enrollment.d.ts +5 -0
  41. package/src/common-auth-embedded/claustrum/enrollment.js +27 -0
  42. package/src/common-auth-embedded/fs/private-files.d.ts +2 -0
  43. package/src/common-auth-embedded/fs/private-files.js +49 -3
  44. package/src/common-auth-embedded/setup/enroll.d.ts +34 -0
  45. package/src/common-auth-embedded/setup/enroll.js +116 -34
  46. package/src/common-auth-embedded/setup/index.d.ts +1 -0
  47. package/src/common-auth-embedded/setup/index.js +1 -0
  48. package/src/common-auth-embedded/setup/process-fence.d.ts +7 -0
  49. package/src/common-auth-embedded/setup/process-fence.js +56 -1
  50. package/src/common-auth-embedded/setup/types.d.ts +5 -0
  51. package/src/common-auth-embedded/source-output.json +45 -37
  52. package/src/tui-compiled/common-auth-embedded/fs/private-files.js +49 -3
  53. package/src/tui-raw/common-auth-embedded/fs/private-files.js +49 -3
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "schema": 1,
3
3
  "package": "@cortexkit/common-auth",
4
- "version": "0.23.0",
4
+ "version": "0.24.0",
5
5
  "artifactStatus": "published",
6
6
  "publicRoots": {
7
7
  "./rpc": {
@@ -61,15 +61,15 @@
61
61
  "import": "./dist/opencode2/index.js"
62
62
  }
63
63
  },
64
- "input": "tools/common-auth-build/inputs/cortexkit-common-auth-0.23.0.tgz",
65
- "tarballSha256": "8a2cd4a5df7c056c4f815c8cd59b109ceb02135eb7b7b0e14a1b3d9891af2cfb",
66
- "sri": "sha512-WwCjPwOhbZBomCAPxEooCiSDgvcaIsEn5yjTqmEy0PU0ZJUKSr3cE8Il0AsW7xU2h2Wo267rsciZhV3rPlUPCA==",
67
- "canonicalFiles": 184,
68
- "canonicalBytes": 1054172,
64
+ "input": "tools/common-auth-build/inputs/cortexkit-common-auth-0.24.0.tgz",
65
+ "tarballSha256": "7b96e74e4017df1678050b1fe18ca821a548da4412414d4df222307a7c1d0ca0",
66
+ "sri": "sha512-dHGHnWBbVC/NHTq22GlFaqYFWg7M1TcCYZvYVIML1bx/rQiIoG05t/ojXjRWdrymHV7GYoaE+yx0YdYHHrPByQ==",
67
+ "canonicalFiles": 185,
68
+ "canonicalBytes": 1068841,
69
69
  "generator": {
70
70
  "path": "packages/opencode/scripts/embed-common-auth.ts",
71
71
  "version": 3,
72
- "sha256": "886385f4eedd9fcd82bcb3e7751e0c7193fbb6c59238fa35be82909635955dbf"
72
+ "sha256": "0d093bc6e05261723f521904c32a328d890fdac5d00bf8b7035708ae44674103"
73
73
  },
74
74
  "files": [
75
75
  {
@@ -283,17 +283,17 @@
283
283
  {
284
284
  "source": "package/dist/claustrum/enrollment.d.ts",
285
285
  "output": "claustrum/enrollment.d.ts",
286
- "bytes": 7743,
287
- "sourceSha256": "7503e56a09f94e77a94a7ae15fd616f149ec9f675ec7c79bdea4a014ca014143",
288
- "outputSha256": "7503e56a09f94e77a94a7ae15fd616f149ec9f675ec7c79bdea4a014ca014143",
286
+ "bytes": 7976,
287
+ "sourceSha256": "d6b4e8561ccc0ff2f9b4386856c5fe3dc7c475e13f98314a0666d0b20458d43b",
288
+ "outputSha256": "d6b4e8561ccc0ff2f9b4386856c5fe3dc7c475e13f98314a0666d0b20458d43b",
289
289
  "transform": "verbatim"
290
290
  },
291
291
  {
292
292
  "source": "package/dist/claustrum/enrollment.js",
293
293
  "output": "claustrum/enrollment.js",
294
- "bytes": 33520,
295
- "sourceSha256": "eeac604495c093503007478ab803c05b6e0bce8bf281f8bf9bbfee44c8ff85f1",
296
- "outputSha256": "eeac604495c093503007478ab803c05b6e0bce8bf281f8bf9bbfee44c8ff85f1",
294
+ "bytes": 35060,
295
+ "sourceSha256": "a9ca3a23778cc86ab9798051ba19dcb3b2b8e3dc4c4fda356cbd56eca50097db",
296
+ "outputSha256": "a9ca3a23778cc86ab9798051ba19dcb3b2b8e3dc4c4fda356cbd56eca50097db",
297
297
  "transform": "verbatim"
298
298
  },
299
299
  {
@@ -571,17 +571,17 @@
571
571
  {
572
572
  "source": "package/dist/fs/private-files.d.ts",
573
573
  "output": "fs/private-files.d.ts",
574
- "bytes": 3228,
575
- "sourceSha256": "1882d869cfebb3cebc8b9db47fb15083f8300c51c26c71666e898377fcd9a1ba",
576
- "outputSha256": "1882d869cfebb3cebc8b9db47fb15083f8300c51c26c71666e898377fcd9a1ba",
574
+ "bytes": 3398,
575
+ "sourceSha256": "b344509a32fcd983f09e5814286630a53c8e577ad1b973eabe19f8e58659e8d3",
576
+ "outputSha256": "b344509a32fcd983f09e5814286630a53c8e577ad1b973eabe19f8e58659e8d3",
577
577
  "transform": "verbatim"
578
578
  },
579
579
  {
580
580
  "source": "package/dist/fs/private-files.js",
581
581
  "output": "fs/private-files.js",
582
- "bytes": 12448,
583
- "sourceSha256": "1c8f34202b535d774d8c1a53bd403255f02701760c7378e020756c02c55a97c4",
584
- "outputSha256": "1c8f34202b535d774d8c1a53bd403255f02701760c7378e020756c02c55a97c4",
582
+ "bytes": 14779,
583
+ "sourceSha256": "114c06ce4c0998087878d99c5dc37425e90d5fad205f57fe0bdf9694e3c8e31d",
584
+ "outputSha256": "114c06ce4c0998087878d99c5dc37425e90d5fad205f57fe0bdf9694e3c8e31d",
585
585
  "transform": "verbatim"
586
586
  },
587
587
  {
@@ -1160,28 +1160,36 @@
1160
1160
  "outputSha256": "025b5f7b429978cc3842cc72240b8bc154a86859ceb2ad3b5ad8636ab334e649",
1161
1161
  "transform": "verbatim"
1162
1162
  },
1163
+ {
1164
+ "source": "package/dist/setup/enroll.d.ts",
1165
+ "output": "setup/enroll.d.ts",
1166
+ "bytes": 2199,
1167
+ "sourceSha256": "d7599ee67d3906d57f599447d243c6695d53b22d2105af317d36120e9f7c8ca7",
1168
+ "outputSha256": "d7599ee67d3906d57f599447d243c6695d53b22d2105af317d36120e9f7c8ca7",
1169
+ "transform": "verbatim"
1170
+ },
1163
1171
  {
1164
1172
  "source": "package/dist/setup/enroll.js",
1165
1173
  "output": "setup/enroll.js",
1166
- "bytes": 4022,
1167
- "sourceSha256": "233b36d6422c93e7de0f7e73d1c09fdac54d8ae4090b15b91e1b99160e1ad0fa",
1168
- "outputSha256": "233b36d6422c93e7de0f7e73d1c09fdac54d8ae4090b15b91e1b99160e1ad0fa",
1174
+ "bytes": 8484,
1175
+ "sourceSha256": "2ec864a300326a2ce9b8dd79750704e438af04ef5fa9e3b744a8ecdd7e0e41d6",
1176
+ "outputSha256": "2ec864a300326a2ce9b8dd79750704e438af04ef5fa9e3b744a8ecdd7e0e41d6",
1169
1177
  "transform": "verbatim"
1170
1178
  },
1171
1179
  {
1172
1180
  "source": "package/dist/setup/index.d.ts",
1173
1181
  "output": "setup/index.d.ts",
1174
- "bytes": 842,
1175
- "sourceSha256": "43b22470cb458058db2bc628e6502f4cd55184deff519c86213dd8d0e3e0000e",
1176
- "outputSha256": "43b22470cb458058db2bc628e6502f4cd55184deff519c86213dd8d0e3e0000e",
1182
+ "bytes": 970,
1183
+ "sourceSha256": "f443b8d501334f8384878606ff19beee0241e70e7f4cc3dd0d0fd4636f8433c5",
1184
+ "outputSha256": "f443b8d501334f8384878606ff19beee0241e70e7f4cc3dd0d0fd4636f8433c5",
1177
1185
  "transform": "verbatim"
1178
1186
  },
1179
1187
  {
1180
1188
  "source": "package/dist/setup/index.js",
1181
1189
  "output": "setup/index.js",
1182
- "bytes": 517,
1183
- "sourceSha256": "4b00ca576b580ce54b53c2ef6c2a03d1e00c3fde9d3174328cd7458edd38ec79",
1184
- "outputSha256": "4b00ca576b580ce54b53c2ef6c2a03d1e00c3fde9d3174328cd7458edd38ec79",
1190
+ "bytes": 617,
1191
+ "sourceSha256": "3ab259b0ba5e5e6d83ea9077adf11e2c561d4a7788710adbb6e8e0ed88dcd44b",
1192
+ "outputSha256": "3ab259b0ba5e5e6d83ea9077adf11e2c561d4a7788710adbb6e8e0ed88dcd44b",
1185
1193
  "transform": "verbatim"
1186
1194
  },
1187
1195
  {
@@ -1195,17 +1203,17 @@
1195
1203
  {
1196
1204
  "source": "package/dist/setup/process-fence.d.ts",
1197
1205
  "output": "setup/process-fence.d.ts",
1198
- "bytes": 1897,
1199
- "sourceSha256": "12161c0ddc3ed14c50ff62dd441158aeaa5285bb49f6735c5b2e5b3a430364fb",
1200
- "outputSha256": "12161c0ddc3ed14c50ff62dd441158aeaa5285bb49f6735c5b2e5b3a430364fb",
1206
+ "bytes": 2223,
1207
+ "sourceSha256": "ed246d2c16821cc51170e4099466450e26821c81fc3b96ad2d7fde18ea4ee9c6",
1208
+ "outputSha256": "ed246d2c16821cc51170e4099466450e26821c81fc3b96ad2d7fde18ea4ee9c6",
1201
1209
  "transform": "verbatim"
1202
1210
  },
1203
1211
  {
1204
1212
  "source": "package/dist/setup/process-fence.js",
1205
1213
  "output": "setup/process-fence.js",
1206
- "bytes": 11015,
1207
- "sourceSha256": "ff848eb647b155a2dfbb8a201b5330b8b9ba3ac12dc6af7bc4f0f514d94a83c4",
1208
- "outputSha256": "ff848eb647b155a2dfbb8a201b5330b8b9ba3ac12dc6af7bc4f0f514d94a83c4",
1214
+ "bytes": 14008,
1215
+ "sourceSha256": "8ca9546a205fe9d6daecc2604c7e4608df5d09e0bd0f774fe8da40f26a3ffefb",
1216
+ "outputSha256": "8ca9546a205fe9d6daecc2604c7e4608df5d09e0bd0f774fe8da40f26a3ffefb",
1209
1217
  "transform": "verbatim"
1210
1218
  },
1211
1219
  {
@@ -1235,9 +1243,9 @@
1235
1243
  {
1236
1244
  "source": "package/dist/setup/types.d.ts",
1237
1245
  "output": "setup/types.d.ts",
1238
- "bytes": 5535,
1239
- "sourceSha256": "69f8ee1e9345d72dec1e04bb5ce9fa38e6cc77339f53ad042b625c636c415068",
1240
- "outputSha256": "69f8ee1e9345d72dec1e04bb5ce9fa38e6cc77339f53ad042b625c636c415068",
1246
+ "bytes": 5722,
1247
+ "sourceSha256": "db068b3f2428734ad731c120443c7e5a432f5d568a8a61c21c7978855e613063",
1248
+ "outputSha256": "db068b3f2428734ad731c120443c7e5a432f5d568a8a61c21c7978855e613063",
1241
1249
  "transform": "verbatim"
1242
1250
  },
1243
1251
  {
@@ -1 +1 @@
1
- {"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../../src/plugin/lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAChD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAE5D,MAAM,WAAW,UAAU;IACzB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;CAChC;AAED;;;;;;;;;;GAUG;AACH,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,UAAU,CAAA;AAEpD,MAAM,WAAW,sBAAsB;IACrC,eAAe,EAAE;QAAE,KAAK,IAAI,IAAI,CAAA;KAAE,CAAA;IAClC,0BAA0B,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/C,eAAe,EAAE,MAAM,IAAI,CAAA;IAC3B;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CACzC;AAED;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IACpC,2EAA2E;IAC3E,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACvB,kEAAkE;IAClE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;CAChC;AAED,MAAM,WAAW,eAAgB,SAAQ,UAAU;IACjD,iBAAiB,IAAI,cAAc,GAAG,IAAI,CAAA;IAC1C,4EAA4E;IAC5E,SAAS,IAAI,OAAO,CAAA;IACpB;;;;;;;;;OASG;IACH,qBAAqB,CACnB,OAAO,EAAE,cAAc,EACvB,YAAY,EAAE,qBAAqB,GAAG,IAAI,EAC1C,QAAQ,CAAC,EAAE,qBAAqB,GAAG,IAAI,GACtC,OAAO,CAAC,OAAO,CAAC,CAAA;IACnB,QAAQ,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,cAAc,GAAG,IAAI,CAAA;CAC/D;AAID,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,sBAAsB,GAC9B,eAAe,CAkLjB"}
1
+ {"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../../src/plugin/lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAChD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAE5D,MAAM,WAAW,UAAU;IACzB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;CAChC;AAED;;;;;;;;;;GAUG;AACH,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,UAAU,CAAA;AAEpD,MAAM,WAAW,sBAAsB;IACrC,eAAe,EAAE;QAAE,KAAK,IAAI,IAAI,CAAA;KAAE,CAAA;IAClC,0BAA0B,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/C,eAAe,EAAE,MAAM,IAAI,CAAA;IAC3B;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CACzC;AAED;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IACpC,2EAA2E;IAC3E,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACvB,kEAAkE;IAClE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;CAChC;AAED,MAAM,WAAW,eAAgB,SAAQ,UAAU;IACjD,iBAAiB,IAAI,cAAc,GAAG,IAAI,CAAA;IAC1C,4EAA4E;IAC5E,SAAS,IAAI,OAAO,CAAA;IACpB;;;;;;;;;OASG;IACH,qBAAqB,CACnB,OAAO,EAAE,cAAc,EACvB,YAAY,EAAE,qBAAqB,GAAG,IAAI,EAC1C,QAAQ,CAAC,EAAE,qBAAqB,GAAG,IAAI,GACtC,OAAO,CAAC,OAAO,CAAC,CAAA;IACnB,QAAQ,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,cAAc,GAAG,IAAI,CAAA;CAC/D;AAsBD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,sBAAsB,GAC9B,eAAe,CA+LjB"}
@@ -1,4 +1,19 @@
1
1
  const NOOP_DRAIN = async () => { };
2
+ async function collectCleanupFailure(cleanup, failures) {
3
+ try {
4
+ await cleanup();
5
+ }
6
+ catch (error) {
7
+ failures.push(error);
8
+ }
9
+ }
10
+ function reportCleanupFailures(failures) {
11
+ if (failures.length === 1)
12
+ throw failures[0];
13
+ if (failures.length > 1) {
14
+ throw new AggregateError(failures, 'Plugin cleanup failed');
15
+ }
16
+ }
2
17
  export function createPluginLifecycle(options) {
3
18
  let accountManager = null;
4
19
  let refreshQueue = null;
@@ -20,18 +35,21 @@ export function createPluginLifecycle(options) {
20
35
  * once the manager has been disposed after both drains.
21
36
  */
22
37
  const retire = (manager, queue, requests) => {
23
- const queueDrained = Promise.resolve(queue?.dispose());
38
+ // Invoke immediately to stop timers, but turn synchronous throws into a
39
+ // drain rejection so the request retirement still starts.
40
+ const queueDrained = (async () => {
41
+ await queue?.dispose();
42
+ })();
24
43
  const record = {
25
44
  requests,
26
45
  done: (async () => {
27
- const drained = await Promise.allSettled([
28
- queueDrained,
29
- requests?.retire(),
46
+ const failures = [];
47
+ await Promise.all([
48
+ collectCleanupFailure(() => queueDrained, failures),
49
+ collectCleanupFailure(() => requests?.retire(), failures),
30
50
  ]);
31
- await manager.dispose();
32
- const failed = drained.find((outcome) => outcome.status === 'rejected');
33
- if (failed)
34
- throw failed.reason;
51
+ await collectCleanupFailure(() => manager.dispose(), failures);
52
+ reportCleanupFailures(failures);
35
53
  })(),
36
54
  };
37
55
  retiring.add(record);
@@ -42,7 +60,6 @@ export function createPluginLifecycle(options) {
42
60
  if (!requests)
43
61
  retiring.delete(record);
44
62
  });
45
- void queueDrained.catch(() => { });
46
63
  return { queueDrained, done: record.done };
47
64
  };
48
65
  const disposeAccountRuntime = async () => {
@@ -58,19 +75,19 @@ export function createPluginLifecycle(options) {
58
75
  // after the runtimes and queues using it have finished.
59
76
  const retired = [...retiring];
60
77
  retiring.clear();
78
+ const failures = [];
61
79
  const aborted = Promise.all([
62
- oldRequests?.dispose(),
63
- ...retired.map((record) => record.requests?.dispose()),
80
+ collectCleanupFailure(() => oldRequests?.dispose(), failures),
81
+ ...retired.map((record) => collectCleanupFailure(() => record.requests?.dispose(), failures)),
82
+ ]);
83
+ const liveQueueDrained = collectCleanupFailure(() => oldQueue?.dispose(), failures);
84
+ await Promise.all([
85
+ aborted,
86
+ liveQueueDrained,
87
+ ...retired.map((record) => collectCleanupFailure(() => record.done, failures)),
64
88
  ]);
65
- const liveQueueDrained = Promise.resolve(oldQueue?.dispose());
66
- void liveQueueDrained.catch(() => { });
67
- await aborted;
68
- const retirements = await Promise.allSettled(retired.map((record) => record.done));
69
- await liveQueueDrained;
70
- await oldManager?.dispose();
71
- const failed = retirements.find((outcome) => outcome.status === 'rejected');
72
- if (failed)
73
- throw failed.reason;
89
+ await collectCleanupFailure(() => oldManager?.dispose(), failures);
90
+ reportCleanupFailures(failures);
74
91
  };
75
92
  const register = (disposable, phase = 'consumer') => {
76
93
  if (closing) {
@@ -129,28 +146,32 @@ export function createPluginLifecycle(options) {
129
146
  failDisposal = reject;
130
147
  });
131
148
  void (async () => {
132
- await disposeAccountRuntime();
133
- await options.shutdownDiskSignatureCache();
134
- options.sessionRegistry.clear();
135
- options.clearFetchState();
149
+ // Keep dependencies alive until their users settle, then report any
150
+ // failures only after every remaining cleanup hook has run.
151
+ const failures = [];
152
+ await collectCleanupFailure(disposeAccountRuntime, failures);
153
+ await collectCleanupFailure(() => options.shutdownDiskSignatureCache(), failures);
154
+ await collectCleanupFailure(() => options.sessionRegistry.clear(), failures);
155
+ await collectCleanupFailure(() => options.clearFetchState(), failures);
136
156
  // 1. Stop and await all producers (e.g. fetch interceptor).
137
157
  // This prevents NEW sidebar writes from being enqueued
138
158
  // while the drain is in flight.
139
159
  for (const disposable of producers) {
140
- await disposable.dispose();
160
+ await collectCleanupFailure(() => disposable.dispose(), failures);
141
161
  }
142
162
  producers.length = 0;
143
163
  // 2. Drain sidebar writes. Every write enqueued by a now-stopped
144
164
  // producer lands here before the consumers (RPC server, file
145
165
  // logger) are torn down.
146
- await drainSidebarWrites();
166
+ await collectCleanupFailure(drainSidebarWrites, failures);
147
167
  // 3. Stop consumers. The TUI's last frame can still observe a
148
168
  // fully landed snapshot because the file logger is still alive
149
169
  // during the drain.
150
170
  for (const disposable of consumers) {
151
- await disposable.dispose();
171
+ await collectCleanupFailure(() => disposable.dispose(), failures);
152
172
  }
153
173
  consumers.length = 0;
174
+ reportCleanupFailures(failures);
154
175
  })().then(finishDisposal, failDisposal);
155
176
  }
156
177
  return disposal;
@@ -1 +1 @@
1
- {"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../../src/plugin/lifecycle.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../../src/plugin/lifecycle.ts"],"names":[],"mappings":"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"}
@@ -1830,8 +1830,8 @@ function extractRateLimitBodyInfo(body) {
1830
1830
  }
1831
1831
  }
1832
1832
  if (message) {
1833
- const afterMatch = message.match(/reset after\s+([0-9hms.]+)/i);
1834
- const rawDuration = afterMatch?.[1];
1833
+ const reset = message.match(/(?:reset after|resets? in)\s+([0-9hms.]+)/i);
1834
+ const rawDuration = reset?.[1];
1835
1835
  if (rawDuration) {
1836
1836
  const parsed = parseDurationToMs(rawDuration);
1837
1837
  if (parsed !== null) {