@cortexkit/opencode-antigravity-auth 3.0.37 → 3.0.38

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 (54) hide show
  1. package/dist/cli.js +6 -1
  2. package/dist/cli.js.map +2 -2
  3. package/dist/cli.meta.json +8 -8
  4. package/dist/index.js +8 -2
  5. package/dist/index.js.map +2 -2
  6. package/dist/index.meta.json +9 -9
  7. package/dist/server.js +228 -94
  8. package/dist/server.js.map +4 -4
  9. package/dist/server.meta.json +1 -1
  10. package/dist/src/auth-method-labels.d.ts +2 -0
  11. package/dist/src/auth-method-labels.d.ts.map +1 -1
  12. package/dist/src/auth-method-labels.js +2 -0
  13. package/dist/src/auth-method-labels.js.map +1 -1
  14. package/dist/src/ga/server/auth.js +1 -1
  15. package/dist/src/ga/server/auth.js.map +1 -1
  16. package/dist/src/ga/server/pool-login.d.ts +9 -0
  17. package/dist/src/ga/server/pool-login.d.ts.map +1 -1
  18. package/dist/src/ga/server/pool-login.js +155 -73
  19. package/dist/src/ga/server/pool-login.js.map +1 -1
  20. package/dist/src/ga/tui/host-ga.d.ts +7 -0
  21. package/dist/src/ga/tui/host-ga.d.ts.map +1 -1
  22. package/dist/src/ga/tui/host-ga.js +70 -1
  23. package/dist/src/ga/tui/host-ga.js.map +1 -1
  24. package/dist/src/logging/provider-key-policy.d.ts +2 -0
  25. package/dist/src/logging/provider-key-policy.d.ts.map +1 -1
  26. package/dist/src/logging/provider-key-policy.js +5 -1
  27. package/dist/src/logging/provider-key-policy.js.map +1 -1
  28. package/dist/src/plugin/ga-location-services.d.ts.map +1 -1
  29. package/dist/src/plugin/ga-location-services.js +75 -10
  30. package/dist/src/plugin/ga-location-services.js.map +1 -1
  31. package/dist/src/plugin/logger.d.ts.map +1 -1
  32. package/dist/src/plugin/logger.js +2 -1
  33. package/dist/src/plugin/logger.js.map +1 -1
  34. package/dist/src/tui/file-logger.d.ts.map +1 -1
  35. package/dist/src/tui/file-logger.js +2 -1
  36. package/dist/src/tui/file-logger.js.map +1 -1
  37. package/dist/tui-build-map.json +8 -8
  38. package/dist/tui-ga-build-map.json +4 -4
  39. package/dist/types/src/auth-method-labels.d.ts +2 -0
  40. package/dist/types/src/auth-method-labels.d.ts.map +1 -1
  41. package/dist/types/src/ga/server/pool-login.d.ts +9 -0
  42. package/dist/types/src/ga/server/pool-login.d.ts.map +1 -1
  43. package/dist/types/src/logging/provider-key-policy.d.ts +2 -0
  44. package/dist/types/src/logging/provider-key-policy.d.ts.map +1 -1
  45. package/dist/types/src/plugin/ga-location-services.d.ts.map +1 -1
  46. package/dist/types/src/plugin/logger.d.ts.map +1 -1
  47. package/package.json +2 -2
  48. package/src/tui/file-logger.ts +5 -1
  49. package/src/tui-compiled/logging/provider-key-policy.js +4 -1
  50. package/src/tui-compiled/tui/file-logger.js +5 -1
  51. package/src/tui-ga-compiled/host-ga.js +66 -1
  52. package/src/tui-ga-raw/host-ga.tsx +79 -1
  53. package/src/tui-raw/logging/provider-key-policy.js +4 -1
  54. package/src/tui-raw/tui/file-logger.js +5 -1
@@ -567,7 +567,7 @@
567
567
  "format": "esm"
568
568
  },
