@terminai/core 0.23.0 → 0.25.0

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 (95) hide show
  1. package/dist/src/audit/redaction.js +24 -0
  2. package/dist/src/audit/redaction.js.map +1 -1
  3. package/dist/src/audit/redaction.test.d.ts +7 -0
  4. package/dist/src/audit/redaction.test.js +45 -0
  5. package/dist/src/audit/redaction.test.js.map +1 -0
  6. package/dist/src/auth/providerRegistry.js +20 -0
  7. package/dist/src/auth/providerRegistry.js.map +1 -1
  8. package/dist/src/auth/wizardSettings.d.ts +5 -0
  9. package/dist/src/auth/wizardSettings.js +43 -0
  10. package/dist/src/auth/wizardSettings.js.map +1 -1
  11. package/dist/src/auth/wizardSettings.test.js +20 -0
  12. package/dist/src/auth/wizardSettings.test.js.map +1 -1
  13. package/dist/src/auth/wizardState.d.ts +1 -1
  14. package/dist/src/auth/wizardState.js +2 -0
  15. package/dist/src/auth/wizardState.js.map +1 -1
  16. package/dist/src/auth/wizardState.test.js +23 -0
  17. package/dist/src/auth/wizardState.test.js.map +1 -1
  18. package/dist/src/config/builder.js +23 -0
  19. package/dist/src/config/builder.js.map +1 -1
  20. package/dist/src/config/config.js +40 -1
  21. package/dist/src/config/config.js.map +1 -1
  22. package/dist/src/config/settings/schema.d.ts +50 -0
  23. package/dist/src/config/settings/schema.js +48 -0
  24. package/dist/src/config/settings/schema.js.map +1 -1
  25. package/dist/src/core/chatGptCodexContentGenerator.d.ts +35 -0
  26. package/dist/src/core/chatGptCodexContentGenerator.js +605 -0
  27. package/dist/src/core/chatGptCodexContentGenerator.js.map +1 -0
  28. package/dist/src/core/chatGptCodexContentGenerator.test.d.ts +7 -0
  29. package/dist/src/core/chatGptCodexContentGenerator.test.js +250 -0
  30. package/dist/src/core/chatGptCodexContentGenerator.test.js.map +1 -0
  31. package/dist/src/core/contentGenerator.d.ts +2 -1
  32. package/dist/src/core/contentGenerator.js +10 -0
  33. package/dist/src/core/contentGenerator.js.map +1 -1
  34. package/dist/src/core/contentGenerator.test.js +36 -0
  35. package/dist/src/core/contentGenerator.test.js.map +1 -1
  36. package/dist/src/core/loggingContentGenerator.d.ts +1 -0
  37. package/dist/src/core/loggingContentGenerator.js +30 -0
  38. package/dist/src/core/loggingContentGenerator.js.map +1 -1
  39. package/dist/src/core/loggingContentGenerator.test.js +62 -0
  40. package/dist/src/core/loggingContentGenerator.test.js.map +1 -1
  41. package/dist/src/core/openaiContentGenerator.d.ts +16 -0
  42. package/dist/src/core/openaiContentGenerator.js +244 -52
  43. package/dist/src/core/openaiContentGenerator.js.map +1 -1
  44. package/dist/src/core/openaiContentGenerator.test.js +176 -7
  45. package/dist/src/core/openaiContentGenerator.test.js.map +1 -1
  46. package/dist/src/core/providerTypes.d.ts +17 -1
  47. package/dist/src/core/providerTypes.js +10 -0
  48. package/dist/src/core/providerTypes.js.map +1 -1
  49. package/dist/src/core/providerTypes.test.js +11 -0
  50. package/dist/src/core/providerTypes.test.js.map +1 -1
  51. package/dist/src/core/turn.js +1 -1
  52. package/dist/src/core/turn.js.map +1 -1
  53. package/dist/src/core/turn.test.js +1 -1
  54. package/dist/src/core/turn.test.js.map +1 -1
  55. package/dist/src/generated/git-commit.d.ts +2 -2
  56. package/dist/src/generated/git-commit.js +2 -2
  57. package/dist/src/index.d.ts +6 -0
  58. package/dist/src/index.js +7 -0
  59. package/dist/src/index.js.map +1 -1
  60. package/dist/src/openai_chatgpt/constants.d.ts +23 -0
  61. package/dist/src/openai_chatgpt/constants.js +35 -0
  62. package/dist/src/openai_chatgpt/constants.js.map +1 -0
  63. package/dist/src/openai_chatgpt/credentialStorage.d.ts +18 -0
  64. package/dist/src/openai_chatgpt/credentialStorage.js +116 -0
  65. package/dist/src/openai_chatgpt/credentialStorage.js.map +1 -0
  66. package/dist/src/openai_chatgpt/credentialStorage.test.d.ts +7 -0
  67. package/dist/src/openai_chatgpt/credentialStorage.test.js +73 -0
  68. package/dist/src/openai_chatgpt/credentialStorage.test.js.map +1 -0
  69. package/dist/src/openai_chatgpt/imports.d.ts +10 -0
  70. package/dist/src/openai_chatgpt/imports.js +164 -0
  71. package/dist/src/openai_chatgpt/imports.js.map +1 -0
  72. package/dist/src/openai_chatgpt/imports.test.d.ts +7 -0
  73. package/dist/src/openai_chatgpt/imports.test.js +82 -0
  74. package/dist/src/openai_chatgpt/imports.test.js.map +1 -0
  75. package/dist/src/openai_chatgpt/jwt.d.ts +7 -0
  76. package/dist/src/openai_chatgpt/jwt.js +31 -0
  77. package/dist/src/openai_chatgpt/jwt.js.map +1 -0
  78. package/dist/src/openai_chatgpt/jwt.test.d.ts +7 -0
  79. package/dist/src/openai_chatgpt/jwt.test.js +23 -0
  80. package/dist/src/openai_chatgpt/jwt.test.js.map +1 -0
  81. package/dist/src/openai_chatgpt/oauthClient.d.ts +52 -0
  82. package/dist/src/openai_chatgpt/oauthClient.js +196 -0
  83. package/dist/src/openai_chatgpt/oauthClient.js.map +1 -0
  84. package/dist/src/openai_chatgpt/oauthClient.test.d.ts +7 -0
  85. package/dist/src/openai_chatgpt/oauthClient.test.js +138 -0
  86. package/dist/src/openai_chatgpt/oauthClient.test.js.map +1 -0
  87. package/dist/src/openai_chatgpt/types.d.ts +34 -0
  88. package/dist/src/openai_chatgpt/types.js +8 -0
  89. package/dist/src/openai_chatgpt/types.js.map +1 -0
  90. package/dist/src/utils/errorReporting.js +1 -1
  91. package/dist/src/utils/errorReporting.js.map +1 -1
  92. package/dist/src/utils/errorReporting.test.js +1 -1
  93. package/dist/src/utils/errorReporting.test.js.map +1 -1
  94. package/dist/tsconfig.tsbuildinfo +1 -1
  95. package/package.json +1 -1
