@cortexmemory/cli 0.28.1 → 0.31.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.
- package/dist/commands/db.d.ts.map +1 -1
- package/dist/commands/db.js +32 -4
- package/dist/commands/db.js.map +1 -1
- package/dist/commands/deploy.d.ts.map +1 -1
- package/dist/commands/deploy.js +145 -40
- package/dist/commands/deploy.js.map +1 -1
- package/package.json +5 -5
- package/templates/basic/package-lock.json +194 -702
- package/templates/basic/package.json +7 -7
- package/templates/basic/src/chat.ts +24 -3
- package/templates/basic/src/cortex.ts +41 -5
- package/templates/basic/src/index.ts +17 -1
- package/templates/basic/src/server.ts +18 -2
- package/templates/vercel-ai-quickstart/lib/agents/memory-agent.ts +2 -1
- package/templates/vercel-ai-quickstart/next.config.js +13 -4
- package/templates/vercel-ai-quickstart/package.json +8 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/commands/db.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,KAAK,EACV,SAAS,EAIV,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/commands/db.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,KAAK,EACV,SAAS,EAIV,MAAM,aAAa,CAAC;AAuBrB;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI,CA0zB7E"}
|
package/dist/commands/db.js
CHANGED
|
@@ -16,7 +16,10 @@ import { validateFilePath, requireConfirmation } from "../utils/validation.js";
|
|
|
16
16
|
import { writeFile, readFile } from "fs/promises";
|
|
17
17
|
import pc from "picocolors";
|
|
18
18
|
import prompts from "prompts";
|
|
19
|
-
const MAX_LIMIT =
|
|
19
|
+
const MAX_LIMIT = 10000;
|
|
20
|
+
// Batch size reduction sequence for handling Convex 16MB read limit
|
|
21
|
+
// Starts at 10000, reduces on "Server Error": 10000 -> 500 -> 250 -> 50
|
|
22
|
+
const BATCH_SIZE_SEQUENCE = [10000, 500, 250, 50];
|
|
20
23
|
/**
|
|
21
24
|
* Register database commands
|
|
22
25
|
*/
|
|
@@ -236,17 +239,42 @@ export function registerDbCommands(program, _config) {
|
|
|
236
239
|
// Get raw Convex client for direct table access via admin functions
|
|
237
240
|
const rawClient = client.getClient();
|
|
238
241
|
// Helper to clear a table using the admin:clearTable mutation
|
|
242
|
+
// Uses adaptive batch sizing: starts at 1000, reduces on "Too many bytes" errors
|
|
239
243
|
const clearTableDirect = async (tableName, counter) => {
|
|
240
244
|
let hasMore = true;
|
|
245
|
+
let batchSizeIndex = 0; // Start with largest batch size
|
|
241
246
|
while (hasMore) {
|
|
247
|
+
const batchLimit = BATCH_SIZE_SEQUENCE[batchSizeIndex];
|
|
242
248
|
spinner.text = `Clearing ${tableName}... (${deleted[counter]} deleted)`;
|
|
243
249
|
try {
|
|
244
|
-
|
|
250
|
+
// Suppress Convex SDK's console.error during mutation (we handle errors ourselves)
|
|
251
|
+
const originalConsoleError = console.error;
|
|
252
|
+
console.error = () => { };
|
|
253
|
+
let result;
|
|
254
|
+
try {
|
|
255
|
+
result = await rawClient.mutation("admin:clearTable", { table: tableName, limit: batchLimit });
|
|
256
|
+
}
|
|
257
|
+
finally {
|
|
258
|
+
console.error = originalConsoleError;
|
|
259
|
+
}
|
|
245
260
|
deleted[counter] += result.deleted;
|
|
246
261
|
hasMore = result.hasMore;
|
|
247
262
|
}
|
|
248
|
-
catch {
|
|
249
|
-
|
|
263
|
+
catch (err) {
|
|
264
|
+
const errorMsg = err instanceof Error ? err.message : String(err);
|
|
265
|
+
// Check for byte limit error - Convex wraps errors, so check for:
|
|
266
|
+
// 1. Direct "Too many bytes" message (if propagated)
|
|
267
|
+
// 2. Generic "Server Error" from Convex client (common wrapper)
|
|
268
|
+
const isByteLimitError = errorMsg.includes("Too many bytes") ||
|
|
269
|
+
errorMsg.includes("Server Error");
|
|
270
|
+
if (isByteLimitError && batchSizeIndex < BATCH_SIZE_SEQUENCE.length - 1) {
|
|
271
|
+
// Reduce batch size and retry
|
|
272
|
+
batchSizeIndex++;
|
|
273
|
+
}
|
|
274
|
+
else {
|
|
275
|
+
// Either not a retryable error or we've exhausted all batch sizes
|
|
276
|
+
hasMore = false;
|
|
277
|
+
}
|
|
250
278
|
}
|
|
251
279
|
}
|
|
252
280
|
};
|
package/dist/commands/db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/commands/db.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/commands/db.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,OAAO,KAAK,EAAE,SAAS,EAA+B,MAAM,aAAa,CAAC;AA+E1E;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,SAAS,GACjB,IAAI,
|
|
1
|
+
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,OAAO,KAAK,EAAE,SAAS,EAA+B,MAAM,aAAa,CAAC;AA+E1E;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,SAAS,GACjB,IAAI,CAywBN"}
|
package/dist/commands/deploy.js
CHANGED
|
@@ -406,10 +406,31 @@ export function registerDeployCommands(program, _config) {
|
|
|
406
406
|
const targetSdkVersion = isDevMode
|
|
407
407
|
? "dev"
|
|
408
408
|
: (options.sdkVersion ?? latestSdkVersion);
|
|
409
|
+
// Check for convex patch update
|
|
410
|
+
const parseVersion = (v) => {
|
|
411
|
+
const match = v.match(/^(\d+)\.(\d+)\.(\d+)/);
|
|
412
|
+
if (!match)
|
|
413
|
+
return null;
|
|
414
|
+
return {
|
|
415
|
+
major: parseInt(match[1]),
|
|
416
|
+
minor: parseInt(match[2]),
|
|
417
|
+
patch: parseInt(match[3]),
|
|
418
|
+
};
|
|
419
|
+
};
|
|
420
|
+
const currentConvex = parseVersion(currentConvexVersion);
|
|
421
|
+
const latestConvex = parseVersion(latestConvexVersion);
|
|
422
|
+
let convexPatchAvailable = false;
|
|
423
|
+
if (currentConvex && latestConvex) {
|
|
424
|
+
convexPatchAvailable =
|
|
425
|
+
currentConvex.major === latestConvex.major &&
|
|
426
|
+
currentConvex.minor === latestConvex.minor &&
|
|
427
|
+
currentConvex.patch < latestConvex.patch;
|
|
428
|
+
}
|
|
409
429
|
const needsUpdate = isDevMode
|
|
410
|
-
?
|
|
430
|
+
? true // Dev mode: always refresh to pick up source changes (npm install will also update convex if needed)
|
|
411
431
|
: currentSdkVersion !== targetSdkVersion ||
|
|
412
|
-
currentSdkVersion === "not installed"
|
|
432
|
+
currentSdkVersion === "not installed" ||
|
|
433
|
+
convexPatchAvailable;
|
|
413
434
|
// Check template sync status if --sync-template is enabled
|
|
414
435
|
let templateFilesToUpdate = 0;
|
|
415
436
|
let templateFilesToAdd = 0;
|
|
@@ -459,6 +480,16 @@ export function registerDeployCommands(program, _config) {
|
|
|
459
480
|
console.log(` SDK requires convex: ${pc.dim(sdkConvexPeerDep)}`);
|
|
460
481
|
}
|
|
461
482
|
console.log();
|
|
483
|
+
// Helper to format version with update arrow
|
|
484
|
+
const formatVersion = (current, latest, label) => {
|
|
485
|
+
if (current === "not installed") {
|
|
486
|
+
return ` ${label}: ${pc.dim("not installed")}`;
|
|
487
|
+
}
|
|
488
|
+
if (current === latest) {
|
|
489
|
+
return ` ${label}: ${pc.green(current)}`;
|
|
490
|
+
}
|
|
491
|
+
return ` ${label}: ${pc.yellow(current)} ${pc.cyan("→")} ${pc.green(latest)}`;
|
|
492
|
+
};
|
|
462
493
|
// Show deployment status
|
|
463
494
|
if (deploymentInfos.length > 0) {
|
|
464
495
|
printSection("Deployments", {});
|
|
@@ -469,15 +500,15 @@ export function registerDeployCommands(program, _config) {
|
|
|
469
500
|
const statusIcon = info.needsUpdate ? pc.yellow("●") : pc.green("●");
|
|
470
501
|
console.log(` ${statusIcon} ${pc.bold(info.name)}${defaultBadge}`);
|
|
471
502
|
console.log(pc.dim(` Path: ${info.projectPath}`));
|
|
472
|
-
console.log(
|
|
503
|
+
console.log(formatVersion(info.currentSdkVersion, latestSdkVersion, "SDK"));
|
|
473
504
|
// Only show provider and AI if they're installed (frontend packages)
|
|
474
505
|
if (info.currentProviderVersion !== "not installed") {
|
|
475
|
-
console.log(
|
|
506
|
+
console.log(formatVersion(info.currentProviderVersion, latestProviderVersion, "Provider"));
|
|
476
507
|
}
|
|
477
508
|
if (info.currentAiVersion !== "not installed") {
|
|
478
|
-
console.log(
|
|
509
|
+
console.log(formatVersion(info.currentAiVersion, latestAiVersion, "Vercel AI"));
|
|
479
510
|
}
|
|
480
|
-
console.log(
|
|
511
|
+
console.log(formatVersion(info.currentConvexVersion, latestConvexVersion, "Convex"));
|
|
481
512
|
console.log();
|
|
482
513
|
}
|
|
483
514
|
}
|
|
@@ -485,16 +516,29 @@ export function registerDeployCommands(program, _config) {
|
|
|
485
516
|
if (appInfos.length > 0) {
|
|
486
517
|
printSection("Apps", {});
|
|
487
518
|
console.log();
|
|
519
|
+
// Helper to format app version with update arrow (handles dev-linked case)
|
|
520
|
+
const formatAppVersion = (current, latest, label, isDevLinked) => {
|
|
521
|
+
if (isDevLinked) {
|
|
522
|
+
return ` ${label}: ${pc.magenta("file:... (dev linked)")}`;
|
|
523
|
+
}
|
|
524
|
+
if (current === "not installed") {
|
|
525
|
+
return ` ${label}: ${pc.dim("not installed")}`;
|
|
526
|
+
}
|
|
527
|
+
if (current === latest) {
|
|
528
|
+
return ` ${label}: ${pc.green(current)}`;
|
|
529
|
+
}
|
|
530
|
+
return ` ${label}: ${pc.yellow(current)} ${pc.cyan("→")} ${pc.green(latest)}`;
|
|
531
|
+
};
|
|
488
532
|
for (const info of appInfos) {
|
|
489
533
|
const devBadge = info.isDevLinked ? pc.magenta(" [DEV]") : "";
|
|
490
534
|
const needsAnyUpdate = info.needsUpdate || info.needsTemplateSync;
|
|
491
535
|
const statusIcon = needsAnyUpdate ? pc.yellow("●") : pc.green("●");
|
|
492
536
|
console.log(` ${statusIcon} ${pc.bold(info.name)}${devBadge}`);
|
|
493
537
|
console.log(pc.dim(` Path: ${info.appPath}`));
|
|
494
|
-
console.log(
|
|
495
|
-
console.log(
|
|
496
|
-
console.log(
|
|
497
|
-
console.log(
|
|
538
|
+
console.log(formatAppVersion(info.currentSdkVersion, latestSdkVersion, "SDK", info.isDevLinked));
|
|
539
|
+
console.log(formatAppVersion(info.currentProviderVersion, latestProviderVersion, "Provider", info.isDevLinked));
|
|
540
|
+
console.log(formatAppVersion(info.currentAiVersion, latestAiVersion, "Vercel AI", false));
|
|
541
|
+
console.log(formatAppVersion(info.currentConvexVersion, latestConvexVersion, "Convex", false));
|
|
498
542
|
// Show template sync status if --sync-template is enabled
|
|
499
543
|
if (options.syncTemplate) {
|
|
500
544
|
const totalTemplateChanges = info.templateFilesToUpdate + info.templateFilesToAdd;
|
|
@@ -668,14 +712,22 @@ async function updateDeployment(name, deployment, options) {
|
|
|
668
712
|
Deployment: name,
|
|
669
713
|
"Project Path": projectPath,
|
|
670
714
|
});
|
|
715
|
+
// Helper to format version with update arrow
|
|
716
|
+
const formatVersionLine = (current, latest) => {
|
|
717
|
+
if (current === "not installed") {
|
|
718
|
+
return pc.dim("not installed");
|
|
719
|
+
}
|
|
720
|
+
if (current === latest) {
|
|
721
|
+
return pc.green(current);
|
|
722
|
+
}
|
|
723
|
+
return `${pc.yellow(current)} ${pc.cyan("→")} ${pc.green(latest)}`;
|
|
724
|
+
};
|
|
671
725
|
console.log();
|
|
672
726
|
console.log(pc.bold(" @cortexmemory/sdk"));
|
|
673
|
-
console.log(`
|
|
674
|
-
console.log(` Latest: ${latestSdkVersion}`);
|
|
727
|
+
console.log(` ${formatVersionLine(currentSdkVersion, latestSdkVersion)}`);
|
|
675
728
|
console.log();
|
|
676
729
|
console.log(pc.bold(" convex"));
|
|
677
|
-
console.log(`
|
|
678
|
-
console.log(` Latest: ${latestConvexVersion}`);
|
|
730
|
+
console.log(` ${formatVersionLine(currentConvexVersion, latestConvexVersion)}`);
|
|
679
731
|
if (sdkConvexPeerDep !== "unknown") {
|
|
680
732
|
console.log(` SDK requires: ${pc.dim(sdkConvexPeerDep)}`);
|
|
681
733
|
}
|
|
@@ -909,40 +961,62 @@ async function updateApp(name, app, options) {
|
|
|
909
961
|
console.log(pc.magenta(" ═══ DEV MODE ═══"));
|
|
910
962
|
console.log(pc.dim(` Will link to: ${options.devPath}`));
|
|
911
963
|
}
|
|
912
|
-
//
|
|
913
|
-
const
|
|
964
|
+
// Helper to format version with update arrow for app updates
|
|
965
|
+
const formatAppVersionLine = (current, latest, devLinked = false) => {
|
|
966
|
+
if (devLinked) {
|
|
967
|
+
return pc.magenta("file:... (dev linked)");
|
|
968
|
+
}
|
|
969
|
+
if (current === "not installed") {
|
|
970
|
+
return pc.dim("not installed");
|
|
971
|
+
}
|
|
972
|
+
if (current === latest) {
|
|
973
|
+
return pc.green(current);
|
|
974
|
+
}
|
|
975
|
+
return `${pc.yellow(current)} ${pc.cyan("→")} ${pc.green(latest)}`;
|
|
976
|
+
};
|
|
914
977
|
console.log();
|
|
915
978
|
console.log(pc.bold(" @cortexmemory/sdk"));
|
|
916
|
-
|
|
917
|
-
console.log(` Current: ${pc.magenta("file:... (dev linked)")}`);
|
|
918
|
-
}
|
|
919
|
-
else {
|
|
920
|
-
console.log(` Current: ${currentSdkVersion === latestSdkVersion ? pc.green(currentSdkVersion) : pc.yellow(currentSdkVersion)}`);
|
|
921
|
-
}
|
|
922
|
-
console.log(` ${cortexVersionLabel}: ${latestSdkVersion}`);
|
|
979
|
+
console.log(` ${formatAppVersionLine(currentSdkVersion, latestSdkVersion, isDevLinked)}`);
|
|
923
980
|
console.log();
|
|
924
981
|
console.log(pc.bold(" @cortexmemory/vercel-ai-provider"));
|
|
925
|
-
|
|
926
|
-
console.log(` Current: ${pc.magenta("file:... (dev linked)")}`);
|
|
927
|
-
}
|
|
928
|
-
else {
|
|
929
|
-
console.log(` Current: ${currentProviderVersion === latestProviderVersion ? pc.green(currentProviderVersion) : pc.yellow(currentProviderVersion)}`);
|
|
930
|
-
}
|
|
931
|
-
console.log(` ${cortexVersionLabel}: ${latestProviderVersion}`);
|
|
982
|
+
console.log(` ${formatAppVersionLine(currentProviderVersion, latestProviderVersion, isDevLinked)}`);
|
|
932
983
|
console.log();
|
|
933
984
|
console.log(pc.bold(" convex"));
|
|
934
|
-
console.log(`
|
|
935
|
-
console.log(` Latest: ${latestConvexVersion}`);
|
|
985
|
+
console.log(` ${formatAppVersionLine(currentConvexVersion, latestConvexVersion)}`);
|
|
936
986
|
console.log();
|
|
937
987
|
console.log(pc.bold(" ai (Vercel AI SDK)"));
|
|
938
|
-
console.log(`
|
|
939
|
-
console.log(` Latest: ${latestAiVersion}`);
|
|
988
|
+
console.log(` ${formatAppVersionLine(currentAiVersion, latestAiVersion)}`);
|
|
940
989
|
console.log();
|
|
990
|
+
// Check for Convex patch update (same logic as deployments)
|
|
991
|
+
const parseVersion = (v) => {
|
|
992
|
+
const match = v.match(/^(\d+)\.(\d+)\.(\d+)/);
|
|
993
|
+
if (!match)
|
|
994
|
+
return null;
|
|
995
|
+
return {
|
|
996
|
+
major: parseInt(match[1]),
|
|
997
|
+
minor: parseInt(match[2]),
|
|
998
|
+
patch: parseInt(match[3]),
|
|
999
|
+
};
|
|
1000
|
+
};
|
|
1001
|
+
const currentConvex = parseVersion(currentConvexVersion);
|
|
1002
|
+
const latestConvex = parseVersion(latestConvexVersion);
|
|
1003
|
+
let convexPatchAvailable = false;
|
|
1004
|
+
if (currentConvex && latestConvex) {
|
|
1005
|
+
// Patch update = same major.minor, higher patch
|
|
1006
|
+
convexPatchAvailable =
|
|
1007
|
+
currentConvex.major === latestConvex.major &&
|
|
1008
|
+
currentConvex.minor === latestConvex.minor &&
|
|
1009
|
+
currentConvex.patch < latestConvex.patch;
|
|
1010
|
+
}
|
|
1011
|
+
const targetConvexVersion = options.convexVersion ??
|
|
1012
|
+
(convexPatchAvailable ? latestConvexVersion : null);
|
|
1013
|
+
const convexNeedsUpdate = targetConvexVersion && currentConvexVersion !== targetConvexVersion;
|
|
941
1014
|
// Determine update strategy
|
|
942
1015
|
if (isDevMode) {
|
|
943
|
-
// Dev mode:
|
|
1016
|
+
// Dev mode: always refresh file: links to pick up SDK source changes
|
|
1017
|
+
console.log(pc.magenta(" Dev mode: forcing SDK/provider refresh"));
|
|
944
1018
|
if (isDevLinked) {
|
|
945
|
-
|
|
1019
|
+
printInfo("Refreshing dev-linked packages...");
|
|
946
1020
|
}
|
|
947
1021
|
else {
|
|
948
1022
|
printInfo("Switching to dev mode with local SDK...");
|
|
@@ -954,8 +1028,17 @@ async function updateApp(name, app, options) {
|
|
|
954
1028
|
pkg.dependencies["@cortexmemory/sdk"] = `file:${devSdkPath}`;
|
|
955
1029
|
pkg.dependencies["@cortexmemory/vercel-ai-provider"] =
|
|
956
1030
|
`file:${devProviderPath}`;
|
|
1031
|
+
// Also update convex if a patch is available
|
|
1032
|
+
if (convexNeedsUpdate && targetConvexVersion) {
|
|
1033
|
+
pkg.dependencies["convex"] = `^${targetConvexVersion}`;
|
|
1034
|
+
}
|
|
957
1035
|
await fs.writeJson(packageJsonPath, pkg, { spaces: 2 });
|
|
958
|
-
|
|
1036
|
+
if (convexNeedsUpdate && targetConvexVersion) {
|
|
1037
|
+
console.log(pc.cyan(` Updated package.json: SDK/provider (file:) + convex@^${targetConvexVersion}`));
|
|
1038
|
+
}
|
|
1039
|
+
else {
|
|
1040
|
+
console.log(pc.cyan(" Updated package.json with file: references"));
|
|
1041
|
+
}
|
|
959
1042
|
// Run npm install
|
|
960
1043
|
console.log();
|
|
961
1044
|
printInfo("Running npm install...");
|
|
@@ -966,6 +1049,18 @@ async function updateApp(name, app, options) {
|
|
|
966
1049
|
printSuccess("Dev mode linking complete!");
|
|
967
1050
|
console.log(pc.dim(` SDK linked to: ${devSdkPath}`));
|
|
968
1051
|
console.log(pc.dim(` Provider linked to: ${devProviderPath}`));
|
|
1052
|
+
if (convexNeedsUpdate && targetConvexVersion) {
|
|
1053
|
+
console.log(pc.dim(` Convex updated to: ${targetConvexVersion}`));
|
|
1054
|
+
}
|
|
1055
|
+
// In dev mode, also sync convex schema files from the local SDK
|
|
1056
|
+
console.log();
|
|
1057
|
+
printInfo("Syncing Convex schema from local SDK...");
|
|
1058
|
+
const { syncConvexSchema, printSyncResult } = await import("../utils/schema-sync.js");
|
|
1059
|
+
const syncResult = await syncConvexSchema(appPath);
|
|
1060
|
+
printSyncResult(syncResult);
|
|
1061
|
+
if (syncResult.error) {
|
|
1062
|
+
printWarning("Schema sync failed, but packages were updated");
|
|
1063
|
+
}
|
|
969
1064
|
}
|
|
970
1065
|
else {
|
|
971
1066
|
printError("npm install failed");
|
|
@@ -988,8 +1083,8 @@ async function updateApp(name, app, options) {
|
|
|
988
1083
|
// Determine what needs updating
|
|
989
1084
|
const sdkNeedsUpdate = currentSdkVersion !== targetSdkVersion || isDevLinked;
|
|
990
1085
|
const providerNeedsUpdate = currentProviderVersion !== targetProviderVersion || isDevLinked;
|
|
991
|
-
// Nothing to update
|
|
992
|
-
if (!sdkNeedsUpdate && !providerNeedsUpdate) {
|
|
1086
|
+
// Nothing to update (including convex)
|
|
1087
|
+
if (!sdkNeedsUpdate && !providerNeedsUpdate && !convexNeedsUpdate) {
|
|
993
1088
|
printSuccess("All packages are up to date!");
|
|
994
1089
|
return;
|
|
995
1090
|
}
|
|
@@ -1001,6 +1096,9 @@ async function updateApp(name, app, options) {
|
|
|
1001
1096
|
if (providerNeedsUpdate) {
|
|
1002
1097
|
packagesToInstall.push(`@cortexmemory/vercel-ai-provider@${targetProviderVersion}`);
|
|
1003
1098
|
}
|
|
1099
|
+
if (convexNeedsUpdate && targetConvexVersion) {
|
|
1100
|
+
packagesToInstall.push(`convex@${targetConvexVersion}`);
|
|
1101
|
+
}
|
|
1004
1102
|
if (packagesToInstall.length > 0) {
|
|
1005
1103
|
console.log();
|
|
1006
1104
|
printInfo(`Installing: ${packagesToInstall.join(", ")}...`);
|
|
@@ -1022,8 +1120,15 @@ async function updateApp(name, app, options) {
|
|
|
1022
1120
|
console.log();
|
|
1023
1121
|
printSection("Template Sync", {});
|
|
1024
1122
|
console.log();
|
|
1123
|
+
// In dev mode, force sync all template files regardless of hash match
|
|
1124
|
+
if (isDevMode) {
|
|
1125
|
+
console.log(pc.magenta(" Dev mode: forcing template sync"));
|
|
1126
|
+
}
|
|
1025
1127
|
try {
|
|
1026
|
-
const templateResult = await syncAppTemplate(app, {
|
|
1128
|
+
const templateResult = await syncAppTemplate(app, {
|
|
1129
|
+
dryRun: false,
|
|
1130
|
+
force: isDevMode, // Force sync in dev mode to pick up local template changes
|
|
1131
|
+
});
|
|
1027
1132
|
if (templateResult.error) {
|
|
1028
1133
|
printWarning(`Template sync skipped: ${templateResult.error}`);
|
|
1029
1134
|
}
|