@cortexmemory/cli 0.27.3 → 0.28.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 +18 -6
- package/dist/commands/db.js.map +1 -1
- package/dist/commands/deploy.d.ts.map +1 -1
- package/dist/commands/deploy.js +191 -80
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/dev.js +3 -2
- package/dist/commands/dev.js.map +1 -1
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +12 -0
- package/dist/commands/init.js.map +1 -1
- package/dist/types.d.ts +1 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/app-template-sync.d.ts.map +1 -1
- package/dist/utils/app-template-sync.js +35 -13
- package/dist/utils/app-template-sync.js.map +1 -1
- package/dist/utils/init/quickstart-setup.d.ts.map +1 -1
- package/dist/utils/init/quickstart-setup.js.map +1 -1
- package/package.json +4 -4
- package/templates/basic/.env.local.example +23 -0
- package/templates/basic/README.md +181 -56
- package/templates/basic/package-lock.json +2180 -406
- package/templates/basic/package.json +23 -5
- package/templates/basic/src/__tests__/chat.test.ts +340 -0
- package/templates/basic/src/__tests__/cortex.test.ts +260 -0
- package/templates/basic/src/__tests__/display.test.ts +455 -0
- package/templates/basic/src/__tests__/e2e/fact-extraction.test.ts +498 -0
- package/templates/basic/src/__tests__/e2e/memory-flow.test.ts +355 -0
- package/templates/basic/src/__tests__/e2e/server-e2e.test.ts +414 -0
- package/templates/basic/src/__tests__/helpers/test-utils.ts +345 -0
- package/templates/basic/src/__tests__/integration/chat-flow.test.ts +422 -0
- package/templates/basic/src/__tests__/integration/server.test.ts +441 -0
- package/templates/basic/src/__tests__/llm.test.ts +344 -0
- package/templates/basic/src/chat.ts +300 -0
- package/templates/basic/src/cortex.ts +203 -0
- package/templates/basic/src/display.ts +425 -0
- package/templates/basic/src/index.ts +194 -64
- package/templates/basic/src/llm.ts +214 -0
- package/templates/basic/src/server.ts +280 -0
- package/templates/basic/vitest.config.ts +33 -0
- package/templates/basic/vitest.e2e.config.ts +28 -0
- package/templates/basic/vitest.integration.config.ts +25 -0
- package/templates/vercel-ai-quickstart/app/api/auth/check/route.ts +1 -1
- package/templates/vercel-ai-quickstart/app/api/auth/login/route.ts +61 -19
- package/templates/vercel-ai-quickstart/app/api/auth/register/route.ts +14 -18
- package/templates/vercel-ai-quickstart/app/api/auth/setup/route.ts +4 -7
- package/templates/vercel-ai-quickstart/app/api/chat/route.ts +95 -23
- package/templates/vercel-ai-quickstart/app/api/chat-v6/route.ts +339 -0
- package/templates/vercel-ai-quickstart/app/api/conversations/route.ts +16 -16
- package/templates/vercel-ai-quickstart/app/globals.css +24 -9
- package/templates/vercel-ai-quickstart/app/page.tsx +41 -15
- package/templates/vercel-ai-quickstart/components/AdminSetup.tsx +3 -1
- package/templates/vercel-ai-quickstart/components/AuthProvider.tsx +6 -6
- package/templates/vercel-ai-quickstart/components/ChatHistorySidebar.tsx +19 -8
- package/templates/vercel-ai-quickstart/components/ChatInterface.tsx +46 -16
- package/templates/vercel-ai-quickstart/components/LoginScreen.tsx +10 -5
- package/templates/vercel-ai-quickstart/jest.config.js +8 -1
- package/templates/vercel-ai-quickstart/lib/agents/memory-agent.ts +165 -0
- package/templates/vercel-ai-quickstart/lib/password.ts +5 -5
- package/templates/vercel-ai-quickstart/lib/versions.ts +60 -0
- package/templates/vercel-ai-quickstart/next.config.js +10 -2
- package/templates/vercel-ai-quickstart/package.json +23 -12
- package/templates/vercel-ai-quickstart/test-api.mjs +303 -0
- package/templates/vercel-ai-quickstart/tests/e2e/chat-memory-flow.test.ts +483 -0
- package/templates/vercel-ai-quickstart/tests/helpers/mock-cortex.ts +40 -40
- package/templates/vercel-ai-quickstart/tests/integration/auth.test.ts +8 -8
- package/templates/vercel-ai-quickstart/tests/integration/conversations.test.ts +12 -8
- package/templates/vercel-ai-quickstart/tests/unit/password.test.ts +4 -1
|
@@ -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;AAoBrB;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI,
|
|
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;AAoBrB;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI,CAgyB7E"}
|
package/dist/commands/db.js
CHANGED
|
@@ -58,6 +58,7 @@ export function registerDbCommands(program, _config) {
|
|
|
58
58
|
agents: 0,
|
|
59
59
|
contexts: 0,
|
|
60
60
|
conversations: 0,
|
|
61
|
+
factHistory: 0,
|
|
61
62
|
facts: 0,
|
|
62
63
|
governanceEnforcement: 0,
|
|
63
64
|
governancePolicies: 0,
|
|
@@ -66,6 +67,7 @@ export function registerDbCommands(program, _config) {
|
|
|
66
67
|
memories: 0,
|
|
67
68
|
memorySpaces: 0,
|
|
68
69
|
mutable: 0,
|
|
70
|
+
sessions: 0,
|
|
69
71
|
};
|
|
70
72
|
}
|
|
71
73
|
// Get user count from SDK (users may be managed separately)
|
|
@@ -218,16 +220,18 @@ export function registerDbCommands(program, _config) {
|
|
|
218
220
|
agents: 0,
|
|
219
221
|
contexts: 0,
|
|
220
222
|
conversations: 0,
|
|
221
|
-
|
|
223
|
+
factHistory: 0,
|
|
222
224
|
facts: 0,
|
|
225
|
+
governanceEnforcement: 0,
|
|
226
|
+
governancePolicies: 0,
|
|
227
|
+
graphSyncQueue: 0,
|
|
228
|
+
immutable: 0,
|
|
223
229
|
memories: 0,
|
|
224
230
|
memorySpaces: 0,
|
|
225
|
-
|
|
231
|
+
messages: 0,
|
|
226
232
|
mutable: 0,
|
|
233
|
+
sessions: 0,
|
|
227
234
|
users: 0,
|
|
228
|
-
governancePolicies: 0,
|
|
229
|
-
governanceEnforcement: 0,
|
|
230
|
-
graphSyncQueue: 0,
|
|
231
235
|
};
|
|
232
236
|
// Get raw Convex client for direct table access via admin functions
|
|
233
237
|
const rawClient = client.getClient();
|
|
@@ -275,7 +279,13 @@ export function registerDbCommands(program, _config) {
|
|
|
275
279
|
await clearTableDirect("governanceEnforcement", "governanceEnforcement");
|
|
276
280
|
// 12. Clear graph sync queue
|
|
277
281
|
await clearTableDirect("graphSyncQueue", "graphSyncQueue");
|
|
278
|
-
// 13. Clear
|
|
282
|
+
// 13. Clear sessions
|
|
283
|
+
spinner.text = `Clearing sessions...`;
|
|
284
|
+
await clearTableDirect("sessions", "sessions");
|
|
285
|
+
// 14. Clear fact history (belief revision audit trail)
|
|
286
|
+
spinner.text = `Clearing factHistory...`;
|
|
287
|
+
await clearTableDirect("factHistory", "factHistory");
|
|
288
|
+
// 15. Clear graph database if graph sync is enabled
|
|
279
289
|
// Check both explicit flag and auto-detection (same logic as Cortex.create())
|
|
280
290
|
const neo4jUri = process.env.NEO4J_URI;
|
|
281
291
|
const memgraphUri = process.env.MEMGRAPH_URI;
|
|
@@ -355,6 +365,8 @@ export function registerDbCommands(program, _config) {
|
|
|
355
365
|
"Governance Policies": deleted.governancePolicies,
|
|
356
366
|
"Governance Logs": deleted.governanceEnforcement,
|
|
357
367
|
"Graph Sync Queue": deleted.graphSyncQueue >= 0 ? deleted.graphSyncQueue : 0,
|
|
368
|
+
Sessions: deleted.sessions,
|
|
369
|
+
"Fact History": deleted.factHistory,
|
|
358
370
|
};
|
|
359
371
|
printSection("Core Entities", coreEntities);
|
|
360
372
|
printSection("Memory Data", memoryData);
|
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,CAmtBN"}
|
package/dist/commands/deploy.js
CHANGED
|
@@ -217,13 +217,16 @@ export function registerDeployCommands(program, _config) {
|
|
|
217
217
|
if (updateApps && !hasApps && !options.deploymentsOnly) {
|
|
218
218
|
console.log(pc.yellow("\n No enabled apps found"));
|
|
219
219
|
}
|
|
220
|
-
if ((!updateDeployments || !hasDeployments) &&
|
|
220
|
+
if ((!updateDeployments || !hasDeployments) &&
|
|
221
|
+
(!updateApps || !hasApps)) {
|
|
221
222
|
console.log(pc.red("\n Nothing to update"));
|
|
222
223
|
console.log(pc.dim(" Run 'cortex init' to configure deployments and apps\n"));
|
|
223
224
|
return;
|
|
224
225
|
}
|
|
225
226
|
// Single deployment + no apps - proceed directly (backwards compatibility)
|
|
226
|
-
if (updateDeployments &&
|
|
227
|
+
if (updateDeployments &&
|
|
228
|
+
enabledDeployments.length === 1 &&
|
|
229
|
+
(!updateApps || !hasApps)) {
|
|
227
230
|
const { name, deployment } = enabledDeployments[0];
|
|
228
231
|
console.log(pc.dim(` Using: ${name}`));
|
|
229
232
|
await updateDeployment(name, deployment, options);
|
|
@@ -232,42 +235,76 @@ export function registerDeployCommands(program, _config) {
|
|
|
232
235
|
// Multiple targets or apps - show status dashboard
|
|
233
236
|
console.log();
|
|
234
237
|
const spinner = ora("Checking package versions...").start();
|
|
235
|
-
// Get latest versions
|
|
238
|
+
// Get latest versions - from local source in dev mode, from npm otherwise
|
|
236
239
|
let latestSdkVersion = "unknown";
|
|
237
240
|
let latestConvexVersion = "unknown";
|
|
238
241
|
let latestProviderVersion = "unknown";
|
|
239
242
|
let latestAiVersion = "unknown";
|
|
240
243
|
let sdkConvexPeerDep = "unknown";
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
execCommand("npm", ["view", "@cortexmemory/sdk", "version"], {
|
|
244
|
-
quiet: true,
|
|
245
|
-
}).catch(() => ({ stdout: "unknown" })),
|
|
246
|
-
execCommand("npm", ["view", "convex", "version"], {
|
|
247
|
-
quiet: true,
|
|
248
|
-
}).catch(() => ({ stdout: "unknown" })),
|
|
249
|
-
execCommand("npm", ["view", "@cortexmemory/vercel-ai-provider", "version"], {
|
|
250
|
-
quiet: true,
|
|
251
|
-
}).catch(() => ({ stdout: "unknown" })),
|
|
252
|
-
execCommand("npm", ["view", "ai", "version"], {
|
|
253
|
-
quiet: true,
|
|
254
|
-
}).catch(() => ({ stdout: "unknown" })),
|
|
255
|
-
execCommand("npm", ["view", "@cortexmemory/sdk", "peerDependencies", "--json"], { quiet: true }).catch(() => ({ stdout: "{}" })),
|
|
256
|
-
]);
|
|
257
|
-
latestSdkVersion = sdkResult.stdout.trim() || "unknown";
|
|
258
|
-
latestConvexVersion = convexResult.stdout.trim() || "unknown";
|
|
259
|
-
latestProviderVersion = providerResult.stdout.trim() || "unknown";
|
|
260
|
-
latestAiVersion = aiResult.stdout.trim() || "unknown";
|
|
244
|
+
if (isDevMode && devPath) {
|
|
245
|
+
// In dev mode, read versions from local source package.json files
|
|
261
246
|
try {
|
|
262
|
-
const
|
|
263
|
-
|
|
247
|
+
const sdkPkgPath = path.join(devPath, "package.json");
|
|
248
|
+
const providerPkgPath = path.join(devPath, "packages", "vercel-ai-provider", "package.json");
|
|
249
|
+
if (await fs.pathExists(sdkPkgPath)) {
|
|
250
|
+
const sdkPkg = await fs.readJson(sdkPkgPath);
|
|
251
|
+
latestSdkVersion = sdkPkg.version || "unknown";
|
|
252
|
+
// Also get peerDependencies from local source
|
|
253
|
+
sdkConvexPeerDep = sdkPkg.peerDependencies?.convex ?? "unknown";
|
|
254
|
+
}
|
|
255
|
+
if (await fs.pathExists(providerPkgPath)) {
|
|
256
|
+
const providerPkg = await fs.readJson(providerPkgPath);
|
|
257
|
+
latestProviderVersion = providerPkg.version || "unknown";
|
|
258
|
+
}
|
|
259
|
+
// Still fetch convex and ai versions from npm (external dependencies)
|
|
260
|
+
const [convexResult, aiResult] = await Promise.all([
|
|
261
|
+
execCommand("npm", ["view", "convex", "version"], {
|
|
262
|
+
quiet: true,
|
|
263
|
+
}).catch(() => ({ stdout: "unknown" })),
|
|
264
|
+
execCommand("npm", ["view", "ai", "version"], {
|
|
265
|
+
quiet: true,
|
|
266
|
+
}).catch(() => ({ stdout: "unknown" })),
|
|
267
|
+
]);
|
|
268
|
+
latestConvexVersion = convexResult.stdout.trim() || "unknown";
|
|
269
|
+
latestAiVersion = aiResult.stdout.trim() || "unknown";
|
|
264
270
|
}
|
|
265
271
|
catch {
|
|
266
|
-
// Ignore
|
|
272
|
+
// Ignore errors, versions will remain "unknown"
|
|
267
273
|
}
|
|
268
274
|
}
|
|
269
|
-
|
|
270
|
-
//
|
|
275
|
+
else {
|
|
276
|
+
// Normal mode: fetch all versions from npm
|
|
277
|
+
try {
|
|
278
|
+
const [sdkResult, convexResult, providerResult, aiResult, peerDepResult,] = await Promise.all([
|
|
279
|
+
execCommand("npm", ["view", "@cortexmemory/sdk", "version"], {
|
|
280
|
+
quiet: true,
|
|
281
|
+
}).catch(() => ({ stdout: "unknown" })),
|
|
282
|
+
execCommand("npm", ["view", "convex", "version"], {
|
|
283
|
+
quiet: true,
|
|
284
|
+
}).catch(() => ({ stdout: "unknown" })),
|
|
285
|
+
execCommand("npm", ["view", "@cortexmemory/vercel-ai-provider", "version"], {
|
|
286
|
+
quiet: true,
|
|
287
|
+
}).catch(() => ({ stdout: "unknown" })),
|
|
288
|
+
execCommand("npm", ["view", "ai", "version"], {
|
|
289
|
+
quiet: true,
|
|
290
|
+
}).catch(() => ({ stdout: "unknown" })),
|
|
291
|
+
execCommand("npm", ["view", "@cortexmemory/sdk", "peerDependencies", "--json"], { quiet: true }).catch(() => ({ stdout: "{}" })),
|
|
292
|
+
]);
|
|
293
|
+
latestSdkVersion = sdkResult.stdout.trim() || "unknown";
|
|
294
|
+
latestConvexVersion = convexResult.stdout.trim() || "unknown";
|
|
295
|
+
latestProviderVersion = providerResult.stdout.trim() || "unknown";
|
|
296
|
+
latestAiVersion = aiResult.stdout.trim() || "unknown";
|
|
297
|
+
try {
|
|
298
|
+
const peerDeps = JSON.parse(peerDepResult.stdout);
|
|
299
|
+
sdkConvexPeerDep = peerDeps?.convex ?? "unknown";
|
|
300
|
+
}
|
|
301
|
+
catch {
|
|
302
|
+
// Ignore parse errors
|
|
303
|
+
}
|
|
304
|
+
}
|
|
305
|
+
catch {
|
|
306
|
+
// Ignore errors
|
|
307
|
+
}
|
|
271
308
|
}
|
|
272
309
|
const deploymentInfos = [];
|
|
273
310
|
const appInfos = [];
|
|
@@ -275,23 +312,28 @@ export function registerDeployCommands(program, _config) {
|
|
|
275
312
|
if (updateDeployments && hasDeployments) {
|
|
276
313
|
for (const { name, deployment, projectPath } of enabledDeployments) {
|
|
277
314
|
let currentSdkVersion = "not installed";
|
|
315
|
+
let currentProviderVersion = "not installed";
|
|
316
|
+
let currentAiVersion = "not installed";
|
|
278
317
|
let currentConvexVersion = "not installed";
|
|
318
|
+
// Check all packages in one npm list call for efficiency
|
|
279
319
|
try {
|
|
280
|
-
const result = await execCommand("npm", [
|
|
320
|
+
const result = await execCommand("npm", [
|
|
321
|
+
"list",
|
|
322
|
+
"@cortexmemory/sdk",
|
|
323
|
+
"@cortexmemory/vercel-ai-provider",
|
|
324
|
+
"convex",
|
|
325
|
+
"ai",
|
|
326
|
+
"--json",
|
|
327
|
+
], { quiet: true, cwd: projectPath });
|
|
281
328
|
const data = JSON.parse(result.stdout);
|
|
282
329
|
currentSdkVersion =
|
|
283
330
|
data.dependencies?.["@cortexmemory/sdk"]?.version ??
|
|
284
331
|
"not installed";
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
const result = await execCommand("npm", ["list", "convex", "--json"], {
|
|
291
|
-
quiet: true,
|
|
292
|
-
cwd: projectPath,
|
|
293
|
-
});
|
|
294
|
-
const data = JSON.parse(result.stdout);
|
|
332
|
+
currentProviderVersion =
|
|
333
|
+
data.dependencies?.["@cortexmemory/vercel-ai-provider"]
|
|
334
|
+
?.version ?? "not installed";
|
|
335
|
+
currentAiVersion =
|
|
336
|
+
data.dependencies?.ai?.version ?? "not installed";
|
|
295
337
|
currentConvexVersion =
|
|
296
338
|
data.dependencies?.convex?.version ?? "not installed";
|
|
297
339
|
}
|
|
@@ -306,6 +348,8 @@ export function registerDeployCommands(program, _config) {
|
|
|
306
348
|
deployment,
|
|
307
349
|
projectPath,
|
|
308
350
|
currentSdkVersion,
|
|
351
|
+
currentProviderVersion,
|
|
352
|
+
currentAiVersion,
|
|
309
353
|
currentConvexVersion,
|
|
310
354
|
needsUpdate,
|
|
311
355
|
});
|
|
@@ -327,7 +371,8 @@ export function registerDeployCommands(program, _config) {
|
|
|
327
371
|
const pkg = await fs.readJson(packageJsonPath);
|
|
328
372
|
const sdkDep = pkg.dependencies?.["@cortexmemory/sdk"];
|
|
329
373
|
const providerDep = pkg.dependencies?.["@cortexmemory/vercel-ai-provider"];
|
|
330
|
-
isDevLinked =
|
|
374
|
+
isDevLinked =
|
|
375
|
+
sdkDep?.startsWith("file:") || providerDep?.startsWith("file:");
|
|
331
376
|
}
|
|
332
377
|
}
|
|
333
378
|
catch {
|
|
@@ -335,12 +380,21 @@ export function registerDeployCommands(program, _config) {
|
|
|
335
380
|
}
|
|
336
381
|
// Get installed versions
|
|
337
382
|
try {
|
|
338
|
-
const result = await execCommand("npm", [
|
|
383
|
+
const result = await execCommand("npm", [
|
|
384
|
+
"list",
|
|
385
|
+
"@cortexmemory/sdk",
|
|
386
|
+
"@cortexmemory/vercel-ai-provider",
|
|
387
|
+
"convex",
|
|
388
|
+
"ai",
|
|
389
|
+
"--json",
|
|
390
|
+
], { quiet: true, cwd: appPath });
|
|
339
391
|
const data = JSON.parse(result.stdout);
|
|
340
392
|
currentSdkVersion =
|
|
341
|
-
data.dependencies?.["@cortexmemory/sdk"]?.version ??
|
|
393
|
+
data.dependencies?.["@cortexmemory/sdk"]?.version ??
|
|
394
|
+
"not installed";
|
|
342
395
|
currentProviderVersion =
|
|
343
|
-
data.dependencies?.["@cortexmemory/vercel-ai-provider"]
|
|
396
|
+
data.dependencies?.["@cortexmemory/vercel-ai-provider"]
|
|
397
|
+
?.version ?? "not installed";
|
|
344
398
|
currentConvexVersion =
|
|
345
399
|
data.dependencies?.convex?.version ?? "not installed";
|
|
346
400
|
currentAiVersion =
|
|
@@ -349,10 +403,13 @@ export function registerDeployCommands(program, _config) {
|
|
|
349
403
|
catch {
|
|
350
404
|
// Ignore errors
|
|
351
405
|
}
|
|
352
|
-
const targetSdkVersion = isDevMode
|
|
406
|
+
const targetSdkVersion = isDevMode
|
|
407
|
+
? "dev"
|
|
408
|
+
: (options.sdkVersion ?? latestSdkVersion);
|
|
353
409
|
const needsUpdate = isDevMode
|
|
354
410
|
? !isDevLinked // Dev mode: needs update if not already dev-linked
|
|
355
|
-
:
|
|
411
|
+
: currentSdkVersion !== targetSdkVersion ||
|
|
412
|
+
currentSdkVersion === "not installed";
|
|
356
413
|
// Check template sync status if --sync-template is enabled
|
|
357
414
|
let templateFilesToUpdate = 0;
|
|
358
415
|
let templateFilesToAdd = 0;
|
|
@@ -391,7 +448,9 @@ export function registerDeployCommands(program, _config) {
|
|
|
391
448
|
console.log(pc.dim(` SDK path: ${devPath}`));
|
|
392
449
|
console.log();
|
|
393
450
|
}
|
|
394
|
-
|
|
451
|
+
// Use "Source versions" in dev mode to indicate local package.json versions
|
|
452
|
+
const versionsLabel = isDevMode ? "Source versions" : "Latest versions";
|
|
453
|
+
console.log(pc.bold(` ${versionsLabel}:`));
|
|
395
454
|
console.log(` @cortexmemory/sdk: ${pc.cyan(latestSdkVersion)}`);
|
|
396
455
|
console.log(` @cortexmemory/vercel-ai-provider: ${pc.cyan(latestProviderVersion)}`);
|
|
397
456
|
console.log(` convex: ${pc.cyan(latestConvexVersion)}`);
|
|
@@ -407,12 +466,17 @@ export function registerDeployCommands(program, _config) {
|
|
|
407
466
|
for (const info of deploymentInfos) {
|
|
408
467
|
const isDefault = info.name === currentConfig.default;
|
|
409
468
|
const defaultBadge = isDefault ? pc.cyan(" (default)") : "";
|
|
410
|
-
const statusIcon = info.needsUpdate
|
|
411
|
-
? pc.yellow("●")
|
|
412
|
-
: pc.green("●");
|
|
469
|
+
const statusIcon = info.needsUpdate ? pc.yellow("●") : pc.green("●");
|
|
413
470
|
console.log(` ${statusIcon} ${pc.bold(info.name)}${defaultBadge}`);
|
|
414
471
|
console.log(pc.dim(` Path: ${info.projectPath}`));
|
|
415
472
|
console.log(` SDK: ${info.currentSdkVersion === latestSdkVersion ? pc.green(info.currentSdkVersion) : pc.yellow(info.currentSdkVersion)}`);
|
|
473
|
+
// Only show provider and AI if they're installed (frontend packages)
|
|
474
|
+
if (info.currentProviderVersion !== "not installed") {
|
|
475
|
+
console.log(` Provider: ${info.currentProviderVersion === latestProviderVersion ? pc.green(info.currentProviderVersion) : pc.yellow(info.currentProviderVersion)}`);
|
|
476
|
+
}
|
|
477
|
+
if (info.currentAiVersion !== "not installed") {
|
|
478
|
+
console.log(` AI: ${info.currentAiVersion === latestAiVersion ? pc.green(info.currentAiVersion) : pc.yellow(info.currentAiVersion)}`);
|
|
479
|
+
}
|
|
416
480
|
console.log(` Convex: ${info.currentConvexVersion === latestConvexVersion ? pc.green(info.currentConvexVersion) : pc.yellow(info.currentConvexVersion)}`);
|
|
417
481
|
console.log();
|
|
418
482
|
}
|
|
@@ -424,13 +488,11 @@ export function registerDeployCommands(program, _config) {
|
|
|
424
488
|
for (const info of appInfos) {
|
|
425
489
|
const devBadge = info.isDevLinked ? pc.magenta(" [DEV]") : "";
|
|
426
490
|
const needsAnyUpdate = info.needsUpdate || info.needsTemplateSync;
|
|
427
|
-
const statusIcon = needsAnyUpdate
|
|
428
|
-
? pc.yellow("●")
|
|
429
|
-
: pc.green("●");
|
|
491
|
+
const statusIcon = needsAnyUpdate ? pc.yellow("●") : pc.green("●");
|
|
430
492
|
console.log(` ${statusIcon} ${pc.bold(info.name)}${devBadge}`);
|
|
431
493
|
console.log(pc.dim(` Path: ${info.appPath}`));
|
|
432
|
-
console.log(` SDK: ${info.isDevLinked ? pc.magenta("file:...") :
|
|
433
|
-
console.log(` Provider: ${info.isDevLinked ? pc.magenta("file:...") :
|
|
494
|
+
console.log(` SDK: ${info.isDevLinked ? pc.magenta("file:...") : info.currentSdkVersion === latestSdkVersion ? pc.green(info.currentSdkVersion) : pc.yellow(info.currentSdkVersion)}`);
|
|
495
|
+
console.log(` Provider: ${info.isDevLinked ? pc.magenta("file:...") : info.currentProviderVersion === latestProviderVersion ? pc.green(info.currentProviderVersion) : pc.yellow(info.currentProviderVersion)}`);
|
|
434
496
|
console.log(` AI: ${info.currentAiVersion === latestAiVersion ? pc.green(info.currentAiVersion) : pc.yellow(info.currentAiVersion)}`);
|
|
435
497
|
console.log(` Convex: ${info.currentConvexVersion === latestConvexVersion ? pc.green(info.currentConvexVersion) : pc.yellow(info.currentConvexVersion)}`);
|
|
436
498
|
// Show template sync status if --sync-template is enabled
|
|
@@ -730,7 +792,7 @@ async function updateDeployment(name, deployment, options) {
|
|
|
730
792
|
async function updateApp(name, app, options) {
|
|
731
793
|
const appPath = path.join(app.projectPath, app.path);
|
|
732
794
|
const isDevMode = !!options.devPath;
|
|
733
|
-
if (!await fs.pathExists(appPath)) {
|
|
795
|
+
if (!(await fs.pathExists(appPath))) {
|
|
734
796
|
printError(`App path not found: ${appPath}`);
|
|
735
797
|
throw new Error(`App path not found: ${appPath}`);
|
|
736
798
|
}
|
|
@@ -738,7 +800,7 @@ async function updateApp(name, app, options) {
|
|
|
738
800
|
try {
|
|
739
801
|
// Read package.json
|
|
740
802
|
const packageJsonPath = path.join(appPath, "package.json");
|
|
741
|
-
if (!await fs.pathExists(packageJsonPath)) {
|
|
803
|
+
if (!(await fs.pathExists(packageJsonPath))) {
|
|
742
804
|
spinner.stop();
|
|
743
805
|
printError(`No package.json found at ${appPath}`);
|
|
744
806
|
throw new Error(`No package.json found at ${appPath}`);
|
|
@@ -753,42 +815,86 @@ async function updateApp(name, app, options) {
|
|
|
753
815
|
// Check if already dev-linked
|
|
754
816
|
const sdkDep = pkg.dependencies?.["@cortexmemory/sdk"];
|
|
755
817
|
const providerDep = pkg.dependencies?.["@cortexmemory/vercel-ai-provider"];
|
|
756
|
-
isDevLinked =
|
|
818
|
+
isDevLinked =
|
|
819
|
+
sdkDep?.startsWith("file:") || providerDep?.startsWith("file:");
|
|
757
820
|
// Get installed versions
|
|
758
821
|
try {
|
|
759
|
-
const result = await execCommand("npm", [
|
|
822
|
+
const result = await execCommand("npm", [
|
|
823
|
+
"list",
|
|
824
|
+
"@cortexmemory/sdk",
|
|
825
|
+
"@cortexmemory/vercel-ai-provider",
|
|
826
|
+
"convex",
|
|
827
|
+
"ai",
|
|
828
|
+
"--json",
|
|
829
|
+
], { quiet: true, cwd: appPath });
|
|
760
830
|
const data = JSON.parse(result.stdout);
|
|
761
831
|
currentSdkVersion =
|
|
762
832
|
data.dependencies?.["@cortexmemory/sdk"]?.version ?? "not installed";
|
|
763
833
|
currentProviderVersion =
|
|
764
|
-
data.dependencies?.["@cortexmemory/vercel-ai-provider"]?.version ??
|
|
834
|
+
data.dependencies?.["@cortexmemory/vercel-ai-provider"]?.version ??
|
|
835
|
+
"not installed";
|
|
765
836
|
currentConvexVersion =
|
|
766
837
|
data.dependencies?.convex?.version ?? "not installed";
|
|
767
|
-
currentAiVersion =
|
|
768
|
-
data.dependencies?.ai?.version ?? "not installed";
|
|
838
|
+
currentAiVersion = data.dependencies?.ai?.version ?? "not installed";
|
|
769
839
|
}
|
|
770
840
|
catch {
|
|
771
841
|
// Ignore errors
|
|
772
842
|
}
|
|
773
|
-
// Get latest versions from npm
|
|
843
|
+
// Get latest versions - from local source in dev mode, from npm otherwise
|
|
774
844
|
let latestSdkVersion = "unknown";
|
|
775
845
|
let latestProviderVersion = "unknown";
|
|
776
846
|
let latestConvexVersion = "unknown";
|
|
777
847
|
let latestAiVersion = "unknown";
|
|
778
|
-
|
|
779
|
-
|
|
780
|
-
|
|
781
|
-
|
|
782
|
-
|
|
783
|
-
|
|
784
|
-
|
|
785
|
-
|
|
786
|
-
|
|
787
|
-
|
|
788
|
-
|
|
848
|
+
if (isDevMode && options.devPath) {
|
|
849
|
+
// In dev mode, read versions from local source package.json files
|
|
850
|
+
try {
|
|
851
|
+
const sdkPkgPath = path.join(options.devPath, "package.json");
|
|
852
|
+
const providerPkgPath = path.join(options.devPath, "packages", "vercel-ai-provider", "package.json");
|
|
853
|
+
if (await fs.pathExists(sdkPkgPath)) {
|
|
854
|
+
const sdkPkg = await fs.readJson(sdkPkgPath);
|
|
855
|
+
latestSdkVersion = sdkPkg.version || "unknown";
|
|
856
|
+
}
|
|
857
|
+
if (await fs.pathExists(providerPkgPath)) {
|
|
858
|
+
const providerPkg = await fs.readJson(providerPkgPath);
|
|
859
|
+
latestProviderVersion = providerPkg.version || "unknown";
|
|
860
|
+
}
|
|
861
|
+
// Still fetch convex and ai versions from npm (external dependencies)
|
|
862
|
+
const [convexResult, aiResult] = await Promise.all([
|
|
863
|
+
execCommand("npm", ["view", "convex", "version"], {
|
|
864
|
+
quiet: true,
|
|
865
|
+
}).catch(() => ({ stdout: "unknown" })),
|
|
866
|
+
execCommand("npm", ["view", "ai", "version"], { quiet: true }).catch(() => ({ stdout: "unknown" })),
|
|
867
|
+
]);
|
|
868
|
+
latestConvexVersion = convexResult.stdout.trim() || "unknown";
|
|
869
|
+
latestAiVersion = aiResult.stdout.trim() || "unknown";
|
|
870
|
+
}
|
|
871
|
+
catch {
|
|
872
|
+
// Ignore errors, versions will remain "unknown"
|
|
873
|
+
}
|
|
789
874
|
}
|
|
790
|
-
|
|
791
|
-
//
|
|
875
|
+
else {
|
|
876
|
+
// Normal mode: fetch all versions from npm
|
|
877
|
+
try {
|
|
878
|
+
const [sdkResult, providerResult, convexResult, aiResult] = await Promise.all([
|
|
879
|
+
execCommand("npm", ["view", "@cortexmemory/sdk", "version"], {
|
|
880
|
+
quiet: true,
|
|
881
|
+
}).catch(() => ({ stdout: "unknown" })),
|
|
882
|
+
execCommand("npm", ["view", "@cortexmemory/vercel-ai-provider", "version"], { quiet: true }).catch(() => ({ stdout: "unknown" })),
|
|
883
|
+
execCommand("npm", ["view", "convex", "version"], {
|
|
884
|
+
quiet: true,
|
|
885
|
+
}).catch(() => ({ stdout: "unknown" })),
|
|
886
|
+
execCommand("npm", ["view", "ai", "version"], {
|
|
887
|
+
quiet: true,
|
|
888
|
+
}).catch(() => ({ stdout: "unknown" })),
|
|
889
|
+
]);
|
|
890
|
+
latestSdkVersion = sdkResult.stdout.trim() || "unknown";
|
|
891
|
+
latestProviderVersion = providerResult.stdout.trim() || "unknown";
|
|
892
|
+
latestConvexVersion = convexResult.stdout.trim() || "unknown";
|
|
893
|
+
latestAiVersion = aiResult.stdout.trim() || "unknown";
|
|
894
|
+
}
|
|
895
|
+
catch {
|
|
896
|
+
// Ignore errors
|
|
897
|
+
}
|
|
792
898
|
}
|
|
793
899
|
spinner.stop();
|
|
794
900
|
// Display current status
|
|
@@ -803,6 +909,8 @@ async function updateApp(name, app, options) {
|
|
|
803
909
|
console.log(pc.magenta(" ═══ DEV MODE ═══"));
|
|
804
910
|
console.log(pc.dim(` Will link to: ${options.devPath}`));
|
|
805
911
|
}
|
|
912
|
+
// Use "Source" label in dev mode to indicate local package.json version
|
|
913
|
+
const cortexVersionLabel = isDevMode ? "Source" : "Latest";
|
|
806
914
|
console.log();
|
|
807
915
|
console.log(pc.bold(" @cortexmemory/sdk"));
|
|
808
916
|
if (isDevLinked) {
|
|
@@ -811,7 +919,7 @@ async function updateApp(name, app, options) {
|
|
|
811
919
|
else {
|
|
812
920
|
console.log(` Current: ${currentSdkVersion === latestSdkVersion ? pc.green(currentSdkVersion) : pc.yellow(currentSdkVersion)}`);
|
|
813
921
|
}
|
|
814
|
-
console.log(`
|
|
922
|
+
console.log(` ${cortexVersionLabel}: ${latestSdkVersion}`);
|
|
815
923
|
console.log();
|
|
816
924
|
console.log(pc.bold(" @cortexmemory/vercel-ai-provider"));
|
|
817
925
|
if (isDevLinked) {
|
|
@@ -820,7 +928,7 @@ async function updateApp(name, app, options) {
|
|
|
820
928
|
else {
|
|
821
929
|
console.log(` Current: ${currentProviderVersion === latestProviderVersion ? pc.green(currentProviderVersion) : pc.yellow(currentProviderVersion)}`);
|
|
822
930
|
}
|
|
823
|
-
console.log(`
|
|
931
|
+
console.log(` ${cortexVersionLabel}: ${latestProviderVersion}`);
|
|
824
932
|
console.log();
|
|
825
933
|
console.log(pc.bold(" convex"));
|
|
826
934
|
console.log(` Current: ${currentConvexVersion === latestConvexVersion ? pc.green(currentConvexVersion) : pc.yellow(currentConvexVersion)}`);
|
|
@@ -844,7 +952,8 @@ async function updateApp(name, app, options) {
|
|
|
844
952
|
const devProviderPath = path.join(devSdkPath, "packages", "vercel-ai-provider");
|
|
845
953
|
pkg.dependencies = pkg.dependencies || {};
|
|
846
954
|
pkg.dependencies["@cortexmemory/sdk"] = `file:${devSdkPath}`;
|
|
847
|
-
pkg.dependencies["@cortexmemory/vercel-ai-provider"] =
|
|
955
|
+
pkg.dependencies["@cortexmemory/vercel-ai-provider"] =
|
|
956
|
+
`file:${devProviderPath}`;
|
|
848
957
|
await fs.writeJson(packageJsonPath, pkg, { spaces: 2 });
|
|
849
958
|
console.log(pc.cyan(" Updated package.json with file: references"));
|
|
850
959
|
// Run npm install
|
|
@@ -871,7 +980,8 @@ async function updateApp(name, app, options) {
|
|
|
871
980
|
if (isDevLinked) {
|
|
872
981
|
printInfo("Removing dev links and switching to npm packages...");
|
|
873
982
|
pkg.dependencies["@cortexmemory/sdk"] = `^${targetSdkVersion}`;
|
|
874
|
-
pkg.dependencies["@cortexmemory/vercel-ai-provider"] =
|
|
983
|
+
pkg.dependencies["@cortexmemory/vercel-ai-provider"] =
|
|
984
|
+
`^${targetProviderVersion}`;
|
|
875
985
|
await fs.writeJson(packageJsonPath, pkg, { spaces: 2 });
|
|
876
986
|
console.log(pc.cyan(" Updated package.json with npm versions"));
|
|
877
987
|
}
|
|
@@ -921,7 +1031,8 @@ async function updateApp(name, app, options) {
|
|
|
921
1031
|
printTemplateSyncResult(templateResult);
|
|
922
1032
|
// Run npm install if package.json was updated with new dependencies
|
|
923
1033
|
if (templateResult.packageJsonUpdated) {
|
|
924
|
-
const totalNewDeps = templateResult.depsAdded.length +
|
|
1034
|
+
const totalNewDeps = templateResult.depsAdded.length +
|
|
1035
|
+
templateResult.devDepsAdded.length;
|
|
925
1036
|
if (totalNewDeps > 0) {
|
|
926
1037
|
console.log();
|
|
927
1038
|
printInfo(`Installing ${totalNewDeps} new dependencies...`);
|