569
569
  "../core/dist/antigravity-command-menu.js": {
570
- "bytes": 20684,
570
+ "bytes": 20788,
571
571
  "imports": [
572
572
  {
573
573
  "path": "node:crypto",
@@ -3040,7 +3040,7 @@
3040
3040
  "format": "esm"
3041
3041
  },
3042
3042
  "src/logging/provider-key-policy.ts": {
3043
- "bytes": 604,
3043
+ "bytes": 849,
3044
3044
  "imports": [],
3045
3045
  "format": "esm"
3046
3046
  },
@@ -3400,7 +3400,7 @@
3400
3400
  "format": "esm"
3401
3401
  },
3402
3402
  "src/plugin/logger.ts": {
3403
- "bytes": 8622,
3403
+ "bytes": 8713,
3404
3404
  "imports": [
3405
3405
  {
3406
3406
  "path": "../core/dist/index.js",
@@ -3727,7 +3727,7 @@
3727
3727
  "format": "esm"
3728
3728
  },
3729
3729
  "src/auth-method-labels.ts": {
3730
- "bytes": 404,
3730
+ "bytes": 601,
3731
3731
  "imports": [],
3732
3732
  "format": "esm"
3733
3733
  },
@@ -6679,7 +6679,7 @@
6679
6679
  "imports": [],
6680
6680
  "exports": [],
6681
6681
  "inputs": {},
6682
- "bytes": 4871181
6682
+ "bytes": 4872095
6683
6683
  },
6684
6684
  "dist/index.js": {
6685
6685
  "imports": [
@@ -7984,7 +7984,7 @@
7984
7984
  "bytesInOutput": 2379
7985
7985
  },
7986
7986
  "../core/dist/antigravity-command-menu.js": {
7987
- "bytesInOutput": 14495
7987
+ "bytesInOutput": 14583
7988
7988
  },
7989
7989
  "../core/dist/auth-types.js": {
7990
7990
  "bytesInOutput": 91
@@ -8287,7 +8287,7 @@
8287
8287
  "bytesInOutput": 168
8288
8288
  },
8289
8289
  "src/logging/provider-key-policy.ts": {
8290
- "bytesInOutput": 307
8290
+ "bytesInOutput": 487
8291
8291
  },
8292
8292
  "src/plugin/shared/vault-request-credentials.ts": {
8293
8293
  "bytesInOutput": 18736
@@ -8323,7 +8323,7 @@
8323
8323
  "bytesInOutput": 17863
8324
8324
  },
8325
8325
  "src/plugin/logger.ts": {
8326
- "bytesInOutput": 3600
8326
+ "bytesInOutput": 3655
8327
8327
  },
8328
8328
  "src/plugin/index.ts": {
8329
8329
  "bytesInOutput": 28657
@@ -8725,7 +8725,7 @@
8725
8725
  "bytesInOutput": 0
8726
8726
  }
8727
8727
  },
8728
- "bytes": 2205283
8728
+ "bytes": 2205606
8729
8729
  }
8730
8730
  }
8731
8731
  }
package/dist/server.js CHANGED
@@ -12137,7 +12137,8 @@ function accountsSection(options, ids, now) {
12137
12137
  {
12138
12138
  id: "add",
12139
12139
  label: options.login.label ?? "Add account",
12140
- run: ({ invocation }) => options.login ? options.login.run(invocation) : Promise.resolve(failure("Login is unavailable.", "refused"))
12140
+ ...options.login.knobs ? { knobs: options.login.knobs } : {},
12141
+ run: ({ invocation, values }) => options.login ? options.login.run(invocation, values) : Promise.resolve(failure("Login is unavailable.", "refused"))
12141
12142
  }
12142
12143
  ] : [];
12143
12144
  if (read.status !== "ready")
