codebuff 1.0.229 → 1.0.231
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.
- package/dist/background-process-manager.d.ts +11 -3
- package/dist/background-process-manager.js +148 -54
- package/dist/background-process-manager.js.map +1 -1
- package/dist/cli.d.ts +1 -1
- package/dist/cli.js +35 -33
- package/dist/cli.js.map +1 -1
- package/dist/client.d.ts +4 -4
- package/dist/common/actions.d.ts +108 -108
- package/dist/common/bigquery/client.js +18 -18
- package/dist/common/bigquery/client.js.map +1 -1
- package/dist/common/billing/balance-calculator.d.ts +2 -2
- package/dist/common/constants.d.ts +10 -1
- package/dist/common/constants.js +7 -1
- package/dist/common/constants.js.map +1 -1
- package/dist/common/db/env.mjs +5 -5
- package/dist/common/db/env.mjs.map +1 -1
- package/dist/common/env.mjs +6 -7
- package/dist/common/env.mjs.map +1 -1
- package/dist/common/util/logger.js +1 -1
- package/dist/common/util/logger.js.map +1 -1
- package/dist/common/websockets/websocket-schema.d.ts +202 -202
- package/dist/config.js +1 -1
- package/dist/config.js.map +1 -1
- package/dist/credentials.js +3 -2
- package/dist/credentials.js.map +1 -1
- package/dist/dev-process-manager.d.ts +7 -2
- package/dist/dev-process-manager.js +12 -5
- package/dist/dev-process-manager.js.map +1 -1
- package/dist/index.js +5 -9
- package/dist/index.js.map +1 -1
- package/dist/project-files.d.ts +1 -0
- package/dist/project-files.js +11 -2
- package/dist/project-files.js.map +1 -1
- package/dist/startup-process-handler.d.ts +2 -0
- package/dist/startup-process-handler.js +21 -0
- package/dist/startup-process-handler.js.map +1 -0
- package/dist/update-codebuff.js +3 -1
- package/dist/update-codebuff.js.map +1 -1
- package/dist/utils/__tests__/background-process-manager.test.js +15 -60
- package/dist/utils/__tests__/background-process-manager.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -11,7 +11,7 @@ exports.getTracesAndRelabelsForUser = getTracesAndRelabelsForUser;
|
|
|
11
11
|
const bigquery_1 = require("@google-cloud/bigquery");
|
|
12
12
|
const logger_1 = require("../util/logger");
|
|
13
13
|
const schema_1 = require("./schema");
|
|
14
|
-
const DATASET = process.env.
|
|
14
|
+
const DATASET = process.env.NEXT_PUBLIC_CB_ENVIRONMENT === 'production'
|
|
15
15
|
? 'codebuff_data'
|
|
16
16
|
: 'codebuff_data_dev';
|
|
17
17
|
const TRACES_TABLE = 'traces';
|
|
@@ -116,7 +116,7 @@ async function getRecentRelabels(limit = 10, dataset = DATASET) {
|
|
|
116
116
|
async function getTracesWithoutRelabels(model, limit = 100, userId = undefined, dataset = DATASET) {
|
|
117
117
|
// TODO: Optimize query, maybe only get traces in last 30 days etc
|
|
118
118
|
const query = `
|
|
119
|
-
SELECT t.*
|
|
119
|
+
SELECT t.*
|
|
120
120
|
FROM \`${dataset}.${TRACES_TABLE}\` t
|
|
121
121
|
LEFT JOIN (
|
|
122
122
|
SELECT r.agent_step_id, r.user_id, JSON_EXTRACT_SCALAR(r.payload, '$.user_input_id') as user_input_id
|
|
@@ -124,7 +124,7 @@ async function getTracesWithoutRelabels(model, limit = 100, userId = undefined,
|
|
|
124
124
|
WHERE r.model = '${model}'
|
|
125
125
|
${userId ? `AND r.user_id = '${userId}'` : ''}
|
|
126
126
|
) r
|
|
127
|
-
ON t.agent_step_id = r.agent_step_id
|
|
127
|
+
ON t.agent_step_id = r.agent_step_id
|
|
128
128
|
AND t.user_id = r.user_id
|
|
129
129
|
AND JSON_EXTRACT_SCALAR(t.payload, '$.user_input_id') = r.user_input_id
|
|
130
130
|
WHERE t.type = 'get-relevant-files'
|
|
@@ -143,7 +143,7 @@ async function getTracesWithoutRelabels(model, limit = 100, userId = undefined,
|
|
|
143
143
|
async function getTracesWithRelabels(model, limit = 100, dataset = DATASET) {
|
|
144
144
|
// Get traces that DO have matching relabels for the specified model
|
|
145
145
|
const query = `
|
|
146
|
-
SELECT
|
|
146
|
+
SELECT
|
|
147
147
|
t as trace,
|
|
148
148
|
r as relabel
|
|
149
149
|
FROM \`${dataset}.${TRACES_TABLE}\` t
|
|
@@ -152,7 +152,7 @@ async function getTracesWithRelabels(model, limit = 100, dataset = DATASET) {
|
|
|
152
152
|
FROM \`${dataset}.${RELABELS_TABLE}\` r
|
|
153
153
|
WHERE r.model = '${model}'
|
|
154
154
|
) r
|
|
155
|
-
ON t.agent_step_id = r.agent_step_id
|
|
155
|
+
ON t.agent_step_id = r.agent_step_id
|
|
156
156
|
AND t.user_id = r.user_id
|
|
157
157
|
AND JSON_EXTRACT_SCALAR(t.payload, '$.user_input_id') = JSON_EXTRACT_SCALAR(r.payload, '$.user_input_id')
|
|
158
158
|
WHERE t.type = 'get-relevant-files'
|
|
@@ -190,29 +190,29 @@ async function getTracesAndRelabelsForUser(userId, limit = 50, dataset = DATASET
|
|
|
190
190
|
// Get recent traces for the user and any associated relabels
|
|
191
191
|
const query = `
|
|
192
192
|
WITH traces AS (
|
|
193
|
-
SELECT
|
|
194
|
-
id,
|
|
195
|
-
agent_step_id,
|
|
196
|
-
user_id,
|
|
197
|
-
created_at,
|
|
198
|
-
type,
|
|
193
|
+
SELECT
|
|
194
|
+
id,
|
|
195
|
+
agent_step_id,
|
|
196
|
+
user_id,
|
|
197
|
+
created_at,
|
|
198
|
+
type,
|
|
199
199
|
payload
|
|
200
200
|
FROM \`${dataset}.${TRACES_TABLE}\`
|
|
201
201
|
WHERE user_id = '${userId}' AND type = 'get-relevant-files'
|
|
202
202
|
ORDER BY created_at DESC
|
|
203
203
|
LIMIT ${limit}
|
|
204
204
|
)
|
|
205
|
-
SELECT
|
|
206
|
-
t.id,
|
|
207
|
-
ANY_VALUE(t.agent_step_id) as agent_step_id,
|
|
208
|
-
ANY_VALUE(t.user_id) as user_id,
|
|
209
|
-
ANY_VALUE(t.created_at) as created_at,
|
|
210
|
-
ANY_VALUE(t.type) as type,
|
|
205
|
+
SELECT
|
|
206
|
+
t.id,
|
|
207
|
+
ANY_VALUE(t.agent_step_id) as agent_step_id,
|
|
208
|
+
ANY_VALUE(t.user_id) as user_id,
|
|
209
|
+
ANY_VALUE(t.created_at) as created_at,
|
|
210
|
+
ANY_VALUE(t.type) as type,
|
|
211
211
|
ANY_VALUE(t.payload) as payload,
|
|
212
212
|
ARRAY_AGG(r IGNORE NULLS) as relabels
|
|
213
213
|
FROM traces t
|
|
214
214
|
LEFT JOIN \`${dataset}.${RELABELS_TABLE}\` r
|
|
215
|
-
ON t.agent_step_id = r.agent_step_id
|
|
215
|
+
ON t.agent_step_id = r.agent_step_id
|
|
216
216
|
AND t.user_id = r.user_id
|
|
217
217
|
AND JSON_EXTRACT_SCALAR(t.payload, '$.user_input_id') = JSON_EXTRACT_SCALAR(r.payload, '$.user_input_id')
|
|
218
218
|
GROUP BY t.id
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/bigquery/client.ts"],"names":[],"mappings":";;AAsBA,sCAgCC;AAED,kCAyBC;AAED,sCAyBC;AAED,0CAgBC;AAED,8CAgBC;AAED,4DAiCC;AAED,sDAsDC;AAED,kEAkEC;AA/SD,qDAAiD;AAEjD,2CAAuC;AACvC,qCAMiB;AAEjB,MAAM,OAAO,GACX,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/bigquery/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,15 +21,15 @@ type DbConn = Pick<typeof db, 'select' | 'update'>;
|
|
|
21
21
|
* Added optional `conn` param so callers inside a transaction can supply their TX object.
|
|
22
22
|
*/
|
|
23
23
|
export declare function getOrderedActiveGrants(userId: string, now: Date, conn?: DbConn): Promise<{
|
|
24
|
-
created_at: Date;
|
|
25
24
|
type: import("../types/grant").GrantType;
|
|
26
|
-
expires_at: Date | null;
|
|
27
25
|
operation_id: string;
|
|
28
26
|
user_id: string;
|
|
27
|
+
created_at: Date;
|
|
29
28
|
principal: number;
|
|
30
29
|
balance: number;
|
|
31
30
|
description: string | null;
|
|
32
31
|
priority: number;
|
|
32
|
+
expires_at: Date | null;
|
|
33
33
|
}[]>;
|
|
34
34
|
/**
|
|
35
35
|
* Calculates both the current balance and usage in this cycle in a single query.
|
|
@@ -42,7 +42,7 @@ export declare const PLAN_CONFIGS: Record<UsageLimits, PlanConfig>;
|
|
|
42
42
|
export declare const CREDITS_USAGE_LIMITS: Record<UsageLimits, number>;
|
|
43
43
|
export declare const costModes: readonly ["lite", "normal", "max", "experimental"];
|
|
44
44
|
export type CostMode = (typeof costModes)[number];
|
|
45
|
-
export declare const getModelForMode: (costMode: CostMode, operation: "agent" | "file-requests" | "check-new-files") => "claude-3-5-sonnet-20241022" | "claude-3-5-haiku-20241022" | "gpt-4o-2024-11-20" | "gpt-4o-mini-2024-07-18";
|
|
45
|
+
export declare const getModelForMode: (costMode: CostMode, operation: "agent" | "file-requests" | "check-new-files") => "claude-3-5-sonnet-20241022" | "claude-3-5-haiku-20241022" | "gpt-4o-2024-11-20" | "gpt-4o-mini-2024-07-18" | "gemini-2.5-flash-preview-04-17:thinking";
|
|
46
46
|
export declare const claudeModels: {
|
|
47
47
|
readonly sonnet: "claude-3-5-sonnet-20241022";
|
|
48
48
|
readonly sonnet3_7: "claude-3-7-sonnet-20250219";
|
|
@@ -61,6 +61,7 @@ export declare const openaiModels: {
|
|
|
61
61
|
export type OpenAIModel = (typeof openaiModels)[keyof typeof openaiModels];
|
|
62
62
|
export declare const geminiModels: {
|
|
63
63
|
readonly gemini2_5_flash: "gemini-2.5-flash-preview-04-17";
|
|
64
|
+
readonly gemini2_5_flash_thinking: "gemini-2.5-flash-preview-04-17:thinking";
|
|
64
65
|
readonly gemini2flash: "gemini-2.0-flash-001";
|
|
65
66
|
readonly gemini2_5_pro_exp: "gemini-2.5-pro-exp-03-25";
|
|
66
67
|
readonly gemini2_5_pro_preview: "gemini-2.5-pro-preview-03-25";
|
|
@@ -69,6 +70,8 @@ export type GeminiModel = (typeof geminiModels)[keyof typeof geminiModels];
|
|
|
69
70
|
export declare const openrouterModels: {
|
|
70
71
|
readonly openrouter_gemini2_5_pro_exp: "google/gemini-2.5-pro-exp-03-25:free";
|
|
71
72
|
readonly openrouter_gemini2_5_pro_preview: "google/gemini-2.5-pro-preview-03-25";
|
|
73
|
+
readonly openrouter_gemini2_5_flash: "google/gemini-2.5-flash-preview";
|
|
74
|
+
readonly openrouter_gemini2_5_flash_thinking: "google/gemini-2.5-flash-preview:thinking";
|
|
72
75
|
};
|
|
73
76
|
export type openrouterModel = (typeof openrouterModels)[keyof typeof openrouterModels];
|
|
74
77
|
export declare const deepseekModels: {
|
|
@@ -84,9 +87,12 @@ export declare const models: {
|
|
|
84
87
|
readonly ft_filepicker_003: "196166068534771712";
|
|
85
88
|
readonly openrouter_gemini2_5_pro_exp: "google/gemini-2.5-pro-exp-03-25:free";
|
|
86
89
|
readonly openrouter_gemini2_5_pro_preview: "google/gemini-2.5-pro-preview-03-25";
|
|
90
|
+
readonly openrouter_gemini2_5_flash: "google/gemini-2.5-flash-preview";
|
|
91
|
+
readonly openrouter_gemini2_5_flash_thinking: "google/gemini-2.5-flash-preview:thinking";
|
|
87
92
|
readonly deepseekChat: "deepseek-chat";
|
|
88
93
|
readonly deepseekReasoner: "deepseek-reasoner";
|
|
89
94
|
readonly gemini2_5_flash: "gemini-2.5-flash-preview-04-17";
|
|
95
|
+
readonly gemini2_5_flash_thinking: "gemini-2.5-flash-preview-04-17:thinking";
|
|
90
96
|
readonly gemini2flash: "gemini-2.0-flash-001";
|
|
91
97
|
readonly gemini2_5_pro_exp: "gemini-2.5-pro-exp-03-25";
|
|
92
98
|
readonly gemini2_5_pro_preview: "gemini-2.5-pro-preview-03-25";
|
|
@@ -114,6 +120,9 @@ export declare const shortModelNames: {
|
|
|
114
120
|
export declare const providerModelNames: {
|
|
115
121
|
"gemini-2.5-pro-preview-03-25": string;
|
|
116
122
|
"gemini-2.5-pro-exp-03-25": string;
|
|
123
|
+
"gemini-2.0-flash-001": string;
|
|
124
|
+
"gemini-2.5-flash-preview-04-17": string;
|
|
125
|
+
"gemini-2.5-flash-preview-04-17:thinking": string;
|
|
117
126
|
"claude-3-5-haiku-20241022": string;
|
|
118
127
|
"claude-3-7-sonnet-20250219": string;
|
|
119
128
|
"claude-3-5-sonnet-20241022": string;
|
package/dist/common/constants.js
CHANGED
|
@@ -118,7 +118,7 @@ exports.CREDITS_USAGE_LIMITS = Object.fromEntries(Object.entries(exports.PLAN_CO
|
|
|
118
118
|
exports.costModes = ['lite', 'normal', 'max', 'experimental'];
|
|
119
119
|
const getModelForMode = (costMode, operation) => {
|
|
120
120
|
if (operation === 'agent') {
|
|
121
|
-
return costMode === 'lite' ? exports.
|
|
121
|
+
return costMode === 'lite' ? exports.models.gemini2_5_flash_thinking : exports.claudeModels.sonnet;
|
|
122
122
|
}
|
|
123
123
|
if (operation === 'file-requests') {
|
|
124
124
|
return costMode === 'max' ? exports.claudeModels.sonnet : exports.claudeModels.haiku;
|
|
@@ -145,6 +145,7 @@ exports.openaiModels = {
|
|
|
145
145
|
};
|
|
146
146
|
exports.geminiModels = {
|
|
147
147
|
gemini2_5_flash: 'gemini-2.5-flash-preview-04-17',
|
|
148
|
+
gemini2_5_flash_thinking: 'gemini-2.5-flash-preview-04-17:thinking',
|
|
148
149
|
gemini2flash: 'gemini-2.0-flash-001',
|
|
149
150
|
gemini2_5_pro_exp: 'gemini-2.5-pro-exp-03-25',
|
|
150
151
|
gemini2_5_pro_preview: 'gemini-2.5-pro-preview-03-25',
|
|
@@ -152,6 +153,8 @@ exports.geminiModels = {
|
|
|
152
153
|
exports.openrouterModels = {
|
|
153
154
|
openrouter_gemini2_5_pro_exp: 'google/gemini-2.5-pro-exp-03-25:free',
|
|
154
155
|
openrouter_gemini2_5_pro_preview: 'google/gemini-2.5-pro-preview-03-25',
|
|
156
|
+
openrouter_gemini2_5_flash: 'google/gemini-2.5-flash-preview',
|
|
157
|
+
openrouter_gemini2_5_flash_thinking: 'google/gemini-2.5-flash-preview:thinking',
|
|
155
158
|
};
|
|
156
159
|
exports.deepseekModels = {
|
|
157
160
|
deepseekChat: 'deepseek-chat',
|
|
@@ -182,6 +185,9 @@ exports.shortModelNames = {
|
|
|
182
185
|
exports.providerModelNames = {
|
|
183
186
|
[exports.models.gemini2_5_pro_preview]: 'gemini',
|
|
184
187
|
[exports.models.gemini2_5_pro_exp]: 'gemini',
|
|
188
|
+
[exports.models.gemini2flash]: 'gemini',
|
|
189
|
+
[exports.models.gemini2_5_flash]: 'gemini',
|
|
190
|
+
[exports.models.gemini2_5_flash_thinking]: 'gemini',
|
|
185
191
|
[exports.models.haiku]: 'anthropic',
|
|
186
192
|
[exports.models.sonnet3_7]: 'anthropic',
|
|
187
193
|
[exports.models.sonnet]: 'anthropic',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAsDA,wCAKC;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
|
package/dist/common/db/env.mjs
CHANGED
|
@@ -8,17 +8,17 @@ const env_core_1 = require("@t3-oss/env-core");
|
|
|
8
8
|
const zod_1 = require("zod");
|
|
9
9
|
const dotenv_1 = __importDefault(require("dotenv"));
|
|
10
10
|
dotenv_1.default.config({ path: '../stack.env' });
|
|
11
|
-
if (!process.env.
|
|
12
|
-
console.error('
|
|
11
|
+
if (!process.env.NEXT_PUBLIC_CB_ENVIRONMENT) {
|
|
12
|
+
console.error('NEXT_PUBLIC_CB_ENVIRONMENT is not set, please check `stack.env`');
|
|
13
13
|
process.exit(1);
|
|
14
14
|
}
|
|
15
15
|
const DOTENV_PATH = process.env.RENDER === 'true' ? '/etc/secrets' : '..';
|
|
16
|
-
const path = `${DOTENV_PATH}/.env.${process.env.
|
|
17
|
-
console.log(`Using environment: ${process.env.
|
|
16
|
+
const path = `${DOTENV_PATH}/.env.${process.env.NEXT_PUBLIC_CB_ENVIRONMENT}`;
|
|
17
|
+
console.log(`Using environment: ${process.env.NEXT_PUBLIC_CB_ENVIRONMENT} (path: ${path})`);
|
|
18
18
|
dotenv_1.default.config({ path });
|
|
19
19
|
exports.env = (0, env_core_1.createEnv)({
|
|
20
20
|
server: {
|
|
21
|
-
|
|
21
|
+
NEXT_PUBLIC_CB_ENVIRONMENT: zod_1.z.string().min(1),
|
|
22
22
|
DATABASE_URL: zod_1.z.string().min(1),
|
|
23
23
|
},
|
|
24
24
|
runtimeEnv: process.env,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.mjs","sourceRoot":"","sources":["../../src/db/env.mjs"],"names":[],"mappings":";;;;;;AAAA,+CAA4C;AAC5C,6BAAuB;AACvB,oDAA2B;AAE3B,gBAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAA;AACvC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"env.mjs","sourceRoot":"","sources":["../../src/db/env.mjs"],"names":[],"mappings":";;;;;;AAAA,+CAA4C;AAC5C,6BAAuB;AACvB,oDAA2B;AAE3B,gBAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAA;AACvC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,CAAC;IAC5C,OAAO,CAAC,KAAK,CACX,iEAAiE,CAClE,CAAA;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACjB,CAAC;AAED,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAA;AACzE,MAAM,IAAI,GAAG,GAAG,WAAW,SAAS,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,CAAA;AAC5E,OAAO,CAAC,GAAG,CACT,sBAAsB,OAAO,CAAC,GAAG,CAAC,0BAA0B,WAAW,IAAI,GAAG,CAC/E,CAAA;AACD,gBAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;AAEV,QAAA,GAAG,GAAG,IAAA,oBAAS,EAAC;IAC3B,MAAM,EAAE;QACN,0BAA0B,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7C,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;KAChC;IACD,UAAU,EAAE,OAAO,CAAC,GAAG;CACxB,CAAC,CAAA"}
|
package/dist/common/env.mjs
CHANGED
|
@@ -8,18 +8,17 @@ const env_core_1 = require("@t3-oss/env-core");
|
|
|
8
8
|
const dotenv_1 = __importDefault(require("dotenv"));
|
|
9
9
|
const zod_1 = require("zod");
|
|
10
10
|
dotenv_1.default.config({ path: '../stack.env' });
|
|
11
|
-
if (!process.env.
|
|
12
|
-
console.error('
|
|
11
|
+
if (!process.env.NEXT_PUBLIC_CB_ENVIRONMENT) {
|
|
12
|
+
console.error('NEXT_PUBLIC_CB_ENVIRONMENT is not set, please check `stack.env`');
|
|
13
13
|
process.exit(1);
|
|
14
14
|
}
|
|
15
15
|
const DOTENV_PATH = process.env.RENDER === 'true' ? '/etc/secrets' : '..';
|
|
16
|
-
const path = `${DOTENV_PATH}/.env.${process.env.
|
|
17
|
-
console.log(`Using environment: ${process.env.
|
|
16
|
+
const path = `${DOTENV_PATH}/.env.${process.env.NEXT_PUBLIC_CB_ENVIRONMENT}`;
|
|
17
|
+
console.log(`Using environment: ${process.env.NEXT_PUBLIC_CB_ENVIRONMENT} (path: ${path})`);
|
|
18
18
|
dotenv_1.default.config({ path });
|
|
19
19
|
exports.env = (0, env_core_1.createEnv)({
|
|
20
20
|
server: {
|
|
21
|
-
|
|
22
|
-
NEXT_PUBLIC_ENVIRONMENT: zod_1.z.string().min(1),
|
|
21
|
+
NEXT_PUBLIC_CB_ENVIRONMENT: zod_1.z.string().min(1),
|
|
23
22
|
DATABASE_URL: zod_1.z.string().min(1),
|
|
24
23
|
STRIPE_SECRET_KEY: zod_1.z.string().min(1),
|
|
25
24
|
STRIPE_USAGE_PRICE_ID: zod_1.z.string().min(1).startsWith('price_'),
|
|
@@ -29,7 +28,7 @@ exports.env = (0, env_core_1.createEnv)({
|
|
|
29
28
|
.length(32, 'API_KEY_ENCRYPTION_SECRET must be 32 characters long'),
|
|
30
29
|
},
|
|
31
30
|
client: {
|
|
32
|
-
|
|
31
|
+
NEXT_PUBLIC_CB_ENVIRONMENT: zod_1.z.string().min(1),
|
|
33
32
|
NEXT_PUBLIC_APP_URL: zod_1.z.string().min(1),
|
|
34
33
|
NEXT_PUBLIC_SUPPORT_EMAIL: zod_1.z.string().min(1),
|
|
35
34
|
},
|
package/dist/common/env.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.mjs","sourceRoot":"","sources":["../src/env.mjs"],"names":[],"mappings":";;;;;;AAAA,+CAA4C;AAC5C,oDAA2B;AAC3B,6BAAuB;AAEvB,gBAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAA;AACvC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"env.mjs","sourceRoot":"","sources":["../src/env.mjs"],"names":[],"mappings":";;;;;;AAAA,+CAA4C;AAC5C,oDAA2B;AAC3B,6BAAuB;AAEvB,gBAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAA;AACvC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,CAAC;IAC5C,OAAO,CAAC,KAAK,CACX,iEAAiE,CAClE,CAAA;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACjB,CAAC;AAED,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAA;AACzE,MAAM,IAAI,GAAG,GAAG,WAAW,SAAS,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,CAAA;AAC5E,OAAO,CAAC,GAAG,CACT,sBAAsB,OAAO,CAAC,GAAG,CAAC,0BAA0B,WAAW,IAAI,GAAG,CAC/E,CAAA;AACD,gBAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;AAEV,QAAA,GAAG,GAAG,IAAA,oBAAS,EAAC;IAC3B,MAAM,EAAE;QACN,0BAA0B,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7C,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC/B,iBAAiB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACpC,qBAAqB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC;QAC7D,yBAAyB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5C,yBAAyB,EAAE,OAAC;aACzB,MAAM,EAAE;aACR,MAAM,CAAC,EAAE,EAAE,sDAAsD,CAAC;KACtE;IACD,MAAM,EAAE;QACN,0BAA0B,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7C,mBAAmB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACtC,yBAAyB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;KAC7C;IACD,UAAU,EAAE,OAAO,CAAC,GAAG;CACxB,CAAC,CAAA"}
|
|
@@ -31,7 +31,7 @@ const withLoggerContext = (additionalContext, fn) => {
|
|
|
31
31
|
exports.withLoggerContext = withLoggerContext;
|
|
32
32
|
// Only use file transport when not running in Edge/browser‑like env
|
|
33
33
|
const runningInEdge = process.env.NEXT_RUNTIME === 'edge';
|
|
34
|
-
const fileTransport = !runningInEdge && env_mjs_1.env.
|
|
34
|
+
const fileTransport = !runningInEdge && env_mjs_1.env.NEXT_PUBLIC_CB_ENVIRONMENT !== 'production'
|
|
35
35
|
? pino_1.default.transport({
|
|
36
36
|
target: 'pino/file',
|
|
37
37
|
options: { destination: path_1.default.join(__dirname, '..', 'debug.log') },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/util/logger.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AACvB,gDAAuB;AACvB,wCAAgC;AAGhC,IAAI,qBAA4E,CAAA;AAChF,IAAI,CAAC;IACH,qCAAqC;IACrC,qBAAqB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,iBAAiB,CAAA;AAClE,CAAC;AAAC,MAAM,CAAC;IACP,qBAAqB,GAAG,IAAI,CAAA;AAC9B,CAAC;AAED,2DAA2D;AAC3D,MAAM,kBAAkB,GACtB,qBAAqB,KAAK,IAAI;IAC5B,CAAC,CAAC,IAAI,qBAAqB,EAAiB;IAC5C,CAAC,CAAC;QACE,kDAAkD;QAClD,GAAG,EAAE,CAAqB,CAAM,EAAE,EAAqB,EAAE,GAAG,IAAO,EAAE,EAAE,CACrE,EAAE,CAAC,GAAG,IAAI,CAAC;QACb,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS;KAC1B,CAAA;AASA,MAAM,iBAAiB,GAAG,CAC/B,iBAAyC,EACzC,EAAoB,EACpB,EAAE;IACF,MAAM,KAAK,GAAG,CAAC,kBAAkB,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAkB,CAAA;IACtE,gEAAgE;IAChE,OAAQ,kBAA2D,CAAC,GAAG,CACrE,EAAE,GAAG,KAAK,EAAE,GAAG,iBAAiB,EAAE,EAClC,EAAE,CACH,CAAA;AACH,CAAC,CAAA;AAVY,QAAA,iBAAiB,qBAU7B;AAED,oEAAoE;AACpE,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,MAAM,CAAA;AACzD,MAAM,aAAa,GACjB,CAAC,aAAa,IAAI,aAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/util/logger.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AACvB,gDAAuB;AACvB,wCAAgC;AAGhC,IAAI,qBAA4E,CAAA;AAChF,IAAI,CAAC;IACH,qCAAqC;IACrC,qBAAqB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,iBAAiB,CAAA;AAClE,CAAC;AAAC,MAAM,CAAC;IACP,qBAAqB,GAAG,IAAI,CAAA;AAC9B,CAAC;AAED,2DAA2D;AAC3D,MAAM,kBAAkB,GACtB,qBAAqB,KAAK,IAAI;IAC5B,CAAC,CAAC,IAAI,qBAAqB,EAAiB;IAC5C,CAAC,CAAC;QACE,kDAAkD;QAClD,GAAG,EAAE,CAAqB,CAAM,EAAE,EAAqB,EAAE,GAAG,IAAO,EAAE,EAAE,CACrE,EAAE,CAAC,GAAG,IAAI,CAAC;QACb,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS;KAC1B,CAAA;AASA,MAAM,iBAAiB,GAAG,CAC/B,iBAAyC,EACzC,EAAoB,EACpB,EAAE;IACF,MAAM,KAAK,GAAG,CAAC,kBAAkB,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAkB,CAAA;IACtE,gEAAgE;IAChE,OAAQ,kBAA2D,CAAC,GAAG,CACrE,EAAE,GAAG,KAAK,EAAE,GAAG,iBAAiB,EAAE,EAClC,EAAE,CACH,CAAA;AACH,CAAC,CAAA;AAVY,QAAA,iBAAiB,qBAU7B;AAED,oEAAoE;AACpE,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,MAAM,CAAA;AACzD,MAAM,aAAa,GACjB,CAAC,aAAa,IAAI,aAAG,CAAC,0BAA0B,KAAK,YAAY;IAC/D,CAAC,CAAC,cAAI,CAAC,SAAS,CAAC;QACb,MAAM,EAAE,WAAW;QACnB,OAAO,EAAE,EAAE,WAAW,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE;QACjE,KAAK,EAAE,OAAO;KACf,CAAC;IACJ,CAAC,CAAC,SAAS,CAAA;AAEF,QAAA,MAAM,GAAG,IAAA,cAAI,EACxB;IACE,KAAK,EAAE,OAAO;IACd,KAAK;QACH,yDAAyD;QACzD,OAAO,EAAE,QAAQ,EAAE,kBAAkB,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAA;IACtD,CAAC;IACD,UAAU,EAAE;QACV,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;KACnD;IACD,SAAS,EAAE,GAAG,EAAE,CAAC,iBAAiB,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,GAAG;CAC9D,EACD,aAAa,CACd,CAAA"}
|