@@ -11,12 +11,27 @@ const SECRET_PATTERNS = [
11
11
  /api[-_]?key/i,
12
12
  /bearer\s+/i,
13
13
  ];
14
+ const SECRET_KEY_PATTERNS = [
15
+ /^authorization$/i,
16
+ /^x-api-key$/i,
17
+ /^api[-_]?key$/i,
18
+ /^access[-_]?token$/i,
19
+ /^refresh[-_]?token$/i,
20
+ /^id[-_]?token$/i,
21
+ /^code[_-]?verifier$/i,
22
+ /^chatgpt-account-id$/i,
23
+ /^chatgpt[_-]?account[_-]?id$/i,
24
+ /^account[_-]?id$/i,
25
+ ];
14
26
  function mask(value) {
15
27
  return value.length > 8 ? `${value.slice(0, 2)}***` : '***';
16
28
  }
17
29
  function shouldRedactString(value) {
18
30
  return SECRET_PATTERNS.some((pattern) => pattern.test(value));
19
31
  }
32
+ function shouldRedactKey(key) {
33
+ return SECRET_KEY_PATTERNS.some((pattern) => pattern.test(key));
34
+ }
20
35
  function redactValue(value, path, opts, hints) {
21
36
  if (value === null || value === undefined)
22
37
  return value;
@@ -45,6 +60,15 @@ function redactValue(value, path, opts, hints) {
45
60
  if (typeof value === 'object') {
46
61
  const redacted = {};
47
62
  for (const [key, nested] of Object.entries(value)) {
63
+ if (shouldRedactKey(key)) {
64
+ hints.push({
65
+ path: path ? `${path}.${key}` : key,
66
+ strategy: 'mask',
67
+ reason: 'secret',
68
+ });
69
+ redacted[key] = typeof nested === 'string' ? mask(nested) : '***';
70
+ continue;
71
+ }
48
72
  redacted[key] = redactValue(nested, path ? `${path}.${key}` : key, opts, hints);
49
73
  }
50
74
  return redacted;
@@ -1 +1 @@
1
- {"version":3,"file":"redaction.js","sourceRoot":"","sources":["../../../src/audit/redaction.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"redaction.js","sourceRoot":"","sources":["../../../src/audit/redaction.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,7 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2025 Google LLC
4
+ * Portions Copyright 2025 TerminaI Authors
5
+ * SPDX-License-Identifier: Apache-2.0
6
+ */
7
+ export {};
@@ -0,0 +1,45 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2025 Google LLC
4
+ * Portions Copyright 2025 TerminaI Authors
5
+ * SPDX-License-Identifier: Apache-2.0
6
+ */
7
+ import { describe, it, expect } from 'vitest';
8
+ import { redactEvent } from './redaction.js';
9
+ function isPlainObject(value) {
10
+ return typeof value === 'object' && value !== null && !Array.isArray(value);
11
+ }
12
+ describe('redactEvent', () => {
13
+ it('redacts secret-looking keys even if values do not match token patterns', () => {
14
+ const event = {
15
+ version: 1,
16
+ eventType: 'tool.requested',
17
+ timestamp: new Date().toISOString(),
18
+ sessionId: 's1',
19
+ provenance: ['local_user'],
20
+ tool: {
21
+ callId: 'c1',
22
+ toolName: 'run_terminal_command',
23
+ args: {
24
+ headers: {
25
+ Authorization: 'Bearer access-token-value',
26
+ 'ChatGPT-Account-ID': 'acct_123',
27
+ },
28
+ },
29
+ },
30
+ };
31
+ const redacted = redactEvent(event, { redactUiTypedText: false });
32
+ const args = redacted.tool?.args;
33
+ expect(isPlainObject(args)).toBe(true);
34
+ if (!isPlainObject(args))
35
+ return;
36
+ const headers = args['headers'];
37
+ expect(isPlainObject(headers)).toBe(true);
38
+ if (!isPlainObject(headers))
39
+ return;
40
+ expect(headers['Authorization']).not.toContain('access-token-value');
41
+ expect(headers['ChatGPT-Account-ID']).toBe('***');
42
+ expect(redacted.redactions?.length).toBeGreaterThan(0);
43
+ });
44
+ });
45
+ //# sourceMappingURL=redaction.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"redaction.test.js","sourceRoot":"","sources":["../../../src/audit/redaction.test.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,SAAS,aAAa,CAAC,KAAc;IACnC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,EAAE,CAAC,wEAAwE,EAAE,GAAG,EAAE;QAChF,MAAM,KAAK,GAAe;YACxB,OAAO,EAAE,CAAC;YACV,SAAS,EAAE,gBAAgB;YAC3B,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACnC,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,CAAC,YAAY,CAAC;YAC1B,IAAI,EAAE;gBACJ,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE,sBAAsB;gBAChC,IAAI,EAAE;oBACJ,OAAO,EAAE;wBACP,aAAa,EAAE,2BAA2B;wBAC1C,oBAAoB,EAAE,UAAU;qBACjC;iBACF;aACF;SACF,CAAC;QAEF,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CAAC;QAElE,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;QACjC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YAAE,OAAO;QAEjC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;QAChC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;YAAE,OAAO;QAEpC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;QACrE,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -55,6 +55,26 @@ export const PROVIDER_REGISTRY = {
55
55
  },
56
56
  ],
57
57
  },
58
+ openai_chatgpt_oauth: {
59
+ id: 'openai_chatgpt_oauth',
60
+ displayName: 'ChatGPT Plus/Pro (OAuth)',
61
+ description: 'Use your ChatGPT subscription via OpenAI OAuth (Codex backend)',
62
+ authMethods: [
63
+ {
64
+ id: 'oauth',
65
+ displayName: 'OAuth (loopback or manual paste)',
66
+ description: 'Authenticate via the official OpenAI OAuth flow.',
67
+ requiredFields: [
68
+ { id: 'model', label: 'Model', placeholder: 'gpt-5.2-codex' },
69
+ {
70
+ id: 'baseUrl',
71
+ label: 'Base URL (optional)',
72
+ placeholder: 'https://chatgpt.com/backend-api/codex',
73
+ },
74
+ ],
75
+ },
76
+ ],
77
+ },
58
78
  anthropic: {
59
79
  id: 'anthropic',
60
80
  displayName: 'Anthropic',
@@ -1 +1 @@
1
- {"version":3,"file":"providerRegistry.js","sourceRoot":"","sources":["../../../src/auth/providerRegistry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAyBH,MAAM,CAAC,MAAM,iBAAiB,GAAyC;IACrE,MAAM,EAAE;QACN,EAAE,EAAE,QAAQ;QACZ,WAAW,EAAE,eAAe;QAC5B,WAAW,EAAE,+CAA+C;QAC5D,WAAW,EAAE;YACX;gBACE,EAAE,EAAE,OAAO;gBACX,WAAW,EAAE,6BAA6B;gBAC1C,cAAc,EAAE,EAAE;aACnB;YACD;gBACE,EAAE,EAAE,SAAS;gBACb,WAAW,EAAE,gBAAgB;gBAC7B,cAAc,EAAE;oBACd;wBACE,EAAE,EAAE,QAAQ;wBACZ,KAAK,EAAE,SAAS;wBAChB,WAAW,EAAE,WAAW;wBACxB,MAAM,EAAE,IAAI;qBACb;iBACF;aACF;YACD;gBACE,EAAE,EAAE,WAAW;gBACf,WAAW,EAAE,uBAAuB;gBACpC,cAAc,EAAE,EAAE;aACnB;SACF;KACF;IACD,iBAAiB,EAAE;QACjB,EAAE,EAAE,mBAAmB;QACvB,WAAW,EAAE,mBAAmB;QAChC,WAAW,EACT,sEAAsE;QACxE,WAAW,EAAE;YACX;gBACE,EAAE,EAAE,SAAS;gBACb,WAAW,EAAE,uBAAuB;gBACpC,WAAW,EACT,kFAAkF;gBACpF,cAAc,EAAE;oBACd,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE;oBAChE,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE;oBACtD;wBACE,EAAE,EAAE,YAAY;wBAChB,KAAK,EAAE,sBAAsB;wBAC7B,WAAW,EAAE,gBAAgB;qBAC9B;iBACF;aACF;SACF;KACF;IACD,SAAS,EAAE;QACT,EAAE,EAAE,WAAW;QACf,WAAW,EAAE,WAAW;QACxB,WAAW,EAAE,6BAA6B;QAC1C,WAAW,EAAE;YACX;gBACE,EAAE,EAAE,OAAO;gBACX,WAAW,EAAE,aAAa;gBAC1B,cAAc,EAAE,EAAE;aACnB;YACD;gBACE,EAAE,EAAE,SAAS;gBACb,WAAW,EAAE,eAAe;gBAC5B,cAAc,EAAE,EAAE;aACnB;SACF;KACF;CACF,CAAC"}
1
+ {"version":3,"file":"providerRegistry.js","sourceRoot":"","sources":["../../../src/auth/providerRegistry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAyBH,MAAM,CAAC,MAAM,iBAAiB,GAAyC;IACrE,MAAM,EAAE;QACN,EAAE,EAAE,QAAQ;QACZ,WAAW,EAAE,eAAe;QAC5B,WAAW,EAAE,+CAA+C;QAC5D,WAAW,EAAE;YACX;gBACE,EAAE,EAAE,OAAO;gBACX,WAAW,EAAE,6BAA6B;gBAC1C,cAAc,EAAE,EAAE;aACnB;YACD;gBACE,EAAE,EAAE,SAAS;gBACb,WAAW,EAAE,gBAAgB;gBAC7B,cAAc,EAAE;oBACd;wBACE,EAAE,EAAE,QAAQ;wBACZ,KAAK,EAAE,SAAS;wBAChB,WAAW,EAAE,WAAW;wBACxB,MAAM,EAAE,IAAI;qBACb;iBACF;aACF;YACD;gBACE,EAAE,EAAE,WAAW;gBACf,WAAW,EAAE,uBAAuB;gBACpC,cAAc,EAAE,EAAE;aACnB;SACF;KACF;IACD,iBAAiB,EAAE;QACjB,EAAE,EAAE,mBAAmB;QACvB,WAAW,EAAE,mBAAmB;QAChC,WAAW,EACT,sEAAsE;QACxE,WAAW,EAAE;YACX;gBACE,EAAE,EAAE,SAAS;gBACb,WAAW,EAAE,uBAAuB;gBACpC,WAAW,EACT,kFAAkF;gBACpF,cAAc,EAAE;oBACd,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE;oBAChE,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE;oBACtD;wBACE,EAAE,EAAE,YAAY;wBAChB,KAAK,EAAE,sBAAsB;wBAC7B,WAAW,EAAE,gBAAgB;qBAC9B;iBACF;aACF;SACF;KACF;IACD,oBAAoB,EAAE;QACpB,EAAE,EAAE,sBAAsB;QAC1B,WAAW,EAAE,0BAA0B;QACvC,WAAW,EACT,gEAAgE;QAClE,WAAW,EAAE;YACX;gBACE,EAAE,EAAE,OAAO;gBACX,WAAW,EAAE,kCAAkC;gBAC/C,WAAW,EAAE,kDAAkD;gBAC/D,cAAc,EAAE;oBACd,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE;oBAC7D;wBACE,EAAE,EAAE,SAAS;wBACb,KAAK,EAAE,qBAAqB;wBAC5B,WAAW,EAAE,uCAAuC;qBACrD;iBACF;aACF;SACF;KACF;IACD,SAAS,EAAE;QACT,EAAE,EAAE,WAAW;QACf,WAAW,EAAE,WAAW;QACxB,WAAW,EAAE,6BAA6B;QAC1C,WAAW,EAAE;YACX;gBACE,EAAE,EAAE,OAAO;gBACX,WAAW,EAAE,aAAa;gBAC1B,cAAc,EAAE,EAAE;aACnB;YACD;gBACE,EAAE,EAAE,SAAS;gBACb,WAAW,EAAE,eAAe;gBAC5B,cAAc,EAAE,EAAE;aACnB;SACF;KACF;CACF,CAAC"}
@@ -14,6 +14,11 @@ export interface WizardSettingsInput {
14
14
  model: string;
15
15
  envVarName?: string;
16
16
  };
17
+ openaiChatgptOauth?: {
18
+ model: string;
19
+ baseUrl?: string;
20
+ internalModel?: string;
21
+ };
17
22
  }
18
23
  export interface SettingsPatch {
19
24
  path: string;
@@ -5,6 +5,7 @@
5
5
  * SPDX-License-Identifier: Apache-2.0
6
6
  */
7
7
  import { AuthType } from '../core/contentGenerator.js';
8
+ import { DEFAULT_CHATGPT_CODEX_BASE_URL } from '../openai_chatgpt/constants.js';
8
9
  /**
9
10
  * Builds a list of settings patches to apply based on wizard input.
10
11
  */
@@ -58,6 +59,35 @@ export function buildWizardSettingsPatch(input) {
58
59
  value: envVarName,
59
60
  });
60
61
  }
62
+ else if (input.provider === 'openai_chatgpt_oauth') {
63
+ if (!input.openaiChatgptOauth) {
64
+ throw new Error('ChatGPT OAuth provider selected but openaiChatgptOauth config is missing');
65
+ }
66
+ const model = input.openaiChatgptOauth.model.trim();
67
+ if (model.length === 0) {
68
+ throw new Error('ChatGPT OAuth provider selected but model is missing/empty');
69
+ }
70
+ const baseUrl = normalizeChatGptBaseUrl(input.openaiChatgptOauth.baseUrl);
71
+ const internalModel = (input.openaiChatgptOauth.internalModel ?? '').trim();
72
+ patches.push({
73
+ path: 'security.auth.selectedType',
74
+ value: AuthType.USE_OPENAI_CHATGPT_OAUTH,
75
+ });
76
+ patches.push({
77
+ path: 'llm.openaiChatgptOauth.baseUrl',
78
+ value: baseUrl,
79
+ });
80
+ patches.push({
81
+ path: 'llm.openaiChatgptOauth.model',
82
+ value: model,
83
+ });
84
+ if (internalModel.length > 0) {
85
+ patches.push({
86
+ path: 'llm.openaiChatgptOauth.internalModel',
87
+ value: internalModel,
88
+ });
89
+ }
90
+ }
61
91
  return patches;
62
92
  }
63
93
  function normalizeBaseUrl(raw) {
@@ -71,4 +101,17 @@ function normalizeBaseUrl(raw) {
71
101
  // Remove trailing slashes to align with existing core expectations
72
102
  return withScheme.replace(/\/+$/, '');
73
103
  }
104
+ function normalizeChatGptBaseUrl(raw) {
105
+ if (raw === undefined) {
106
+ return DEFAULT_CHATGPT_CODEX_BASE_URL;
107
+ }
108
+ const trimmed = raw.trim();
109
+ if (trimmed.length === 0) {
110
+ return DEFAULT_CHATGPT_CODEX_BASE_URL;
111
+ }
112
+ const withScheme = /^https?:\/\//i.test(trimmed)
113
+ ? trimmed
114
+ : `https://${trimmed}`;
115
+ return withScheme.replace(/\/+$/, '');
116
+ }
74
117
  //# sourceMappingURL=wizardSettings.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"wizardSettings.js","sourceRoot":"","sources":["../../../src/auth/wizardSettings.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAiBvD;;GAEG;AACH,MAAM,UAAU,wBAAwB,CACtC,KAA0B;IAE1B,MAAM,OAAO,GAAoB,EAAE,CAAC;IAEpC,kBAAkB;IAClB,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IAE9D,gCAAgC;IAChC,IAAI,KAAK,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAChC,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;YACzB,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,4BAA4B;gBAClC,KAAK,EAAE,KAAK,CAAC,cAAc;aAC5B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;SAAM,IAAI,KAAK,CAAC,QAAQ,KAAK,mBAAmB,EAAE,CAAC;QAClD,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CACb,4EAA4E,CAC7E,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACjE,MAAM,KAAK,GAAG,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAClD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,gEAAgE,CACjE,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,UAAU,IAAI,gBAAgB,CAAC;aACvE,IAAI,EAAE;aACN,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACvB,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CACb,qEAAqE,CACtE,CAAC;QACJ,CAAC;QAED,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,4BAA4B;YAClC,KAAK,EAAE,QAAQ,CAAC,qBAAqB;SACtC,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,8BAA8B;YACpC,KAAK,EAAE,OAAO;SACf,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,4BAA4B;YAClC,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;QACH,8DAA8D;QAC9D,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,gCAAgC;YACtC,KAAK,EAAE,QAAQ;SAChB,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,sCAAsC;YAC5C,KAAK,EAAE,UAAU;SAClB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAW;IACnC,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IAC3B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC;QAC9C,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,WAAW,OAAO,EAAE,CAAC;IAEzB,mEAAmE;IACnE,OAAO,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACxC,CAAC"}
1
+ {"version":3,"file":"wizardSettings.js","sourceRoot":"","sources":["../../../src/auth/wizardSettings.ts"],"names":[],"mappings":"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"}
@@ -67,5 +67,25 @@ describe('buildWizardSettingsPatch', () => {
67
67
  provider: 'openai_compatible',
68
68
  })).toThrow('openaiCompatible config is missing');
69
69
  });
