rivet-design 0.14.3 → 0.14.4
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/cli/commands/mcpServe.d.ts.map +1 -1
- package/dist/cli/commands/mcpServe.js +8 -1
- package/dist/cli/commands/mcpServe.js.map +1 -1
- package/dist/cli/commands/open.d.ts.map +1 -1
- package/dist/cli/commands/open.js +100 -3
- package/dist/cli/commands/open.js.map +1 -1
- package/dist/cli/commands/status.d.ts.map +1 -1
- package/dist/cli/commands/status.js +14 -3
- package/dist/cli/commands/status.js.map +1 -1
- package/dist/cli/serverHandshake.d.ts +6 -0
- package/dist/cli/serverHandshake.d.ts.map +1 -1
- package/dist/cli/serverHandshake.js.map +1 -1
- package/dist/cli/serverVersion.d.ts +33 -0
- package/dist/cli/serverVersion.d.ts.map +1 -0
- package/dist/cli/serverVersion.js +63 -0
- package/dist/cli/serverVersion.js.map +1 -0
- package/dist/routes/agentVariants.d.ts.map +1 -1
- package/dist/routes/agentVariants.js +185 -36
- package/dist/routes/agentVariants.js.map +1 -1
- package/dist/routes/cli.d.ts.map +1 -1
- package/dist/routes/cli.js +2 -0
- package/dist/routes/cli.js.map +1 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +3 -0
- package/dist/server.js.map +1 -1
- package/dist/services/TelemetryService.js +1 -1
- package/dist/services/TelemetryService.js.map +1 -1
- package/package.json +1 -1
- package/src/ui/dist/assets/{main-DiPNi-Yg.js → main-FEurCoW8.js} +72 -72
- package/src/ui/dist/index.html +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpServe.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/mcpServe.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EACjB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAcnC;;;;;;;;;;;;GAYG;AAEH,KAAK,eAAe,GAAG;IACrB,yEAAyE;IACzE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iFAAiF;IACjF,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAiBF,iFAAiF;AACjF,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,KAAG,OASlD,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,UAAU,WAAW,KAAG,OAgB1D,CAAC;AAwBF;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAU,UAAS,eAAoB;;;EAkdjE,CAAC;AAgBF;;;GAGG;AACH,eAAO,MAAM,cAAc,GACzB,MAAM,MAAM,EAAE,EACd,IAAI,KAAK,KACR,OAAO,CAAC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"mcpServe.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/mcpServe.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EACjB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAcnC;;;;;;;;;;;;GAYG;AAEH,KAAK,eAAe,GAAG;IACrB,yEAAyE;IACzE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iFAAiF;IACjF,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAiBF,iFAAiF;AACjF,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,KAAG,OASlD,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,UAAU,WAAW,KAAG,OAgB1D,CAAC;AAwBF;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAU,UAAS,eAAoB;;;EAkdjE,CAAC;AAgBF;;;GAGG;AACH,eAAO,MAAM,cAAc,GACzB,MAAM,MAAM,EAAE,EACd,IAAI,KAAK,KACR,OAAO,CAAC,gBAAgB,CAoF1B,CAAC"}
|
|
@@ -490,8 +490,15 @@ const handleMcpServe = async (rest, io) => {
|
|
|
490
490
|
return (0, envelope_1.errorResult)('mcp', 'USAGE_ERROR', flags.errors.join('; '));
|
|
491
491
|
}
|
|
492
492
|
guardStdout();
|
|
493
|
-
const { redirectLogsToStderr } = await Promise.resolve().then(() => __importStar(require('../../utils/logger')));
|
|
493
|
+
const { redirectLogsToStderr, setLogLevel } = await Promise.resolve().then(() => __importStar(require('../../utils/logger')));
|
|
494
494
|
redirectLogsToStderr();
|
|
495
|
+
// MCP hosts render everything a stdio server writes to stderr as [error]
|
|
496
|
+
// (Cursor's MCP log viewer literally paints it red), so a healthy boot
|
|
497
|
+
// must be silent: only warnings and errors earn a line. LOG_LEVEL in the
|
|
498
|
+
// server entry's env still opts back into the chattier levels.
|
|
499
|
+
if (!process.env.LOG_LEVEL) {
|
|
500
|
+
setLogLevel('WARN');
|
|
501
|
+
}
|
|
495
502
|
// MCP hosts (Cursor, Claude Desktop) spawn this server with the desktop
|
|
496
503
|
// session's minimal PATH. Enrich from the login shell up front so every
|
|
497
504
|
// child this process spawns — the project `__serve` daemon, vendor agent
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpServe.js","sourceRoot":"","sources":["../../../src/cli/commands/mcpServe.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mcpServe.js","sourceRoot":"","sources":["../../../src/cli/commands/mcpServe.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/open.ts"],"names":[],"mappings":"AAGA,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"open.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/open.ts"],"names":[],"mappings":"AAGA,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAgFnC,KAAK,iBAAiB,GAAG;IACvB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,CAAC,IAAI,EAAE;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;CACxB,KAAK,iBAAiB,CAAC;AA2QxB,MAAM,MAAM,uBAAuB,GAAG;IACpC,yEAAyE;IACzE,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,6DAA6D;IAC7D,eAAe,CAAC,EAAE,MAAM,OAAO,CAAC;IAChC,8CAA8C;IAC9C,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAChD,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB,CAAC;AAyBF;;;;GAIG;AACH,eAAO,MAAM,UAAU,GACrB,MAAM,MAAM,EAAE,EACd,IAAI,KAAK,EACT,eAAc,uBAA4B,KACzC,OAAO,CAAC,gBAAgB,CAgJ1B,CAAC"}
|
|
@@ -44,6 +44,7 @@ const envelope_1 = require("../envelope");
|
|
|
44
44
|
const flags_1 = require("../flags");
|
|
45
45
|
const client_1 = require("../client");
|
|
46
46
|
const serverHandshake_1 = require("../serverHandshake");
|
|
47
|
+
const serverVersion_1 = require("../serverVersion");
|
|
47
48
|
const handoff_1 = require("../handoff");
|
|
48
49
|
const runnerSelection_1 = require("../runnerSelection");
|
|
49
50
|
const shared_1 = require("./shared");
|
|
@@ -182,8 +183,94 @@ const openedData = async (attached, wasAlreadyRunning) => {
|
|
|
182
183
|
applyMode: attached.handshake.applyMode,
|
|
183
184
|
resolvedRunner: session?.resolvedRunner ?? null,
|
|
184
185
|
initiator: session?.initiator ?? null,
|
|
186
|
+
...(0, serverVersion_1.versionEnvelopeFields)(attached.handshake),
|
|
185
187
|
};
|
|
186
188
|
};
|
|
189
|
+
const channelDepthCount = (depth) => (depth?.queued ?? 0) + (depth?.leased ?? 0);
|
|
190
|
+
/**
|
|
191
|
+
* Anything live means the restart would destroy user-visible state —
|
|
192
|
+
* variants in flight OR completed-but-uncommitted (the snapshot stays
|
|
193
|
+
* active until the session ends), a provisioning start, queued or leased
|
|
194
|
+
* apply/variant batches. Deliberately NOT `session.isActive`: every
|
|
195
|
+
* opened server registers its editor session at boot, so that flag is
|
|
196
|
+
* true for a completely idle project and would make upgrades
|
|
197
|
+
* unreachable. An idle editor tab survives the swap — it reconnects to
|
|
198
|
+
* the fresh server.
|
|
199
|
+
*/
|
|
200
|
+
const hasActiveWork = (status) => status.variants?.active === true ||
|
|
201
|
+
status.variants?.starting === true ||
|
|
202
|
+
channelDepthCount(status.queue?.apply) > 0 ||
|
|
203
|
+
channelDepthCount(status.queue?.variant) > 0 ||
|
|
204
|
+
(Array.isArray(status.queue?.queued) && status.queue.queued.length > 0) ||
|
|
205
|
+
(Array.isArray(status.queue?.leases) && status.queue.leases.length > 0);
|
|
206
|
+
/** How long a replaced server gets to die before we give up on upgrading. */
|
|
207
|
+
const DEFAULT_UPGRADE_SHUTDOWN_TIMEOUT_MS = 10_000;
|
|
208
|
+
const UPGRADE_SHUTDOWN_TIMEOUT_ENV = 'RIVET_UPGRADE_SHUTDOWN_TIMEOUT_MS';
|
|
209
|
+
/**
|
|
210
|
+
* Replace a stale server with this CLI's version — but only when provably
|
|
211
|
+
* safe. Long-lived `__serve` daemons keep the code they booted with, so
|
|
212
|
+
* after a package upgrade a project can quietly run days-old behavior.
|
|
213
|
+
* On any doubt BEFORE shutdown is requested (active work, host-managed
|
|
214
|
+
* lifecycle, unverifiable state, refused/failed shutdown) the old server
|
|
215
|
+
* is left running and the mismatch is only reported.
|
|
216
|
+
*/
|
|
217
|
+
const replaceStaleServer = async (attached, io, shutdownTimeoutMs) => {
|
|
218
|
+
const info = (0, serverVersion_1.serverVersionInfo)(attached.handshake);
|
|
219
|
+
if (!info.staleServer) {
|
|
220
|
+
return 'attach';
|
|
221
|
+
}
|
|
222
|
+
let status;
|
|
223
|
+
try {
|
|
224
|
+
const response = await (0, client_1.requestServer)(attached, '/api/cli/status');
|
|
225
|
+
if (response.status !== 200) {
|
|
226
|
+
throw new Error(`status ${response.status}`);
|
|
227
|
+
}
|
|
228
|
+
status = response.body;
|
|
229
|
+
}
|
|
230
|
+
catch {
|
|
231
|
+
io.writeProgress(`${(0, serverVersion_1.staleWarningLine)(info)} Could not verify it is idle — leaving it running.`);
|
|
232
|
+
return 'attach';
|
|
233
|
+
}
|
|
234
|
+
if (hasActiveWork(status)) {
|
|
235
|
+
io.writeProgress(`${(0, serverVersion_1.staleWarningLine)(info)} It has active work, so it was left running — finish or commit, then \`rivet stop\` and reopen to upgrade.`);
|
|
236
|
+
return 'attach';
|
|
237
|
+
}
|
|
238
|
+
try {
|
|
239
|
+
const response = await (0, client_1.requestServer)(attached, '/api/cli/shutdown', {
|
|
240
|
+
method: 'POST',
|
|
241
|
+
body: {},
|
|
242
|
+
});
|
|
243
|
+
if (response.status === 409) {
|
|
244
|
+
io.writeProgress(`${(0, serverVersion_1.staleWarningLine)(info)} It is host-managed — restart it from the agent that opened it to upgrade.`);
|
|
245
|
+
return 'attach';
|
|
246
|
+
}
|
|
247
|
+
if (response.status !== 200) {
|
|
248
|
+
io.writeProgress(`${(0, serverVersion_1.staleWarningLine)(info)} Shutdown was refused (${response.status}) — leaving it running.`);
|
|
249
|
+
return 'attach';
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
catch {
|
|
253
|
+
io.writeProgress(`${(0, serverVersion_1.staleWarningLine)(info)} Shutdown request failed — leaving it running.`);
|
|
254
|
+
return 'attach';
|
|
255
|
+
}
|
|
256
|
+
const deadline = Date.now() + shutdownTimeoutMs;
|
|
257
|
+
while (Date.now() < deadline) {
|
|
258
|
+
if (!(0, serverHandshake_1.isPidAlive)(attached.handshake.pid) ||
|
|
259
|
+
!(await (0, client_1.isServerHealthy)(attached.handshake.rivetPort))) {
|
|
260
|
+
// A resident process (mcp serve) may hold a cached attach to the
|
|
261
|
+
// server that just died; the fresh spawn must not resolve to it.
|
|
262
|
+
(0, client_1.invalidateAttachCache)();
|
|
263
|
+
io.writeProgress(`Upgrading project server: rivet ${info.serverVersion ? `v${info.serverVersion}` : '(unversioned)'} → v${info.cliVersion}…`);
|
|
264
|
+
return 'spawn';
|
|
265
|
+
}
|
|
266
|
+
await sleep(SERVER_START_POLL_INTERVAL_MS);
|
|
267
|
+
}
|
|
268
|
+
// Shutdown is accepted and irreversible — the server WILL die; it just
|
|
269
|
+
// has not finished yet. Attaching now would hand the caller a server
|
|
270
|
+
// that disappears moments later.
|
|
271
|
+
io.writeProgress(`${(0, serverVersion_1.staleWarningLine)(info)} Shutdown was accepted but has not completed yet.`);
|
|
272
|
+
return 'shutdown_pending';
|
|
273
|
+
};
|
|
187
274
|
/**
|
|
188
275
|
* Open the editor in a browser unless the caller explicitly disables it.
|
|
189
276
|
*/
|
|
@@ -229,10 +316,20 @@ const handleOpen = async (args, io, dependencies = {}) => {
|
|
|
229
316
|
return (0, envelope_1.errorResult)(COMMAND, 'AUTH_REQUIRED', 'Authentication required. Run `rivet login` first.');
|
|
230
317
|
}
|
|
231
318
|
const existing = await (0, client_1.attachToServer)(projectPath);
|
|
319
|
+
// A stale server (older than this CLI) that is provably idle gets
|
|
320
|
+
// replaced in place; otherwise attach to whatever is running.
|
|
232
321
|
if (existing) {
|
|
233
|
-
const
|
|
234
|
-
|
|
235
|
-
|
|
322
|
+
const outcome = await replaceStaleServer(existing, io, timeoutFromEnv(env, UPGRADE_SHUTDOWN_TIMEOUT_ENV, DEFAULT_UPGRADE_SHUTDOWN_TIMEOUT_MS));
|
|
323
|
+
if (outcome === 'shutdown_pending') {
|
|
324
|
+
return (0, envelope_1.errorResult)(COMMAND, 'SERVER_UNAVAILABLE', 'The stale project server accepted shutdown but has not exited yet — retry `rivet open` in a moment.');
|
|
325
|
+
}
|
|
326
|
+
if (outcome === 'attach') {
|
|
327
|
+
const data = await openedData(existing, true);
|
|
328
|
+
await maybeOpenBrowser(context, data.editorUrl, io, dependencies.openBrowser);
|
|
329
|
+
return (0, envelope_1.okResult)(COMMAND, data);
|
|
330
|
+
}
|
|
331
|
+
// 'spawn': the old server is confirmed down — fall through and start
|
|
332
|
+
// a fresh one through the normal start-lock path.
|
|
236
333
|
}
|
|
237
334
|
const spawnServer = dependencies.spawnServer ?? spawnDetachedServer;
|
|
238
335
|
const lock = (0, serverHandshake_1.acquireStartLock)(projectPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open.js","sourceRoot":"","sources":["../../../src/cli/commands/open.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"open.js","sourceRoot":"","sources":["../../../src/cli/commands/open.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AA8BnC;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GACvB,MAAM,MAAM,EAAE,EACd,IAAI,KAAK,KACR,OAAO,CAAC,gBAAgB,CA4D1B,CAAC"}
|
|
@@ -4,6 +4,7 @@ exports.handleStatus = void 0;
|
|
|
4
4
|
const envelope_1 = require("../envelope");
|
|
5
5
|
const client_1 = require("../client");
|
|
6
6
|
const hostWorkNextAction_1 = require("../hostWorkNextAction");
|
|
7
|
+
const serverVersion_1 = require("../serverVersion");
|
|
7
8
|
const shared_1 = require("./shared");
|
|
8
9
|
const COMMAND = 'status';
|
|
9
10
|
const WATCH_POLL_INTERVAL_MS = 1_000;
|
|
@@ -26,15 +27,25 @@ const handleStatus = async (args, io) => {
|
|
|
26
27
|
if (!(0, shared_1.isAttached)(attached)) {
|
|
27
28
|
return attached;
|
|
28
29
|
}
|
|
30
|
+
// Surface a version mismatch prominently: a long-lived daemon keeps the
|
|
31
|
+
// code it booted with, and "old server, new CLI" reads as mystery bugs
|
|
32
|
+
// (e.g. a runner that never resolves) without this line.
|
|
33
|
+
const versionInfo = (0, serverVersion_1.serverVersionInfo)(attached.handshake);
|
|
34
|
+
if (versionInfo.staleServer) {
|
|
35
|
+
io.writeProgress(`${(0, serverVersion_1.staleWarningLine)(versionInfo)} Run \`rivet open\` to upgrade it (idle servers restart automatically), or \`rivet stop\` and reopen.`);
|
|
36
|
+
}
|
|
29
37
|
const fetchStatus = async () => {
|
|
30
38
|
try {
|
|
31
39
|
const response = await (0, client_1.requestServer)(attached, '/api/cli/status');
|
|
32
40
|
if (response.status !== 200) {
|
|
33
41
|
return (0, shared_1.serverErrorResult)(COMMAND, response.status, response.body);
|
|
34
42
|
}
|
|
35
|
-
return (0, envelope_1.okResult)(COMMAND,
|
|
36
|
-
|
|
37
|
-
|
|
43
|
+
return (0, envelope_1.okResult)(COMMAND, {
|
|
44
|
+
...(0, hostWorkNextAction_1.withHostWorkNextAction)(response.body, {
|
|
45
|
+
callerAgent: context.handoff?.agent,
|
|
46
|
+
}),
|
|
47
|
+
...(0, serverVersion_1.versionEnvelopeFields)(attached.handshake),
|
|
48
|
+
});
|
|
38
49
|
}
|
|
39
50
|
catch (error) {
|
|
40
51
|
return (0, shared_1.transportErrorResult)(COMMAND, error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":";;;AAAA,0CAA8D;AAE9D,sCAA0C;AAC1C,8DAG+B;AAC/B,qCAOkB;AAElB,MAAM,OAAO,GAAG,QAAQ,CAAC;AACzB,MAAM,sBAAsB,GAAG,KAAK,CAAC;AAErC,MAAM,gBAAgB,GAAG;IACvB,KAAK,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE;CAC7B,CAAC;AAEF,MAAM,KAAK,GAAG,CAAC,EAAU,EAAiB,EAAE,CAC1C,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAEpD;;;;;GAKG;AACI,MAAM,YAAY,GAAG,KAAK,EAC/B,IAAc,EACd,EAAS,EACkB,EAAE;IAC7B,MAAM,OAAO,GAAG,IAAA,4BAAmB,EAAC,OAAO,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACrE,IAAI,IAAA,wBAAe,EAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,IAAA,4BAAmB,EAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACzE,IAAI,CAAC,IAAA,mBAAU,EAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,WAAW,GAAG,KAAK,IAA+B,EAAE;QACxD,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAA,sBAAa,EAClC,QAAQ,EACR,iBAAiB,CAClB,CAAC;YACF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBAC5B,OAAO,IAAA,0BAAiB,EAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YACpE,CAAC;YACD,OAAO,IAAA,mBAAQ,
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,12 @@ export type ServerHandshake = {
|
|
|
28
28
|
applyMode: 'embedded' | 'none';
|
|
29
29
|
/** Required on control routes when the server runs an embedded agent runtime. */
|
|
30
30
|
queueAccessToken: string | null;
|
|
31
|
+
/**
|
|
32
|
+
* rivet package version the server booted with. Absent on handshakes from
|
|
33
|
+
* servers that predate version stamping — which is itself the strongest
|
|
34
|
+
* possible staleness signal.
|
|
35
|
+
*/
|
|
36
|
+
rivetVersion?: string;
|
|
31
37
|
};
|
|
32
38
|
export declare const handshakeFilePath: (projectPath: string) => string;
|
|
33
39
|
/** Atomically write the handshake with owner-only permissions. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverHandshake.d.ts","sourceRoot":"","sources":["../../src/cli/serverHandshake.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C;;;;;;;;;;;;GAYG;AAEH,eAAO,MAAM,qBAAqB,IAAI,CAAC;AAEvC,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,OAAO,qBAAqB,CAAC;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,iEAAiE;IACjE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB;;;OAGG;IACH,SAAS,EAAE,UAAU,GAAG,MAAM,CAAC;IAC/B,iFAAiF;IACjF,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"serverHandshake.d.ts","sourceRoot":"","sources":["../../src/cli/serverHandshake.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C;;;;;;;;;;;;GAYG;AAEH,eAAO,MAAM,qBAAqB,IAAI,CAAC;AAEvC,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,OAAO,qBAAqB,CAAC;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,iEAAiE;IACjE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB;;;OAGG;IACH,SAAS,EAAE,UAAU,GAAG,MAAM,CAAC;IAC/B,iFAAiF;IACjF,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAKF,eAAO,MAAM,iBAAiB,GAAI,aAAa,MAAM,KAAG,MACR,CAAC;AAOjD,kEAAkE;AAClE,eAAO,MAAM,cAAc,GAAI,WAAW,eAAe,KAAG,IAY3D,CAAC;AAEF,mEAAmE;AACnE,eAAO,MAAM,aAAa,GAAI,aAAa,MAAM,KAAG,eAAe,GAAG,IAsBrE,CAAC;AAEF,iEAAiE;AACjE,eAAO,MAAM,eAAe,GAAI,aAAa,MAAM,EAAE,KAAK,MAAM,KAAG,IAUlE,CAAC;AAEF,OAAO,EAAE,UAAU,EAAE,CAAC;AAEtB,MAAM,MAAM,SAAS,GAAG;IACtB,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,KAAG,SAAS,GAAG,IAsDlE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverHandshake.js","sourceRoot":"","sources":["../../src/cli/serverHandshake.ts"],"names":[],"mappings":";;;AAAA,2BAUY;AACZ,+BAAqC;AACrC,4CAA+C;AAC/C,sCAA0C;
|
|
1
|
+
{"version":3,"file":"serverHandshake.js","sourceRoot":"","sources":["../../src/cli/serverHandshake.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import type { ServerHandshake } from './serverHandshake';
|
|
2
|
+
/**
|
|
3
|
+
* Version comparison between the invoking CLI and a project's long-lived
|
|
4
|
+
* `__serve` daemon. Daemons keep whatever code was installed when they
|
|
5
|
+
* booted, so after an upgrade a project can silently run days-old behavior
|
|
6
|
+
* (a 17-hour-old daemon is how "resolvedRunner: unavailable" survived the
|
|
7
|
+
* fix that removed it). Every attach surface reports both versions, and
|
|
8
|
+
* `rivet open` replaces a stale idle server outright.
|
|
9
|
+
*/
|
|
10
|
+
export type ServerVersionInfo = {
|
|
11
|
+
cliVersion: string;
|
|
12
|
+
/** Null when the server predates version stamping entirely. */
|
|
13
|
+
serverVersion: string | null;
|
|
14
|
+
/** True when the running server is older than the invoking CLI. */
|
|
15
|
+
staleServer: boolean;
|
|
16
|
+
};
|
|
17
|
+
/**
|
|
18
|
+
* True when `candidate` is a strictly newer release than `baseline`.
|
|
19
|
+
* Numeric segment compare; unparsable segments make the pair incomparable
|
|
20
|
+
* (false), so malformed versions never trigger a restart.
|
|
21
|
+
*/
|
|
22
|
+
export declare const isNewerVersion: (candidate: string, baseline: string) => boolean;
|
|
23
|
+
/**
|
|
24
|
+
* Staleness is strictly one-directional: only a server OLDER than the CLI
|
|
25
|
+
* counts. A CLI older than the server (stale npx cache, old checkout) must
|
|
26
|
+
* never look like grounds to restart onto older code — the mismatch is
|
|
27
|
+
* still visible through the reported version pair.
|
|
28
|
+
*/
|
|
29
|
+
export declare const serverVersionInfo: (handshake: Pick<ServerHandshake, "rivetVersion">) => ServerVersionInfo;
|
|
30
|
+
/** Envelope fields advertised on every attach-backed command result. */
|
|
31
|
+
export declare const versionEnvelopeFields: (handshake: Pick<ServerHandshake, "rivetVersion">) => Record<string, unknown>;
|
|
32
|
+
export declare const staleWarningLine: (info: ServerVersionInfo) => string;
|
|
33
|
+
//# sourceMappingURL=serverVersion.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serverVersion.d.ts","sourceRoot":"","sources":["../../src/cli/serverVersion.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD;;;;;;;GAOG;AAEH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,+DAA+D;IAC/D,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,mEAAmE;IACnE,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAQF;;;;GAIG;AACH,eAAO,MAAM,cAAc,GACzB,WAAW,MAAM,EACjB,UAAU,MAAM,KACf,OAeF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAC5B,WAAW,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,KAC/C,iBAQF,CAAC;AAEF,wEAAwE;AACxE,eAAO,MAAM,qBAAqB,GAChC,WAAW,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,KAC/C,MAAM,CAAC,MAAM,EAAE,OAAO,CAaxB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,MAAM,iBAAiB,KAAG,MAGpB,CAAC"}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.staleWarningLine = exports.versionEnvelopeFields = exports.serverVersionInfo = exports.isNewerVersion = void 0;
|
|
4
|
+
const telemetry_1 = require("../config/telemetry");
|
|
5
|
+
const numericSegments = (version) => version
|
|
6
|
+
.split('-')[0]
|
|
7
|
+
.split('.')
|
|
8
|
+
.map((segment) => Number.parseInt(segment, 10));
|
|
9
|
+
/**
|
|
10
|
+
* True when `candidate` is a strictly newer release than `baseline`.
|
|
11
|
+
* Numeric segment compare; unparsable segments make the pair incomparable
|
|
12
|
+
* (false), so malformed versions never trigger a restart.
|
|
13
|
+
*/
|
|
14
|
+
const isNewerVersion = (candidate, baseline) => {
|
|
15
|
+
const a = numericSegments(candidate);
|
|
16
|
+
const b = numericSegments(baseline);
|
|
17
|
+
const length = Math.max(a.length, b.length);
|
|
18
|
+
for (let i = 0; i < length; i++) {
|
|
19
|
+
const left = a[i] ?? 0;
|
|
20
|
+
const right = b[i] ?? 0;
|
|
21
|
+
if (Number.isNaN(left) || Number.isNaN(right)) {
|
|
22
|
+
return false;
|
|
23
|
+
}
|
|
24
|
+
if (left !== right) {
|
|
25
|
+
return left > right;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
return false;
|
|
29
|
+
};
|
|
30
|
+
exports.isNewerVersion = isNewerVersion;
|
|
31
|
+
/**
|
|
32
|
+
* Staleness is strictly one-directional: only a server OLDER than the CLI
|
|
33
|
+
* counts. A CLI older than the server (stale npx cache, old checkout) must
|
|
34
|
+
* never look like grounds to restart onto older code — the mismatch is
|
|
35
|
+
* still visible through the reported version pair.
|
|
36
|
+
*/
|
|
37
|
+
const serverVersionInfo = (handshake) => {
|
|
38
|
+
const serverVersion = handshake.rivetVersion ?? null;
|
|
39
|
+
return {
|
|
40
|
+
cliVersion: telemetry_1.RIVET_VERSION,
|
|
41
|
+
serverVersion,
|
|
42
|
+
staleServer: serverVersion === null || (0, exports.isNewerVersion)(telemetry_1.RIVET_VERSION, serverVersion),
|
|
43
|
+
};
|
|
44
|
+
};
|
|
45
|
+
exports.serverVersionInfo = serverVersionInfo;
|
|
46
|
+
/** Envelope fields advertised on every attach-backed command result. */
|
|
47
|
+
const versionEnvelopeFields = (handshake) => {
|
|
48
|
+
const info = (0, exports.serverVersionInfo)(handshake);
|
|
49
|
+
return {
|
|
50
|
+
serverVersion: info.serverVersion,
|
|
51
|
+
cliVersion: info.cliVersion,
|
|
52
|
+
...(info.staleServer
|
|
53
|
+
? {
|
|
54
|
+
staleServer: true,
|
|
55
|
+
upgradeHint: 'The project server is running an older rivet than this CLI. Finish or commit active work, then `rivet stop` and reopen to upgrade.',
|
|
56
|
+
}
|
|
57
|
+
: {}),
|
|
58
|
+
};
|
|
59
|
+
};
|
|
60
|
+
exports.versionEnvelopeFields = versionEnvelopeFields;
|
|
61
|
+
const staleWarningLine = (info) => `Project server is running rivet ${info.serverVersion ? `v${info.serverVersion}` : 'an unversioned build'} (this CLI is v${info.cliVersion}).`;
|
|
62
|
+
exports.staleWarningLine = staleWarningLine;
|
|
63
|
+
//# sourceMappingURL=serverVersion.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serverVersion.js","sourceRoot":"","sources":["../../src/cli/serverVersion.ts"],"names":[],"mappings":";;;AAAA,mDAAoD;AAoBpD,MAAM,eAAe,GAAG,CAAC,OAAe,EAAY,EAAE,CACpD,OAAO;KACJ,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KACb,KAAK,CAAC,GAAG,CAAC;KACV,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAEpD;;;;GAIG;AACI,MAAM,cAAc,GAAG,CAC5B,SAAiB,EACjB,QAAgB,EACP,EAAE;IACX,MAAM,CAAC,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;IAC5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACvB,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACxB,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9C,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YACnB,OAAO,IAAI,GAAG,KAAK,CAAC;QACtB,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAlBW,QAAA,cAAc,kBAkBzB;AAEF;;;;;GAKG;AACI,MAAM,iBAAiB,GAAG,CAC/B,SAAgD,EAC7B,EAAE;IACrB,MAAM,aAAa,GAAG,SAAS,CAAC,YAAY,IAAI,IAAI,CAAC;IACrD,OAAO;QACL,UAAU,EAAE,yBAAa;QACzB,aAAa;QACb,WAAW,EACT,aAAa,KAAK,IAAI,IAAI,IAAA,sBAAc,EAAC,yBAAa,EAAE,aAAa,CAAC;KACzE,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,iBAAiB,qBAU5B;AAEF,wEAAwE;AACjE,MAAM,qBAAqB,GAAG,CACnC,SAAgD,EACvB,EAAE;IAC3B,MAAM,IAAI,GAAG,IAAA,yBAAiB,EAAC,SAAS,CAAC,CAAC;IAC1C,OAAO;QACL,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,GAAG,CAAC,IAAI,CAAC,WAAW;YAClB,CAAC,CAAC;gBACE,WAAW,EAAE,IAAI;gBACjB,WAAW,EACT,oIAAoI;aACvI;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,qBAAqB,yBAehC;AAEK,MAAM,gBAAgB,GAAG,CAAC,IAAuB,EAAU,EAAE,CAClE,mCACE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,sBAClD,kBAAkB,IAAI,CAAC,UAAU,IAAI,CAAC;AAH3B,QAAA,gBAAgB,oBAGW"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentVariants.d.ts","sourceRoot":"","sources":["../../src/routes/agentVariants.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAA+B,MAAM,SAAS,CAAC;AAG9D,OAAO,
|
|
1
|
+
{"version":3,"file":"agentVariants.d.ts","sourceRoot":"","sources":["../../src/routes/agentVariants.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAA+B,MAAM,SAAS,CAAC;AAG9D,OAAO,EAGL,KAAK,yBAAyB,EAC/B,MAAM,mBAAmB,CAAC;AAe3B,OAAO,KAAK,EACV,mBAAmB,EACnB,oBAAoB,EACpB,eAAe,EAChB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAErE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,EACL,qBAAqB,EAKtB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAEL,sBAAsB,EAEvB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAEL,oBAAoB,EACrB,MAAM,kCAAkC,CAAC;AAK1C,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,sBAAsB,CAAC;AAI9B;;;;;;GAMG;AACH,MAAM,MAAM,2BAA2B,GAAG;IACxC,SAAS,EAAE,OAAO,CAAC;IACnB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AAijBF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,0BAA0B,GAAI,aAAa,MAAM,KAAG,MAAM,EAmBtE,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,oBAAoB,GAC/B,UAAU,OAAO,EACjB,UAAU,eAAe,GAAG,IAAI,EAChC,4BAA4B,MAAM,EAClC,eAAc,mBAAmB,EAAO,KACvC,OAiBF,CAAC;AAEF,eAAO,MAAM,yBAAyB,GACpC,cAAc,yBAAyB,EACvC,SAAS,oBAAoB,EAC7B,YAAY,gBAAgB,EAC5B,yBAAyB,qBAAqB,EAC9C,wBAAwB,sBAAsB,EAC9C,oBAAoB,IAAI,CACtB,iBAAiB,EACjB,sBAAsB,GAAG,0BAA0B,GAAG,kBAAkB,CACzE,EACD,wBAAwB,oBAAoB,EAC5C,gBAAgB,2BAA2B,EAC3C,6BAA6B,kBAAkB,KAC9C,MAw4DF,CAAC"}
|