@@ -30229,13 +30230,17 @@ var init_logger3 = __esm({
30229
30230
 
30230
30231
  // src/logging/provider-key-policy.ts
30231
30232
  function isProviderSecretKey(normalizedKey2) {
30232
- return /token|refresh|access|project|fingerprint|deviceid|sessionid|sessiontoken|secret|password|apikey|clientsecret/.test(
30233
+ return /token|refresh|access|project|fingerprint|deviceid|sessionid|sessiontoken|secret|password|apikey|clientsecret|callback|redirecturl|authorizationcode/.test(
30233
30234
  normalizedKey2
30234
30235
  );
30235
30236
  }
30237
+ var OAUTH_REDIRECT_VALUE_PATTERNS;
30236
30238
  var init_provider_key_policy = __esm({
30237
30239
  "src/logging/provider-key-policy.ts"() {
30238
30240
  "use strict";
30241
+ OAUTH_REDIRECT_VALUE_PATTERNS = [
30242
+ /https?:\/\/[^\s<>"']*[?&](?:code|state)=[^\s<>"']*/gi
30243
+ ];
30239
30244
  }
30240
30245
  });
30241
30246
 
@@ -34473,6 +34478,7 @@ function createLocationLogger(options) {
34473
34478
  const engine = createLoggerInstance2({
34474
34479
  level: () => configuredLevel,
34475
34480
  extraSecretKeys: isProviderSecretKey,
34481
+ extraValuePatterns: OAUTH_REDIRECT_VALUE_PATTERNS,
34476
34482
  captureSink: ({ channel: channel3, level, message, data }) => {
34477
34483
  const extra = data !== null && typeof data === "object" && !Array.isArray(data) ? Object.fromEntries(Object.entries(data)) : void 0;
34478
34484
  emit({
@@ -34778,14 +34784,16 @@ async function registerOpenCode2AuthMethods(ctx, options) {
34778
34784
  init_dist();
34779
34785
  import { randomBytes as randomBytes5 } from "node:crypto";
34780
34786
 
34781
- // src/ga/server/pool-login.ts
34782
- init_dist();
34783
-
34784
34787
  // src/auth-method-labels.ts
34785
34788
  var OPENCODE2_POOL_AUTH_LABEL = "Google (antigravity-auth pool, browser)";
34789
+ var OPENCODE2_POOL_PASTE_AUTH_LABEL = "Google (antigravity-auth pool, paste redirect URL)";
34790
+ var GA_POOL_PASTE_PROMPT = "Paste the redirect URL from your browser's address bar";
34786
34791
  var OPENCODE2_VAULT_AUTH_LABEL = "Use approved Antigravity vault";
34787
34792
  var OPENCODE2_POOL_RECONNECT_LABEL = "Use existing local Antigravity pool";
34788
34793
 
34794
+ // src/ga/server/pool-login.ts
34795
+ init_dist();
34796
+
34789
34797
  // src/plugin/server.ts
34790
34798
  import { existsSync as existsSync2, readFileSync } from "node:fs";
34791
34799
  import { createServer } from "node:http";
@@ -35075,6 +35083,7 @@ async function startOAuthListener({
35075
35083
 
35076
35084
  // src/ga/server/pool-login.ts
35077
35085
  var GA_POOL_METHOD_ID = "antigravity-auth-pool-browser";
35086
+ var GA_POOL_PASTE_METHOD_ID = "antigravity-auth-pool-paste";
35078
35087
  var GA_POOL_RECONNECT_METHOD_ID = "antigravity-auth-pool-reconnect";
35079
35088
  var LOGIN_FAILED = "The Antigravity pool login could not be completed.";
35080
35089
  function abortable(pending, signal) {
@@ -35116,89 +35125,154 @@ function createGaPoolLogin(input2) {
35116
35125
  listeners.delete(listener);
35117
35126
  }
35118
35127
  };
35119
- const method = {
35120
- method: {
35121
- id: GA_POOL_METHOD_ID,
35122
- type: "oauth",
35123
- label: OPENCODE2_POOL_AUTH_LABEL
35124
- },
35125
- authorize: () => track(
35126
- (async () => {
35128
+ const start = (listen = true) => track(
35129
+ (async () => {
35130
+ await admit2();
35131
+ const authorization = await (async () => {
35132
+ try {
35133
+ return await abortable(
35134
+ (input2.oauth?.authorize ?? authorizeAntigravity)(),
35135
+ shutdown.signal
35136
+ );
35137
+ } catch {
35138
+ throw new Error(LOGIN_FAILED);
35139
+ }
35140
+ })();
35141
+ await admit2();
35142
+ const state = new URL(authorization.url).searchParams.get("state");
35143
+ if (!state) throw new Error(LOGIN_FAILED);
35144
+ const redirect = new URL(ANTIGRAVITY_REDIRECT_URI);
35145
+ const parse3 = (value) => {
35146
+ try {
35147
+ const url = new URL(value);
35148
+ const code3 = url.searchParams.get("code");
35149
+ if (url.origin !== redirect.origin || url.pathname !== redirect.pathname || url.username || url.password || url.hash || url.searchParams.has("error") || url.searchParams.getAll("state").length !== 1 || url.searchParams.get("state") !== state || url.searchParams.getAll("code").length !== 1 || !code3)
35150
+ throw new Error(LOGIN_FAILED);
35151
+ return code3;
35152
+ } catch {
35153
+ throw new Error(LOGIN_FAILED);
35154
+ }
35155
+ };
35156
+ let listener;
35157
+ const code2 = Promise.withResolvers();
35158
+ let claimed = false;
35159
+ const claim = (value) => {
35160
+ if (claimed) throw new Error(LOGIN_FAILED);
35161
+ claimed = true;
35162
+ code2.resolve(value);
35163
+ };
35164
+ const waitForCode = input2.oauth?.waitForCode;
35165
+ if (listen && waitForCode) {
35166
+ void Promise.resolve().then(() => waitForCode(state)).then(claim, code2.reject).catch(() => {
35167
+ });
35168
+ } else if (listen) {
35169
+ listener = await startOAuthListener();
35170
+ listeners.add(listener);
35171
+ void listener.waitForCallback().then((url) => claim(parse3(url.href)), code2.reject).catch(code2.reject);
35172
+ }
35173
+ void code2.promise.catch(() => {
35174
+ });
35175
+ try {
35176
+ await admit2();
35177
+ } catch (error) {
35178
+ if (listener) await close(listener);
35179
+ throw error;
35180
+ }
35181
+ const ownedListener = listener;
35182
+ const cancellation = new AbortController();
35183
+ const signal = AbortSignal.any([shutdown.signal, cancellation.signal]);
35184
+ const admitAttempt = async () => {
35185
+ signal.throwIfAborted();
35127
35186
  await admit2();
35128
- const authorization = await (async () => {
35187
+ signal.throwIfAborted();
35188
+ };
35189
+ const timeout = setTimeout(
35190
+ () => code2.reject(new Error(LOGIN_FAILED)),
35191
+ 5 * 60 * 1e3
35192
+ );
35193
+ timeout.unref?.();
35194
+ const callback = track(
35195
+ (async () => {
35129
35196
  try {
35130
- return await abortable(
35131
- (input2.oauth?.authorize ?? authorizeAntigravity)(),
35132
- shutdown.signal
35197
+ await admitAttempt();
35198
+ const value = await abortable(code2.promise, signal);
35199
+ if (ownedListener) await close(ownedListener);
35200
+ await admitAttempt();
35201
+ const result = await abortable(
35202
+ (input2.oauth?.exchange ?? exchangeAntigravity)(value, state, {
35203
+ signal,
35204
+ admit: admitAttempt
35205
+ }),
35206
+ signal
35133
35207
  );
35208
+ await admitAttempt();
35209
+ if (result.type !== "success") throw new Error(LOGIN_FAILED);
35210
+ return result;
35134
35211
  } catch {
35135
35212
  throw new Error(LOGIN_FAILED);
35213
+ } finally {
35214
+ claimed = true;
35215
+ clearTimeout(timeout);
35216
+ if (ownedListener) await close(ownedListener);
35136
35217
  }
35137
- })();
35138
- await admit2();
35139
- const state = new URL(authorization.url).searchParams.get("state");
35140
- if (!state) throw new Error(LOGIN_FAILED);
35141
- let listener;
35142
- let code2;
35143
- const waitForCode = input2.oauth?.waitForCode;
35144
- if (waitForCode) {
35145
- code2 = Promise.resolve().then(() => waitForCode(state));
35146
- } else {
35147
- listener = await startOAuthListener();
35148
- listeners.add(listener);
35149
- code2 = listener.waitForCallback().then((url) => {
35150
- if (url.searchParams.get("state") !== state)
35151
- throw new Error(LOGIN_FAILED);
35152
- const value = url.searchParams.get("code");
35153
- if (!value) throw new Error(LOGIN_FAILED);
35154
- return value;
35155
- });
35156
- }
35157
- void code2.catch(() => {
35158
- });
35159
- try {
35160
- await admit2();
35161
- } catch (error) {
35162
- if (listener) await close(listener);
35163
- throw error;
35218
+ })()
35219
+ );
35220
+ void callback.catch(() => {
35221
+ });
35222
+ return {
35223
+ url: authorization.url,
35224
+ completion: callback,
35225
+ async paste(value) {
35226
+ await admitAttempt();
35227
+ if (!value.trim()) return callback;
35228
+ claim(parse3(value));
35229
+ return callback;
35230
+ },
35231
+ async cancel() {
35232
+ claimed = true;
35233
+ cancellation.abort(new Error(LOGIN_FAILED));
35234
+ code2.reject(new Error(LOGIN_FAILED));
35235
+ if (ownedListener) await close(ownedListener);
35164
35236
  }
35165
- const ownedListener = listener;
35166
- const callback = track(
35167
- (async () => {
35168
- try {
35169
- await admit2();
35170
- const value = await abortable(code2, shutdown.signal);
35171
- await admit2();
35172
- const result = await abortable(
35173
- (input2.oauth?.exchange ?? exchangeAntigravity)(value, state, {
35174
- signal: shutdown.signal,
35175
- admit: admit2
35176
- }),
35177
- shutdown.signal
35178
- );
35179
- await admit2();
35180
- if (result.type !== "success") throw new Error(LOGIN_FAILED);
35181
- return result;
35182
- } catch {
35183
- throw new Error(LOGIN_FAILED);
35184
- } finally {
35185
- if (ownedListener) await close(ownedListener);
35186
- }
35187
- })()
35188
- );
35189
- void callback.catch(() => {
35190
- });
35191
- return {
35192
- mode: "auto",
35193
- url: authorization.url,
35194
- instructions: "Complete Google sign-in in your browser.",
35195
- callback
35196
- };
35197
- })()
35198
- )
35237
+ };
35238
+ })()
35239
+ );
35240
+ const method = {
35241
+ method: {
35242
+ id: GA_POOL_METHOD_ID,
35243
+ type: "oauth",
35244
+ label: OPENCODE2_POOL_AUTH_LABEL
35245
+ },
35246
+ async authorize() {
35247
+ const attempt = await start();
35248
+ return {
35249
+ mode: "auto",
35250
+ url: attempt.url,
35251
+ instructions: "Complete Google sign-in in your browser.",
35252
+ callback: attempt.completion
35253
+ };
35254
+ }
35255
+ };
35256
+ const pasteMethod = {
35257
+ method: {
35258
+ id: GA_POOL_PASTE_METHOD_ID,
35259
+ type: "oauth",
35260
+ label: OPENCODE2_POOL_PASTE_AUTH_LABEL
35261
+ },
35262
+ async authorize() {
35263
+ const attempt = await start(false);
35264
+ return {
35265
+ mode: "code",
35266
+ url: attempt.url,
35267
+ instructions: GA_POOL_PASTE_PROMPT,
35268
+ callback: (value) => attempt.paste(value)
35269
+ };
35270
+ }
35199
35271
  };
35200
35272
  return {
35201
35273
  method,
35274
+ pasteMethod,
35275
+ start,
35202
35276
  connectExisting: () => track(
35203
35277
  (async () => {
35204
35278
  let stage = "initial-admission";
@@ -50614,6 +50688,7 @@ function createGaLocationServicesFactory(bindings) {
50614
50688
  oauth: overrides.oauth
50615
50689
  });
50616
50690
  const loginCompletions = /* @__PURE__ */ new Set();
50691
+ const drawerLogins = /* @__PURE__ */ new Map();
50617
50692
  return {
50618
50693
  runtime,
50619
50694
  localLogin,
@@ -50734,30 +50809,89 @@ function createGaLocationServicesFactory(bindings) {
50734
50809
  runtime: location,
50735
50810
  reauthorize: pendingReauthorization,
50736
50811
  login: {
50737
- async run(invocation) {
50738
- const authorization = await menuLogin.method.authorize({});
50739
- if (authorization.mode !== "auto")
50740
- throw new Error(
50741
- "Antigravity sign-in needs a local browser callback."
50742
- );
50743
- const completion = authorization.callback.then((result) => menuLogin.onLogin(result)).then(
50812
+ knobs: [
50813
+ {
50814
+ kind: "text",
50815
+ id: "callback",
50816
+ label: GA_POOL_PASTE_PROMPT,
50817
+ masked: true
50818
+ },
50819
+ {
50820
+ kind: "toggle",
50821
+ id: "cancel",
50822
+ label: "Cancel sign-in",
50823
+ value: false
50824
+ }
50825
+ ],
50826
+ async run(invocation, values) {
50827
+ await assertLocal();
50828
+ const key = invocation.sessionId ?? "";
50829
+ const previous = drawerLogins.get(key);
50830
+ const failure2 = () => ({
50831
+ ok: false,
50832
+ text: "The Antigravity pool login could not be completed.",
50833
+ code: "refused"
50834
+ });
50835
+ if (values.cancel === true) {
50836
+ if (previous) {
50837
+ previous.cancelled = true;
50838
+ await previous.attempt.cancel();
50839
+ drawerLogins.delete(key);
50840
+ }
50841
+ return "Sign-in cancelled.";
50842
+ }
50843
+ if (typeof values.callback === "string") {
50844
+ if (!previous) return failure2();
50845
+ try {
50846
+ await previous.attempt.paste(values.callback);
50847
+ return await previous.completion ? "Account added." : failure2();
50848
+ } catch {
50849
+ return failure2();
50850
+ }
50851
+ }
50852
+ if (previous) {
50853
+ previous.cancelled = true;
50854
+ await previous.attempt.cancel();
50855
+ }
50856
+ const attempt = await menuLogin.start();
50857
+ const entry = {
50858
+ attempt,
50859
+ cancelled: false,
50860
+ completion: Promise.resolve(false)
50861
+ };
50862
+ entry.completion = attempt.completion.then((result) => {
50863
+ if (entry.cancelled)
50864
+ throw new Error(
50865
+ "The Antigravity pool login could not be completed."
50866
+ );
50867
+ return menuLogin.onLogin(result);
50868
+ }).then(
50744
50869
  () => {
50745
- invocation.notify("Account added.", "info");
50870
+ if (!entry.cancelled)
50871
+ invocation.notify("Account added.", "info");
50872
+ return true;
50746
50873
  },
50747
50874
  () => {
50748
- invocation.notify(
50749
- "Antigravity sign-in did not complete.",
50750
- "error"
50751
- );
50875
+ if (!entry.cancelled)
50876
+ invocation.notify(
50877
+ "The Antigravity pool login could not be completed.",
50878
+ "error"
50879
+ );
50880
+ return false;
50752
50881
  }
50753
- ).catch(() => {
50882
+ ).finally(() => {
50883
+ if (drawerLogins.get(key) === entry)
50884
+ drawerLogins.delete(key);
50885
+ });
50886
+ drawerLogins.set(key, entry);
50887
+ const completion = entry.completion.then(() => {
50754
50888
  });
50755
50889
  loginCompletions.add(completion);
50756
50890
  void completion.finally(
50757
50891
  () => loginCompletions.delete(completion)
50758
50892
  );
50759
- return `Open ${authorization.url} in your browser and sign in.
50760
- The account is added when the browser returns here; there is nothing to paste.`;
50893
+ return `Open ${attempt.url} in your browser and sign in.
50894
+ ${GA_POOL_PASTE_PROMPT}, or wait for the browser to finish.`;
50761
50895
  }
50762
50896
  },
50763
50897
  ...custody ? { vault: custody.menuSection() } : {},
@@ -52437,7 +52571,7 @@ async function registerGaAuthMethods(context, authority = readAuthority, input2
52437
52571
  registrations.push(
52438
52572
  await registerOpenCode2AuthMethods(context, {
52439
52573
  integrationID: ANTIGRAVITY_PROVIDER_ID,
52440
- methods: [pool.method],
52574
+ methods: [pool.method, pool.pasteMethod],
52441
52575
  onLogin: pool.onLogin,
52442
52576
  vault: {
52443
52577
  method: {