codebuff 1.0.113 → 1.0.115
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/README.md +19 -11
- package/dist/cli.js +4 -1
- package/dist/cli.js.map +1 -1
- package/dist/client.d.ts +8 -7
- package/dist/client.js +3 -6
- package/dist/client.js.map +1 -1
- package/dist/common/actions.d.ts +133 -133
- package/dist/common/constants.d.ts +1 -0
- package/dist/common/constants.js +4 -1
- package/dist/common/constants.js.map +1 -1
- package/dist/common/db/schema.d.ts +16 -0
- package/dist/common/db/schema.js +5 -1
- package/dist/common/db/schema.js.map +1 -1
- package/dist/common/scripts/update-subscriptions.d.ts +1 -0
- package/dist/common/scripts/update-subscriptions.js +92 -0
- package/dist/common/scripts/update-subscriptions.js.map +1 -0
- package/dist/common/util/file.d.ts +4 -0
- package/dist/common/util/file.js +14 -1
- package/dist/common/util/file.js.map +1 -1
- package/dist/common/util/string.js +5 -5
- package/dist/common/util/string.js.map +1 -1
- package/dist/common/websockets/websocket-schema.d.ts +294 -294
- package/dist/menu.js +9 -9
- package/dist/menu.js.map +1 -1
- package/dist/project-files.js +11 -7
- package/dist/project-files.js.map +1 -1
- package/dist/tool-handlers.js +1 -1
- package/dist/tool-handlers.js.map +1 -1
- package/package.json +1 -1
package/dist/common/constants.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// import { env } from './env.mjs'
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.TEST_USER_ID = exports.models = exports.openaiModels = exports.claudeModels = exports.CREDITS_REFERRAL_BONUS = exports.CREDITS_USAGE_LIMITS = exports.MAX_DATE = exports.SKIPPED_TERMINAL_COMMANDS = exports.DEFAULT_IGNORED_FILES = exports.EXISTING_CODE_MARKER = exports.TOOL_RESULT_MARKER = exports.FIND_FILES_MARKER = exports.STOP_MARKER = void 0;
|
|
4
|
+
exports.TEST_USER_ID = exports.models = exports.openaiModels = exports.claudeModels = exports.CREDITS_REFERRAL_BONUS = exports.CREDITS_USAGE_LIMITS = exports.MAX_DATE = exports.REQUEST_CREDIT_SHOW_THRESHOLD = exports.SKIPPED_TERMINAL_COMMANDS = exports.DEFAULT_IGNORED_FILES = exports.EXISTING_CODE_MARKER = exports.TOOL_RESULT_MARKER = exports.FIND_FILES_MARKER = exports.STOP_MARKER = void 0;
|
|
5
5
|
exports.STOP_MARKER = '[' + 'END]';
|
|
6
6
|
exports.FIND_FILES_MARKER = '[' + 'FIND_FILES_PLEASE]';
|
|
7
7
|
exports.TOOL_RESULT_MARKER = '[' + 'TOOL_RESULT]';
|
|
@@ -45,6 +45,7 @@ exports.SKIPPED_TERMINAL_COMMANDS = [
|
|
|
45
45
|
'unset',
|
|
46
46
|
'what',
|
|
47
47
|
'which',
|
|
48
|
+
'where',
|
|
48
49
|
'who',
|
|
49
50
|
'write',
|
|
50
51
|
'yes',
|
|
@@ -58,7 +59,9 @@ exports.SKIPPED_TERMINAL_COMMANDS = [
|
|
|
58
59
|
'apply',
|
|
59
60
|
'look',
|
|
60
61
|
'do',
|
|
62
|
+
'break',
|
|
61
63
|
];
|
|
64
|
+
exports.REQUEST_CREDIT_SHOW_THRESHOLD = 1;
|
|
62
65
|
exports.MAX_DATE = new Date(86399999999999);
|
|
63
66
|
exports.CREDITS_USAGE_LIMITS = process.env.NEXT_PUBLIC_ENVIRONMENT === 'local'
|
|
64
67
|
? {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";AAAA,kCAAkC;;;AAErB,QAAA,WAAW,GAAG,GAAG,GAAG,MAAM,CAAA;AAC1B,QAAA,iBAAiB,GAAG,GAAG,GAAG,oBAAoB,CAAA;AAC9C,QAAA,kBAAkB,GAAG,GAAG,GAAG,cAAc,CAAA;AACzC,QAAA,oBAAoB,GAAG,oCAAoC,CAAA;AAE3D,QAAA,qBAAqB,GAAG;IACnC,MAAM;IACN,MAAM;IACN,SAAS;IACT,cAAc;IACd,MAAM;IACN,YAAY;IACZ,KAAK;IACL,OAAO;IACP,aAAa;IACb,KAAK;IACL,aAAa;IACb,aAAa;IACb,OAAO;CACR,CAAA;AAEY,QAAA,yBAAyB,GAAG;IACvC,UAAU;IACV,MAAM;IACN,MAAM;IACN,SAAS;IACT,IAAI;IACJ,MAAM;IACN,MAAM;IACN,KAAK;IACL,MAAM;IACN,MAAM;IACN,MAAM;IACN,KAAK;IACL,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;IACN,MAAM;IACN,KAAK;IACL,OAAO;IACP,MAAM;IACN,OAAO;IACP,MAAM;IACN,OAAO;IACP,KAAK;IACL,OAAO;IACP,KAAK;IACL,MAAM;IACN,MAAM;IACN,KAAK;IACL,KAAK;IACL,MAAM;IACN,MAAM;IACN,QAAQ;IACR,OAAO;IACP,MAAM;IACN,IAAI;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";AAAA,kCAAkC;;;AAErB,QAAA,WAAW,GAAG,GAAG,GAAG,MAAM,CAAA;AAC1B,QAAA,iBAAiB,GAAG,GAAG,GAAG,oBAAoB,CAAA;AAC9C,QAAA,kBAAkB,GAAG,GAAG,GAAG,cAAc,CAAA;AACzC,QAAA,oBAAoB,GAAG,oCAAoC,CAAA;AAE3D,QAAA,qBAAqB,GAAG;IACnC,MAAM;IACN,MAAM;IACN,SAAS;IACT,cAAc;IACd,MAAM;IACN,YAAY;IACZ,KAAK;IACL,OAAO;IACP,aAAa;IACb,KAAK;IACL,aAAa;IACb,aAAa;IACb,OAAO;CACR,CAAA;AAEY,QAAA,yBAAyB,GAAG;IACvC,UAAU;IACV,MAAM;IACN,MAAM;IACN,SAAS;IACT,IAAI;IACJ,MAAM;IACN,MAAM;IACN,KAAK;IACL,MAAM;IACN,MAAM;IACN,MAAM;IACN,KAAK;IACL,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;IACN,MAAM;IACN,KAAK;IACL,OAAO;IACP,MAAM;IACN,OAAO;IACP,MAAM;IACN,OAAO;IACP,OAAO;IACP,KAAK;IACL,OAAO;IACP,KAAK;IACL,MAAM;IACN,MAAM;IACN,KAAK;IACL,KAAK;IACL,MAAM;IACN,MAAM;IACN,QAAQ;IACR,OAAO;IACP,MAAM;IACN,IAAI;IACJ,OAAO;CACR,CAAA;AAEY,QAAA,6BAA6B,GAAG,CAAC,CAAA;AACjC,QAAA,QAAQ,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,CAAA;AAGnC,QAAA,oBAAoB,GAC/B,OAAO,CAAC,GAAG,CAAC,uBAAuB,KAAK,OAAO;IAC7C,CAAC,CAAC;QACE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,UAAU;QAChB,QAAQ,EAAE,UAAU;KACrB;IACH,CAAC,CAAC;QACE,IAAI,EAAE,GAAG;QACT,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,MAAM;KACjB,CAAA;AACM,QAAA,sBAAsB,GAAG,GAAG,CAAA;AAE5B,QAAA,YAAY,GAAG;IAC1B,MAAM,EAAE,4BAA4B;IACpC,KAAK,EAAE,2BAA2B;CAC1B,CAAA;AAEG,QAAA,YAAY,GAAG;IAC1B,KAAK,EAAE,mBAAmB;IAC1B,SAAS,EAAE,wBAAwB;CAC3B,CAAA;AAEG,QAAA,MAAM,GAAG;IACpB,GAAG,oBAAY;IACf,GAAG,oBAAY;CAChB,CAAA;AAEY,QAAA,YAAY,GAAG,cAAc,CAAA"}
|
|
@@ -600,6 +600,22 @@ export declare const fingerprint: import("drizzle-orm/pg-core").PgTableWithColum
|
|
|
600
600
|
baseColumn: never;
|
|
601
601
|
generated: undefined;
|
|
602
602
|
}, {}, {}>;
|
|
603
|
+
created_at: import("drizzle-orm/pg-core").PgColumn<{
|
|
604
|
+
name: "created_at";
|
|
605
|
+
tableName: "fingerprint";
|
|
606
|
+
dataType: "date";
|
|
607
|
+
columnType: "PgTimestamp";
|
|
608
|
+
data: Date;
|
|
609
|
+
driverParam: string;
|
|
610
|
+
notNull: true;
|
|
611
|
+
hasDefault: true;
|
|
612
|
+
isPrimaryKey: false;
|
|
613
|
+
isAutoincrement: false;
|
|
614
|
+
hasRuntimeDefault: false;
|
|
615
|
+
enumValues: undefined;
|
|
616
|
+
baseColumn: never;
|
|
617
|
+
generated: undefined;
|
|
618
|
+
}, {}, {}>;
|
|
603
619
|
};
|
|
604
620
|
dialect: "pg";
|
|
605
621
|
}>;
|
package/dist/common/db/schema.js
CHANGED
|
@@ -70,6 +70,7 @@ exports.fingerprint = (0, pg_core_1.pgTable)('fingerprint', {
|
|
|
70
70
|
sig_hash: (0, pg_core_1.text)('sig_hash'),
|
|
71
71
|
quota_exceeded: (0, pg_core_1.boolean)('quota_exceeded').notNull().default(false),
|
|
72
72
|
next_quota_reset: (0, pg_core_1.timestamp)('next_quota_reset', { mode: 'date' }).default((0, drizzle_orm_1.sql) `now() + INTERVAL '1 month'`),
|
|
73
|
+
created_at: (0, pg_core_1.timestamp)('created_at', { mode: 'date' }).notNull().defaultNow(),
|
|
73
74
|
});
|
|
74
75
|
exports.message = (0, pg_core_1.pgTable)('message', {
|
|
75
76
|
id: (0, pg_core_1.text)('id').primaryKey(),
|
|
@@ -94,7 +95,10 @@ exports.message = (0, pg_core_1.pgTable)('message', {
|
|
|
94
95
|
fingerprint_id: (0, pg_core_1.text)('fingerprint_id')
|
|
95
96
|
.references(() => exports.fingerprint.id, { onDelete: 'cascade' })
|
|
96
97
|
.notNull(),
|
|
97
|
-
})
|
|
98
|
+
}, (table) => ({
|
|
99
|
+
message_fingerprint_id_idx: (0, pg_core_1.index)('message_fingerprint_id_idx').on(table.fingerprint_id),
|
|
100
|
+
message_user_id_idx: (0, pg_core_1.index)('message_user_id_idx').on(table.user_id),
|
|
101
|
+
}));
|
|
98
102
|
exports.session = (0, pg_core_1.pgTable)('session', {
|
|
99
103
|
sessionToken: (0, pg_core_1.text)('sessionToken').notNull().primaryKey(),
|
|
100
104
|
userId: (0, pg_core_1.text)('userId')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/db/schema.ts"],"names":[],"mappings":";;;AAAA,6CAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/db/schema.ts"],"names":[],"mappings":";;;AAAA,6CAAsC;AACtC,iDAY4B;AAE5B,gDAAwD;AAExD,iCAAiC;AACpB,QAAA,cAAc,GAAG,IAAA,gBAAM,EAAC,iBAAiB,EAAE;IACtD,+BAAoB,CAAC,CAAC,CAAC;IACvB,GAAG,+BAAoB,CAAC,KAAK,CAAC,CAAC,CAAC;CACjC,CAAC,CAAA;AAEW,QAAA,IAAI,GAAG,IAAA,iBAAO,EAAC,MAAM,EAAE;IAClC,EAAE,EAAE,IAAA,cAAI,EAAC,IAAI,CAAC;SACX,UAAU,EAAE;SACZ,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IACxC,IAAI,EAAE,IAAA,cAAI,EAAC,MAAM,CAAC;IAClB,KAAK,EAAE,IAAA,cAAI,EAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;IACvC,QAAQ,EAAE,IAAA,cAAI,EAAC,UAAU,CAAC;IAC1B,aAAa,EAAE,IAAA,mBAAS,EAAC,eAAe,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC3D,KAAK,EAAE,IAAA,cAAI,EAAC,OAAO,CAAC;IACpB,mBAAmB,EAAE,IAAA,iBAAO,EAAC,qBAAqB,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IAC5E,kBAAkB,EAAE,IAAA,cAAI,EAAC,oBAAoB,CAAC,CAAC,MAAM,EAAE;IACvD,eAAe,EAAE,IAAA,cAAI,EAAC,iBAAiB,CAAC;IACxC,KAAK,EAAE,IAAA,iBAAO,EAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAC5C,cAAc,EAAE,IAAA,iBAAO,EAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IAClE,gBAAgB,EAAE,IAAA,mBAAS,EAAC,kBAAkB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,CACvE,IAAA,iBAAG,EAAM,4BAA4B,CACtC;IACD,UAAU,EAAE,IAAA,mBAAS,EAAC,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,UAAU,EAAE;IAC5E,aAAa,EAAE,IAAA,cAAI,EAAC,eAAe,CAAC;SACjC,MAAM,EAAE;SACR,OAAO,CAAC,IAAA,iBAAG,EAAA,6BAA6B,CAAC;IAC5C,cAAc,EAAE,IAAA,iBAAO,EAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;CAC/D,CAAC,CAAA;AAEW,QAAA,OAAO,GAAG,IAAA,iBAAO,EAC5B,SAAS,EACT;IACE,MAAM,EAAE,IAAA,cAAI,EAAC,QAAQ,CAAC;SACnB,OAAO,EAAE;SACT,UAAU,CAAC,GAAG,EAAE,CAAC,YAAI,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IACrD,IAAI,EAAE,IAAA,cAAI,EAAC,MAAM,CAAC,CAAC,KAAK,EAA0B,CAAC,OAAO,EAAE;IAC5D,QAAQ,EAAE,IAAA,cAAI,EAAC,UAAU,CAAC,CAAC,OAAO,EAAE;IACpC,iBAAiB,EAAE,IAAA,cAAI,EAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE;IACtD,aAAa,EAAE,IAAA,cAAI,EAAC,eAAe,CAAC;IACpC,YAAY,EAAE,IAAA,cAAI,EAAC,cAAc,CAAC;IAClC,UAAU,EAAE,IAAA,iBAAO,EAAC,YAAY,CAAC;IACjC,UAAU,EAAE,IAAA,cAAI,EAAC,YAAY,CAAC;IAC9B,KAAK,EAAE,IAAA,cAAI,EAAC,OAAO,CAAC;IACpB,QAAQ,EAAE,IAAA,cAAI,EAAC,UAAU,CAAC;IAC1B,aAAa,EAAE,IAAA,cAAI,EAAC,eAAe,CAAC;CACrC,EACD,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACZ,WAAW,EAAE,IAAA,oBAAU,EAAC;QACtB,OAAO,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,iBAAiB,CAAC;KACvD,CAAC;CACH,CAAC,CACH,CAAA;AAEY,QAAA,QAAQ,GAAG,IAAA,iBAAO,EAC7B,UAAU,EACV;IACE,WAAW,EAAE,IAAA,cAAI,EAAC,aAAa,CAAC;SAC7B,OAAO,EAAE;SACT,UAAU,CAAC,GAAG,EAAE,CAAC,YAAI,CAAC,EAAE,CAAC;IAC5B,WAAW,EAAE,IAAA,cAAI,EAAC,aAAa,CAAC;SAC7B,OAAO,EAAE;SACT,UAAU,CAAC,GAAG,EAAE,CAAC,YAAI,CAAC,EAAE,CAAC;IAC5B,MAAM,EAAE,IAAA,sBAAc,EAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC;IAC7D,OAAO,EAAE,IAAA,iBAAO,EAAC,SAAS,CAAC,CAAC,OAAO,EAAE;IACrC,UAAU,EAAE,IAAA,mBAAS,EAAC,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;SAClD,OAAO,EAAE;SACT,UAAU,EAAE;IACf,YAAY,EAAE,IAAA,mBAAS,EAAC,cAAc,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;CAC1D,EACD,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACV,EAAE,EAAE,IAAA,oBAAU,EAAC,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;CACpE,CAAC,CACH,CAAA;AACY,QAAA,WAAW,GAAG,IAAA,iBAAO,EAAC,aAAa,EAAE;IAChD,EAAE,EAAE,IAAA,cAAI,EAAC,IAAI,CAAC,CAAC,UAAU,EAAE;IAC3B,QAAQ,EAAE,IAAA,cAAI,EAAC,UAAU,CAAC;IAC1B,cAAc,EAAE,IAAA,iBAAO,EAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IAClE,gBAAgB,EAAE,IAAA,mBAAS,EAAC,kBAAkB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,CACvE,IAAA,iBAAG,EAAM,4BAA4B,CACtC;IACD,UAAU,EAAE,IAAA,mBAAS,EAAC,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,UAAU,EAAE;CAC7E,CAAC,CAAA;AAEW,QAAA,OAAO,GAAG,IAAA,iBAAO,EAC5B,SAAS,EACT;IACE,EAAE,EAAE,IAAA,cAAI,EAAC,IAAI,CAAC,CAAC,UAAU,EAAE;IAC3B,WAAW,EAAE,IAAA,mBAAS,EAAC,aAAa,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE;IACjE,SAAS,EAAE,IAAA,cAAI,EAAC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,wDAAwD;IAChG,iBAAiB,EAAE,IAAA,cAAI,EAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,EAAE,uDAAuD;IAC/G,KAAK,EAAE,IAAA,cAAI,EAAC,OAAO,CAAC,CAAC,OAAO,EAAE;IAC9B,OAAO,EAAE,IAAA,eAAK,EAAC,SAAS,CAAC,CAAC,OAAO,EAAE;IACnC,WAAW,EAAE,IAAA,eAAK,EAAC,cAAc,CAAC,CAAC,iBAAiB,CAClD,GAAQ,EAAE,CAAC,IAAA,iBAAG,EAAA,GAAG,eAAO,CAAC,OAAO,QAAQ,CACzC;IACD,QAAQ,EAAE,IAAA,eAAK,EAAC,UAAU,CAAC,CAAC,OAAO,EAAE;IACrC,YAAY,EAAE,IAAA,iBAAO,EAAC,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1D,2BAA2B,EAAE,IAAA,iBAAO,EAAC,6BAA6B,CAAC;SAChE,OAAO,EAAE;SACT,OAAO,CAAC,CAAC,CAAC;IACb,uBAAuB,EAAE,IAAA,iBAAO,EAAC,yBAAyB,CAAC;SACxD,OAAO,EAAE;SACT,OAAO,CAAC,CAAC,CAAC;IACb,aAAa,EAAE,IAAA,iBAAO,EAAC,eAAe,CAAC,CAAC,OAAO,EAAE;IACjD,IAAI,EAAE,IAAA,iBAAO,EAAC,MAAM,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE;IAC9D,OAAO,EAAE,IAAA,iBAAO,EAAC,SAAS,CAAC,CAAC,OAAO,EAAE;IACrC,OAAO,EAAE,IAAA,cAAI,EAAC,SAAS,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,YAAI,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAC3E,cAAc,EAAE,IAAA,cAAI,EAAC,gBAAgB,CAAC;SACnC,UAAU,CAAC,GAAG,EAAE,CAAC,mBAAW,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;SACzD,OAAO,EAAE;CACb,EACD,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACV,0BAA0B,EAAE,IAAA,eAAK,EAAC,4BAA4B,CAAC,CAAC,EAAE,CAChE,KAAK,CAAC,cAAc,CACrB;IACD,mBAAmB,EAAE,IAAA,eAAK,EAAC,qBAAqB,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;CACpE,CAAC,CACH,CAAA;AAEY,QAAA,OAAO,GAAG,IAAA,iBAAO,EAAC,SAAS,EAAE;IACxC,YAAY,EAAE,IAAA,cAAI,EAAC,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC,UAAU,EAAE;IACzD,MAAM,EAAE,IAAA,cAAI,EAAC,QAAQ,CAAC;SACnB,OAAO,EAAE;SACT,UAAU,CAAC,GAAG,EAAE,CAAC,YAAI,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IACrD,OAAO,EAAE,IAAA,mBAAS,EAAC,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE;IACzD,cAAc,EAAE,IAAA,cAAI,EAAC,gBAAgB,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,mBAAW,CAAC,EAAE,CAAC;CACxE,CAAC,CAAA;AAEW,QAAA,iBAAiB,GAAG,IAAA,iBAAO,EACtC,mBAAmB,EACnB;IACE,UAAU,EAAE,IAAA,cAAI,EAAC,YAAY,CAAC,CAAC,OAAO,EAAE;IACxC,KAAK,EAAE,IAAA,cAAI,EAAC,OAAO,CAAC,CAAC,OAAO,EAAE;IAC9B,OAAO,EAAE,IAAA,mBAAS,EAAC,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE;CAC1D,EACD,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACP,WAAW,EAAE,IAAA,oBAAU,EAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;CAChE,CAAC,CACH,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
28
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
const drizzle_orm_1 = require("drizzle-orm");
|
|
30
|
+
const stripe_1 = require("../util/stripe");
|
|
31
|
+
const db_1 = __importDefault(require("../db"));
|
|
32
|
+
const schema = __importStar(require("../db/schema"));
|
|
33
|
+
async function main() {
|
|
34
|
+
const email = process.argv[2];
|
|
35
|
+
if (!email) {
|
|
36
|
+
console.error('Please provide an email address');
|
|
37
|
+
process.exit(1);
|
|
38
|
+
}
|
|
39
|
+
console.log(`Processing user ${email}...`);
|
|
40
|
+
// Find user and verify subscription
|
|
41
|
+
const user = await db_1.default.query.user.findFirst({
|
|
42
|
+
where: (0, drizzle_orm_1.eq)(schema.user.email, email),
|
|
43
|
+
});
|
|
44
|
+
if (!user?.stripe_customer_id) {
|
|
45
|
+
console.error('User not found or has no Stripe customer ID');
|
|
46
|
+
process.exit(1);
|
|
47
|
+
}
|
|
48
|
+
console.log('Found user:', user.id);
|
|
49
|
+
// Get subscriptions for customer
|
|
50
|
+
const subscriptions = await stripe_1.stripeServer.subscriptions.list({
|
|
51
|
+
customer: user.stripe_customer_id,
|
|
52
|
+
status: 'active',
|
|
53
|
+
});
|
|
54
|
+
if (subscriptions.data.length === 0) {
|
|
55
|
+
console.error('No active subscription found');
|
|
56
|
+
process.exit(1);
|
|
57
|
+
}
|
|
58
|
+
const subscription = subscriptions.data[0];
|
|
59
|
+
console.log('Found subscription:', subscription.id);
|
|
60
|
+
// Update subscription items
|
|
61
|
+
console.log('Updating subscription items...');
|
|
62
|
+
await stripe_1.stripeServer.subscriptions.update(subscription.id, {
|
|
63
|
+
items: [
|
|
64
|
+
{ price: 'price_1QLxwxKrNS6SjmqWeKhJIlAD', quantity: 1 },
|
|
65
|
+
{ price: 'price_1QMlqaKrNS6SjmqWQEeaTcqk' },
|
|
66
|
+
],
|
|
67
|
+
});
|
|
68
|
+
// Calculate usage since Oct 30, 2024
|
|
69
|
+
const startDate = new Date('2024-10-30');
|
|
70
|
+
const creditsUsed = await db_1.default
|
|
71
|
+
.select({
|
|
72
|
+
total: (0, drizzle_orm_1.sql) `SUM(${schema.message.credits})`,
|
|
73
|
+
})
|
|
74
|
+
.from(schema.message)
|
|
75
|
+
.where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(schema.message.user_id, user.id), (0, drizzle_orm_1.gte)(schema.message.finished_at, startDate)))
|
|
76
|
+
.then((result) => parseInt(result[0]?.total ?? '0'));
|
|
77
|
+
console.log('Credits used since Oct 30, 2024:', creditsUsed);
|
|
78
|
+
// Report usage
|
|
79
|
+
const timestamp = Math.floor(startDate.getTime() / 1000);
|
|
80
|
+
await stripe_1.stripeServer.subscriptionItems.createUsageRecord(subscription.items.data[1].id, // Get the metered price item
|
|
81
|
+
{
|
|
82
|
+
quantity: creditsUsed,
|
|
83
|
+
timestamp,
|
|
84
|
+
action: 'set',
|
|
85
|
+
});
|
|
86
|
+
console.log('Successfully updated subscription and usage');
|
|
87
|
+
}
|
|
88
|
+
main().catch((error) => {
|
|
89
|
+
console.error('Error:', error);
|
|
90
|
+
process.exit(1);
|
|
91
|
+
});
|
|
92
|
+
//# sourceMappingURL=update-subscriptions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-subscriptions.js","sourceRoot":"","sources":["../../src/scripts/update-subscriptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -106,3 +106,7 @@ export declare const createSearchReplaceBlock: (search: string, replace: string)
|
|
|
106
106
|
export declare function printFileTree(nodes: FileTreeNode[], depth?: number): string;
|
|
107
107
|
export declare function printFileTreeWithTokens(nodes: FileTreeNode[], fileTokenScores: Record<string, Record<string, number>>, path?: string[]): string;
|
|
108
108
|
export declare const ensureDirectoryExists: (baseDir: string) => void;
|
|
109
|
+
/**
|
|
110
|
+
* Removes markdown code block syntax if present, including any language tag
|
|
111
|
+
*/
|
|
112
|
+
export declare const cleanMarkdownCodeBlock: (content: string) => string;
|
package/dist/common/util/file.js
CHANGED
|
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.ensureDirectoryExists = exports.createSearchReplaceBlock = exports.createMarkdownFileBlock = exports.parseFileBlocksWithoutPath = exports.parseFileBlocks = exports.fileWithNoPathRegex = exports.fileRegex = exports.createFileBlockWithoutPath = exports.createFileBlock = exports.ProjectFileContextSchema = exports.FileVersionSchema = exports.FileTreeNodeSchema = void 0;
|
|
26
|
+
exports.cleanMarkdownCodeBlock = exports.ensureDirectoryExists = exports.createSearchReplaceBlock = exports.createMarkdownFileBlock = exports.parseFileBlocksWithoutPath = exports.parseFileBlocks = exports.fileWithNoPathRegex = exports.fileRegex = exports.createFileBlockWithoutPath = exports.createFileBlock = exports.ProjectFileContextSchema = exports.FileVersionSchema = exports.FileTreeNodeSchema = void 0;
|
|
27
27
|
exports.printFileTree = printFileTree;
|
|
28
28
|
exports.printFileTreeWithTokens = printFileTreeWithTokens;
|
|
29
29
|
const fs = __importStar(require("fs"));
|
|
@@ -135,6 +135,9 @@ function printFileTreeWithTokens(nodes, fileTokenScores, path = []) {
|
|
|
135
135
|
}
|
|
136
136
|
path.pop();
|
|
137
137
|
}
|
|
138
|
+
if (nodes.length === 0) {
|
|
139
|
+
result = '[No files in this directory.]';
|
|
140
|
+
}
|
|
138
141
|
return result;
|
|
139
142
|
}
|
|
140
143
|
const ensureDirectoryExists = (baseDir) => {
|
|
@@ -143,4 +146,14 @@ const ensureDirectoryExists = (baseDir) => {
|
|
|
143
146
|
}
|
|
144
147
|
};
|
|
145
148
|
exports.ensureDirectoryExists = ensureDirectoryExists;
|
|
149
|
+
/**
|
|
150
|
+
* Removes markdown code block syntax if present, including any language tag
|
|
151
|
+
*/
|
|
152
|
+
const cleanMarkdownCodeBlock = (content) => {
|
|
153
|
+
const cleanResponse = content.match(/^```(?:[a-zA-Z]+)?\n([\s\S]*)\n```$/)
|
|
154
|
+
? content.replace(/^```(?:[a-zA-Z]+)?\n/, '').replace(/\n```$/, '')
|
|
155
|
+
: content;
|
|
156
|
+
return cleanResponse;
|
|
157
|
+
};
|
|
158
|
+
exports.cleanMarkdownCodeBlock = cleanMarkdownCodeBlock;
|
|
146
159
|
//# sourceMappingURL=file.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AA2GA,sCAaC;AAED,
|
|
1
|
+
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,21 +59,21 @@ const randBoolFromStr = (str) => {
|
|
|
59
59
|
exports.randBoolFromStr = randBoolFromStr;
|
|
60
60
|
const pluralize = (count, word) => {
|
|
61
61
|
if (count === 1)
|
|
62
|
-
return word
|
|
62
|
+
return `${count} ${word}`;
|
|
63
63
|
// Handle words ending in 'y' (unless preceded by a vowel)
|
|
64
64
|
if (word.endsWith('y') && !word.match(/[aeiou]y$/)) {
|
|
65
|
-
return word.slice(0, -1) + 'ies'
|
|
65
|
+
return `${count} ${word.slice(0, -1) + 'ies'}`;
|
|
66
66
|
}
|
|
67
67
|
// Handle words ending in s, sh, ch, x, z, o
|
|
68
68
|
if (word.match(/[sxz]$/) || word.match(/[cs]h$/) || word.match(/o$/)) {
|
|
69
|
-
return word + 'es'
|
|
69
|
+
return `${count} ${word + 'es'}`;
|
|
70
70
|
}
|
|
71
71
|
// Handle words ending in f/fe
|
|
72
72
|
if (word.endsWith('f')) {
|
|
73
|
-
return word.slice(0, -1) + 'ves'
|
|
73
|
+
return `${count} ${word.slice(0, -1) + 'ves'}`;
|
|
74
74
|
}
|
|
75
75
|
if (word.endsWith('fe')) {
|
|
76
|
-
return word.slice(0, -2) + 'ves'
|
|
76
|
+
return `${count} ${word.slice(0, -2) + 'ves'}`;
|
|
77
77
|
}
|
|
78
78
|
return `${count} ${word + 's'}`;
|
|
79
79
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"string.js","sourceRoot":"","sources":["../../src/util/string.ts"],"names":[],"mappings":";;;AAAA,mCAA8B;AAEvB,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,SAAiB,EAAE,EAAE;IAC/D,IAAI,GAAG,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC;QAC5B,OAAO,GAAG,CAAA;IACZ,CAAC;IACD,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,KAAK,CAAA;AACxC,CAAC,CAAA;AALY,QAAA,cAAc,kBAK1B;AAEM,MAAM,qCAAqC,GAAG,CACnD,OAAe,EACf,WAAmB,EACX,EAAE;IACV,MAAM,eAAe,GAAG;QACtB,kCAAkC;QAClC;YACE,KAAK,EACH,0FAA0F;YAC5F,WAAW,EAAE,WAAW;SACzB;QACD,gEAAgE;QAChE;YACE,KAAK,EACH,2EAA2E;YAC7E,WAAW,EAAE,WAAW;SACzB;QACD;YACE,KAAK,EACH,kFAAkF;YACpF,WAAW,EAAE,WAAW;SACzB;QACD,2BAA2B;QAC3B;YACE,KAAK,EACH,wEAAwE;YAC1E,WAAW,EAAE,WAAW;SACzB;QACD,sBAAsB;QACtB;YACE,KAAK,EACH,iFAAiF;YACnF,WAAW,EAAE,WAAW;SACzB;QACD,6BAA6B;QAC7B;YACE,KAAK,EACH,yEAAyE;YAC3E,WAAW,EAAE,WAAW;SACzB;QACD,kBAAkB;QAClB;YACE,KAAK,EACH,wEAAwE;YAC1E,WAAW,EAAE,WAAW;SACzB;KACF,CAAA;IAED,IAAI,cAAc,GAAG,OAAO,CAAA;IAE5B,KAAK,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,eAAe,EAAE,CAAC;QACrD,cAAc,GAAG,cAAc,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;IAChE,CAAC;IAED,OAAO,cAAc,CAAA;AACvB,CAAC,CAAA;AAvDY,QAAA,qCAAqC,yCAuDjD;AAEM,MAAM,eAAe,GAAG,CAAC,GAAW,EAAE,EAAE;IAC7C,OAAO,IAAA,cAAK,EAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;AACrE,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B;AAEM,MAAM,SAAS,GAAG,CAAC,KAAa,EAAE,IAAY,EAAE,EAAE;IACvD,IAAI,KAAK,KAAK,CAAC;QAAE,OAAO,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"string.js","sourceRoot":"","sources":["../../src/util/string.ts"],"names":[],"mappings":"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"}
|