70
+ it('should build patches for ChatGPT OAuth provider with defaults', () => {
71
+ const patches = buildWizardSettingsPatch({
72
+ provider: 'openai_chatgpt_oauth',
73
+ openaiChatgptOauth: {
74
+ model: ' gpt-5.2-codex ',
75
+ },
76
+ });
77
+ expect(patches).toEqual([
78
+ { path: 'llm.provider', value: 'openai_chatgpt_oauth' },
79
+ {
80
+ path: 'security.auth.selectedType',
81
+ value: AuthType.USE_OPENAI_CHATGPT_OAUTH,
82
+ },
83
+ {
84
+ path: 'llm.openaiChatgptOauth.baseUrl',
85
+ value: 'https://chatgpt.com/backend-api/codex',
86
+ },
87
+ { path: 'llm.openaiChatgptOauth.model', value: 'gpt-5.2-codex' },
88
+ ]);
89
+ });
70
90
  });
71
91
  //# sourceMappingURL=wizardSettings.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"wizardSettings.test.js","sourceRoot":"","sources":["../../../src/auth/wizardSettings.test.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,MAAM,OAAO,GAAG,wBAAwB,CAAC;YACvC,QAAQ,EAAE,QAAQ;YAClB,cAAc,EAAE,QAAQ,CAAC,UAAU;SACpC,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;YACtB,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,QAAQ,EAAE;YACzC,EAAE,IAAI,EAAE,4BAA4B,EAAE,KAAK,EAAE,QAAQ,CAAC,UAAU,EAAE;SACnE,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0FAA0F,EAAE,GAAG,EAAE;QAClG,MAAM,OAAO,GAAG,wBAAwB,CAAC;YACvC,QAAQ,EAAE,mBAAmB;YAC7B,gBAAgB,EAAE;gBAChB,OAAO,EAAE,mBAAmB;gBAC5B,KAAK,EAAE,UAAU;aAClB;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;YACtB,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,mBAAmB,EAAE;YACpD;gBACE,IAAI,EAAE,4BAA4B;gBAClC,KAAK,EAAE,QAAQ,CAAC,qBAAqB;aACtC;YACD,EAAE,IAAI,EAAE,8BAA8B,EAAE,KAAK,EAAE,wBAAwB,EAAE;YACzE,EAAE,IAAI,EAAE,4BAA4B,EAAE,KAAK,EAAE,QAAQ,EAAE;YACvD,EAAE,IAAI,EAAE,gCAAgC,EAAE,KAAK,EAAE,QAAQ,EAAE;YAC3D,EAAE,IAAI,EAAE,sCAAsC,EAAE,KAAK,EAAE,gBAAgB,EAAE;SAC1E,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC/D,MAAM,OAAO,GAAG,wBAAwB,CAAC;YACvC,QAAQ,EAAE,mBAAmB;YAC7B,gBAAgB,EAAE;gBAChB,OAAO,EAAE,4BAA4B;gBACrC,KAAK,EAAE,QAAQ;gBACf,UAAU,EAAE,mBAAmB;aAChC;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;YACtB,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,mBAAmB,EAAE;YACpD;gBACE,IAAI,EAAE,4BAA4B;gBAClC,KAAK,EAAE,QAAQ,CAAC,qBAAqB;aACtC;YACD;gBACE,IAAI,EAAE,8BAA8B;gBACpC,KAAK,EAAE,2BAA2B;aACnC;YACD,EAAE,IAAI,EAAE,4BAA4B,EAAE,KAAK,EAAE,QAAQ,EAAE;YACvD,EAAE,IAAI,EAAE,gCAAgC,EAAE,KAAK,EAAE,QAAQ,EAAE;YAC3D,EAAE,IAAI,EAAE,sCAAsC,EAAE,KAAK,EAAE,eAAe,EAAE;SACzE,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC/E,MAAM,CAAC,GAAG,EAAE,CACV,wBAAwB,CAAC;YACvB,QAAQ,EAAE,mBAAmB;SAC9B,CAAC,CACH,CAAC,OAAO,CAAC,oCAAoC,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"wizardSettings.test.js","sourceRoot":"","sources":["../../../src/auth/wizardSettings.test.ts"],"names":[],"mappings":"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"}
@@ -8,7 +8,7 @@ import { AuthType } from '../core/contentGenerator.js';
8
8
  /**
9
9
  * Provider identifiers supported by the wizard
10
10
  */
11
- export type ProviderId = 'gemini' | 'openai_compatible' | 'anthropic';
11
+ export type ProviderId = 'gemini' | 'openai_compatible' | 'openai_chatgpt_oauth' | 'anthropic';
12
12
  /**
13
13
  * Auth methods for Gemini provider
14
14
  */
@@ -120,6 +120,8 @@ export function getAuthMethodOptions(provider) {
120
120
  return ['oauth', 'api_key', 'vertex_ai'];
121
121
  case 'openai_compatible':
122
122
  return ['api_key'];
123
+ case 'openai_chatgpt_oauth':
124
+ return ['oauth'];
123
125
  case 'anthropic':
124
126
  return ['oauth', 'api_key'];
125
127
  default:
@@ -1 +1 @@
1
- {"version":3,"file":"wizardState.js","sourceRoot":"","sources":["../../../src/auth/wizardState.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"wizardState.js","sourceRoot":"","sources":["../../../src/auth/wizardState.ts"],"names":[],"mappings":"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"}
@@ -39,6 +39,13 @@ describe('wizardState', () => {
39
39
  expect(newState.step).toBe('setup');
40
40
  expect(newState.error).toBeNull();
41
41
  });
42
+ it('should transition to setup step for openai_chatgpt_oauth provider', () => {
43
+ const state = createInitialState();
44
+ const newState = selectProvider(state, 'openai_chatgpt_oauth');
45
+ expect(newState.provider).toBe('openai_chatgpt_oauth');
46
+ expect(newState.step).toBe('setup');
47
+ expect(newState.error).toBeNull();
48
+ });
42
49
  it('should clear error when selecting provider', () => {
43
50
  const state = {
44
51
  step: 'provider',
@@ -161,6 +168,15 @@ describe('wizardState', () => {
161
168
  };
162
169
  expect(getNextStep(state)).toBe('setup');
163
170
  });
171
+ it('should return setup for openai_chatgpt_oauth provider at provider step', () => {
172
+ const state = {
173
+ step: 'provider',
174
+ provider: 'openai_chatgpt_oauth',
175
+ authMethod: null,
176
+ error: null,
177
+ };
178
+ expect(getNextStep(state)).toBe('setup');
179
+ });
164
180
  it('should return setup for auth_method step with auth method selected', () => {
165
181
  const state = {
166
182
  step: 'auth_method',
@@ -190,6 +206,9 @@ describe('wizardState', () => {
190
206
  it('should return false for openai_compatible', () => {
191
207
  expect(needsAuthMethodStep('openai_compatible')).toBe(false);
192
208
  });
209
+ it('should return false for openai_chatgpt_oauth', () => {
210
+ expect(needsAuthMethodStep('openai_chatgpt_oauth')).toBe(false);
211
+ });
193
212
  });
194
213
  describe('getAuthMethodOptions', () => {
195
214
  it('should return correct options for gemini', () => {
@@ -200,6 +219,10 @@ describe('wizardState', () => {
200
219
  const options = getAuthMethodOptions('openai_compatible');
201
220
  expect(options).toEqual(['api_key']);
202
221
  });
222
+ it('should return correct options for openai_chatgpt_oauth', () => {
223
+ const options = getAuthMethodOptions('openai_chatgpt_oauth');
224
+ expect(options).toEqual(['oauth']);
225
+ });
203
226
  it('should return correct options for anthropic', () => {
204
227
  const options = getAuthMethodOptions('anthropic');
205
228
  expect(options).toEqual(['oauth', 'api_key']);
@@ -1 +1 @@
1
- {"version":3,"file":"wizardState.test.js","sourceRoot":"","sources":["../../../src/auth/wizardState.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"wizardState.test.js","sourceRoot":"","sources":["../../../src/auth/wizardState.test.ts"],"names":[],"mappings":"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"}
@@ -14,6 +14,7 @@ import { SettingsLoader, } from './settings/loader.js';
14
14
  import { Config, ApprovalMode, LlmProviderId, FatalConfigError, PREVIEW_GEMINI_MODEL_AUTO, DEFAULT_GEMINI_MODEL_AUTO, } from '../index.js';
15
15
  import { createPolicyEngineConfig, resolvePolicyBrainAuthority, } from '../policy/config.js';
16
16
  import { GEMINI_DIR } from '../index.js';
17
+ import { DEFAULT_CHATGPT_CODEX_BASE_URL } from '../openai_chatgpt/constants.js';
17
18
  function normalizeOpenAIBaseUrl(raw) {
18
19
  if (typeof raw !== 'string')
19
20
  return undefined;
@@ -25,6 +26,9 @@ function normalizeOpenAIBaseUrl(raw) {
25
26
  : `https://${trimmed}`;
26
27
  return withScheme.replace(/\/+$/, '');
27
28
  }
29
+ function normalizeChatGptCodexBaseUrl(raw) {
30
+ return normalizeOpenAIBaseUrl(raw) ?? DEFAULT_CHATGPT_CODEX_BASE_URL;
31
+ }
28
32
  function normalizeEnvVarName(raw) {
29
33
  if (typeof raw !== 'string')
30
34
  return undefined;
@@ -85,10 +89,13 @@ export class ConfigBuilder {
85
89
  ? process.env[envVarName]
86
90
  : undefined;
87
91
  const headers = normalizeHeaders(settings.llm?.headers);
92
+ // Optional: cheaper model for internal services (summaries, compression)
93
+ const internalModel = (settings.llm?.openaiCompatible?.internalModel ?? '').trim();
88
94
  providerConfig = {
89
95
  provider: LlmProviderId.OPENAI_COMPATIBLE,
90
96
  baseUrl,
91
97
  model,
98
+ internalModel: internalModel.length > 0 ? internalModel : undefined,
92
99
  auth: {
93
100
  type: authType,
94
101
  envVarName,
@@ -97,6 +104,22 @@ export class ConfigBuilder {
97
104
  headers,
98
105
  };
99
106
  }
107
+ else if (provider === LlmProviderId.OPENAI_CHATGPT_OAUTH) {
108
+ const baseUrl = normalizeChatGptCodexBaseUrl(settings.llm?.openaiChatgptOauth?.baseUrl);
109
+ const model = (settings.llm?.openaiChatgptOauth?.model ?? '').trim();
110
+ if (model.length === 0) {
111
+ throw new FatalConfigError('llm.provider is set to openai_chatgpt_oauth, but llm.openaiChatgptOauth.model is required.');
112
+ }
113
+ const headers = normalizeHeaders(settings.llm?.headers);
114
+ const internalModel = (settings.llm?.openaiChatgptOauth?.internalModel ?? '').trim();
115
+ providerConfig = {
116
+ provider: LlmProviderId.OPENAI_CHATGPT_OAUTH,
117
+ baseUrl,
118
+ model,
119
+ internalModel: internalModel.length > 0 ? internalModel : undefined,
120
+ headers,
121
+ };
122
+ }
100
123
  else if (provider === LlmProviderId.ANTHROPIC) {
101
124
  providerConfig = { provider: LlmProviderId.ANTHROPIC };
102
125
  }
@@ -1 +1 @@
1
- {"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/config/builder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/config/builder.ts"],"names":[],"mappings":"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"}
@@ -536,6 +536,43 @@ export class Config {
536
536
  }
537
537
  }
538
538
  this.modelConfigService = new ModelConfigService(modelConfigServiceConfig ?? DEFAULT_MODEL_CONFIGS);
539
+ // When using non-Gemini providers, route internal services to user's model
540
+ // instead of hardcoded Gemini models (which don't exist on OpenRouter, etc.)
541
+ if (this.providerConfig.provider === LlmProviderId.OPENAI_COMPATIBLE ||
542
+ this.providerConfig.provider === LlmProviderId.OPENAI_CHATGPT_OAUTH) {
543
+ const modelForInternalServices = (this.providerConfig.internalModel || this.providerConfig.model) ?? '';
544
+ if (modelForInternalServices) {
545
+ // Override internal model aliases to use the user's OpenAI model
546
+ const internalAliases = [
547
+ 'summarizer-default',
548
+ 'summarizer-shell',
549
+ 'classifier',
550
+ 'prompt-completion',
551
+ 'edit-corrector',
552
+ 'web-search',
553
+ 'web-fetch',
554
+ 'web-fetch-fallback',
555
+ 'loop-detection',
556
+ 'loop-detection-double-check',
557
+ 'llm-edit-fixer',
558
+ 'next-speaker-checker',
559
+ 'chat-compression-default',
560
+ 'chat-compression-2.5-flash',
561
+ 'chat-compression-2.5-flash-lite',
562
+ 'chat-compression-2.5-pro',
563
+ 'chat-compression-3-flash',
564
+ 'chat-compression-3-pro',
565
+ ];
566
+ for (const alias of internalAliases) {
567
+ this.modelConfigService.registerRuntimeModelConfig(alias, {
568
+ modelConfig: {
569
+ model: modelForInternalServices,
570
+ generateContentConfig: {},
571
+ },
572
+ });
573
+ }
574
+ }
575
+ }
539
576
  }
540
577
  /**
541
578
  * Must only be called once, throws if called again.
@@ -652,7 +689,9 @@ export class Config {
652
689
  // Determine the auth type to use
653
690
  const effectiveAuthType = providerConfig.provider === LlmProviderId.OPENAI_COMPATIBLE
654
691
  ? AuthType.USE_OPENAI_COMPATIBLE
655
- : (authType ?? AuthType.USE_GEMINI);
692
+ : providerConfig.provider === LlmProviderId.OPENAI_CHATGPT_OAUTH
693
+ ? AuthType.USE_OPENAI_CHATGPT_OAUTH
694
+ : (authType ?? AuthType.USE_GEMINI);
656
695
  // Rebuild the content generator with the new provider
657
696
  await this.refreshAuth(effectiveAuthType);
658
697
  debugLogger.log(`Provider reconfigured to: ${providerConfig.provider}`);