rivet-design 0.21.2 → 0.21.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.
Files changed (131) hide show
  1. package/dist/agent-variants/WorktreeOrchestrator.d.ts +1 -1
  2. package/dist/agent-variants/WorktreeOrchestrator.d.ts.map +1 -1
  3. package/dist/agent-variants/WorktreeOrchestrator.js +6 -7
  4. package/dist/agent-variants/WorktreeOrchestrator.js.map +1 -1
  5. package/dist/agent-variants/contracts.d.ts +286 -286
  6. package/dist/agent-variants/guidancePrompt.d.ts.map +1 -1
  7. package/dist/agent-variants/guidancePrompt.js +17 -0
  8. package/dist/agent-variants/guidancePrompt.js.map +1 -1
  9. package/dist/agent-variants/workItemBriefing.d.ts.map +1 -1
  10. package/dist/agent-variants/workItemBriefing.js +1 -1
  11. package/dist/agent-variants/workItemBriefing.js.map +1 -1
  12. package/dist/agent-variants/workItemContextFiles.d.ts.map +1 -1
  13. package/dist/agent-variants/workItemContextFiles.js +9 -4
  14. package/dist/agent-variants/workItemContextFiles.js.map +1 -1
  15. package/dist/cli/commands/contextRequest.d.ts.map +1 -1
  16. package/dist/cli/commands/contextRequest.js +19 -4
  17. package/dist/cli/commands/contextRequest.js.map +1 -1
  18. package/dist/cli/commands/generationPreflight.js +1 -1
  19. package/dist/cli/commands/generationPreflight.js.map +1 -1
  20. package/dist/cli/commands/guidanceReferences.d.ts +11 -0
  21. package/dist/cli/commands/guidanceReferences.d.ts.map +1 -0
  22. package/dist/cli/commands/guidanceReferences.js +56 -0
  23. package/dist/cli/commands/guidanceReferences.js.map +1 -0
  24. package/dist/cli/commands/mcpServe.d.ts.map +1 -1
  25. package/dist/cli/commands/mcpServe.js +9 -1
  26. package/dist/cli/commands/mcpServe.js.map +1 -1
  27. package/dist/cli/commands/open.d.ts.map +1 -1
  28. package/dist/cli/commands/open.js +18 -59
  29. package/dist/cli/commands/open.js.map +1 -1
  30. package/dist/cli/commands/status.js +1 -1
  31. package/dist/cli/commands/status.js.map +1 -1
  32. package/dist/cli/commands/update.d.ts.map +1 -1
  33. package/dist/cli/commands/update.js +7 -0
  34. package/dist/cli/commands/update.js.map +1 -1
  35. package/dist/cli/commands/wait.d.ts.map +1 -1
  36. package/dist/cli/commands/wait.js +37 -4
  37. package/dist/cli/commands/wait.js.map +1 -1
  38. package/dist/cli/entry.d.ts.map +1 -1
  39. package/dist/cli/entry.js +16 -0
  40. package/dist/cli/entry.js.map +1 -1
  41. package/dist/cli/projectRuntimeUpgrade.d.ts +21 -0
  42. package/dist/cli/projectRuntimeUpgrade.d.ts.map +1 -0
  43. package/dist/cli/projectRuntimeUpgrade.js +116 -0
  44. package/dist/cli/projectRuntimeUpgrade.js.map +1 -0
  45. package/dist/cli/router.d.ts.map +1 -1
  46. package/dist/cli/router.js +4 -3
  47. package/dist/cli/router.js.map +1 -1
  48. package/dist/cli/runtimeInterruption.d.ts +32 -0
  49. package/dist/cli/runtimeInterruption.d.ts.map +1 -0
  50. package/dist/cli/runtimeInterruption.js +65 -0
  51. package/dist/cli/runtimeInterruption.js.map +1 -0
  52. package/dist/cli/serverVersion.js +1 -1
  53. package/dist/cli/serverVersion.js.map +1 -1
  54. package/dist/cli/synchronizeRuntimes.d.ts +19 -0
  55. package/dist/cli/synchronizeRuntimes.d.ts.map +1 -0
  56. package/dist/cli/synchronizeRuntimes.js +113 -0
  57. package/dist/cli/synchronizeRuntimes.js.map +1 -0
  58. package/dist/library/HubClient.d.ts +2 -0
  59. package/dist/library/HubClient.d.ts.map +1 -1
  60. package/dist/library/HubClient.js +48 -9
  61. package/dist/library/HubClient.js.map +1 -1
  62. package/dist/routes/cli.d.ts +1 -0
  63. package/dist/routes/cli.d.ts.map +1 -1
  64. package/dist/routes/cli.js +11 -4
  65. package/dist/routes/cli.js.map +1 -1
  66. package/dist/routes/library/guidance.d.ts.map +1 -1
  67. package/dist/routes/library/guidance.js +6 -1
  68. package/dist/routes/library/guidance.js.map +1 -1
  69. package/dist/server.d.ts.map +1 -1
  70. package/dist/server.js +1 -0
  71. package/dist/server.js.map +1 -1
  72. package/dist/services/RuntimeAdmission.d.ts +1 -1
  73. package/dist/services/RuntimeAdmission.d.ts.map +1 -1
  74. package/dist/services/RuntimeAdmission.js +3 -2
  75. package/dist/services/RuntimeAdmission.js.map +1 -1
  76. package/dist/services/VariantRunService.d.ts +1 -0
  77. package/dist/services/VariantRunService.d.ts.map +1 -1
  78. package/dist/services/VariantRunService.js +8 -2
  79. package/dist/services/VariantRunService.js.map +1 -1
  80. package/dist/services/guidanceDelivery.d.ts.map +1 -1
  81. package/dist/services/guidanceDelivery.js +15 -11
  82. package/dist/services/guidanceDelivery.js.map +1 -1
  83. package/dist/services/guidanceReferences.d.ts +6 -0
  84. package/dist/services/guidanceReferences.d.ts.map +1 -0
  85. package/dist/services/guidanceReferences.js +133 -0
  86. package/dist/services/guidanceReferences.js.map +1 -0
  87. package/dist/services/profiles/DesignProfiles.d.ts +66 -1
  88. package/dist/services/profiles/DesignProfiles.d.ts.map +1 -1
  89. package/dist/services/profiles/DesignProfiles.js +5 -1
  90. package/dist/services/profiles/DesignProfiles.js.map +1 -1
  91. package/dist/services/profiles/ProfilePlanning.d.ts +1 -1
  92. package/dist/services/runtimeVersion.d.ts +1 -1
  93. package/dist/services/runtimeVersion.d.ts.map +1 -1
  94. package/dist/services/runtimeVersion.js +1 -1
  95. package/dist/services/runtimeVersion.js.map +1 -1
  96. package/dist/services/stopRuntimeProcess.d.ts +9 -0
  97. package/dist/services/stopRuntimeProcess.d.ts.map +1 -0
  98. package/dist/services/stopRuntimeProcess.js +84 -0
  99. package/dist/services/stopRuntimeProcess.js.map +1 -0
  100. package/dist/storage/profiles/ProfilePlans.d.ts +4 -4
  101. package/dist/storage/profiles/ProfileRecords.d.ts +1 -1
  102. package/dist/storage/profiles/ProfileRecords.d.ts.map +1 -1
  103. package/dist/storage/profiles/ProfileRecords.js +3 -1
  104. package/dist/storage/profiles/ProfileRecords.js.map +1 -1
  105. package/dist/storage/profiles/migrations.d.ts +2 -2
  106. package/dist/storage/profiles/migrations.d.ts.map +1 -1
  107. package/dist/storage/profiles/migrations.js +3 -0
  108. package/dist/storage/profiles/migrations.js.map +1 -1
  109. package/dist/storage/profiles/planSchema.d.ts +1 -1
  110. package/dist/storage/profiles/schema.d.ts +29 -1
  111. package/dist/storage/profiles/schema.d.ts.map +1 -1
  112. package/dist/storage/profiles/schema.js +1 -0
  113. package/dist/storage/profiles/schema.js.map +1 -1
  114. package/dist/types/design-profile.d.ts +2 -2
  115. package/dist/types/guidance-references.d.ts +230 -0
  116. package/dist/types/guidance-references.d.ts.map +1 -0
  117. package/dist/types/guidance-references.js +133 -0
  118. package/dist/types/guidance-references.js.map +1 -0
  119. package/dist/types/guidance.d.ts +662 -1
  120. package/dist/types/guidance.d.ts.map +1 -1
  121. package/dist/types/guidance.js +10 -2
  122. package/dist/types/guidance.js.map +1 -1
  123. package/dist/types/reference-onboarding.d.ts +2 -2
  124. package/dist/utils/skills/cli-guidance.d.ts +1 -1
  125. package/dist/utils/skills/cli-guidance.d.ts.map +1 -1
  126. package/dist/utils/skills/cli-guidance.js +4 -2
  127. package/dist/utils/skills/cli-guidance.js.map +1 -1
  128. package/package.json +3 -2
  129. package/src/ui/dist/assets/{LibraryEntry-B5kPF3Ey.js → LibraryEntry-yoxzWNdQ.js} +1 -1
  130. package/src/ui/dist/assets/{main-Er_TRZTd.js → main-DlZAsDUG.js} +2 -2
  131. package/src/ui/dist/index.html +1 -1
@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
37
37
  };
38
38
  Object.defineProperty(exports, "__esModule", { value: true });
39
39
  exports.ensureProjectRuntime = exports.validateProjectOpen = exports.PROJECT_RUNTIME_FLAG_SPEC = void 0;
40
- const serverShutdown_1 = require("../serverShutdown");
40
+ const projectRuntimeUpgrade_1 = require("../projectRuntimeUpgrade");
41
41
  const child_process_1 = require("child_process");
42
42
  const fs_1 = __importDefault(require("fs"));
43
43
  const path_1 = __importDefault(require("path"));
@@ -184,48 +184,6 @@ const openedData = async (attached, wasAlreadyRunning) => {
184
184
  };
185
185
  const DEFAULT_UPGRADE_SHUTDOWN_TIMEOUT_MS = 10_000;
186
186
  const UPGRADE_SHUTDOWN_TIMEOUT_ENV = 'RIVET_UPGRADE_SHUTDOWN_TIMEOUT_MS';
187
- const replaceStaleServer = async (attached, io, shutdownTimeoutMs) => {
188
- const info = (0, serverVersion_1.serverVersionInfo)(attached.handshake);
189
- if (!info.staleServer)
190
- return { outcome: 'attach' };
191
- const defer = (reason, message) => {
192
- io.writeProgress(`${(0, serverVersion_1.staleWarningLine)(info)} ${message}`);
193
- return {
194
- outcome: 'attach',
195
- upgrade: { state: 'deferred', reason, message, ...info },
196
- };
197
- };
198
- let response;
199
- try {
200
- response = await (0, client_1.requestServer)(attached, '/api/cli/upgrade', {
201
- method: 'POST',
202
- body: { clientVersion: info.cliVersion },
203
- });
204
- }
205
- catch {
206
- return defer('upgrade_unavailable', 'Could not verify safe upgrade admission. Leave current work running and retry `rivet open`.');
207
- }
208
- if (response.status === 404) {
209
- return defer('upgrade_protocol_unavailable', 'This server cannot perform an atomic upgrade. Once workers finish, run `rivet stop` and then `rivet open`. Saved directions do not need to be committed or discarded.');
210
- }
211
- if (response.status !== 200 || response.body.stopping !== true) {
212
- return defer(response.body.reason ?? 'upgrade_refused', response.body.error ??
213
- 'The server refused the upgrade. Let running work finish and retry `rivet open`.');
214
- }
215
- if (!(await (0, serverShutdown_1.waitForServerShutdown)(attached, shutdownTimeoutMs))) {
216
- io.writeProgress(`${(0, serverVersion_1.staleWarningLine)(info)} Shutdown was accepted but has not completed yet.`);
217
- return { outcome: 'shutdown_pending' };
218
- }
219
- const restartArgs = response.body.restartArgs;
220
- io.writeProgress(`Upgrading project server to rivet v${info.cliVersion}…`);
221
- return {
222
- outcome: 'spawn',
223
- ...(Array.isArray(restartArgs) &&
224
- restartArgs.every((arg) => typeof arg === 'string')
225
- ? { restartArgs }
226
- : {}),
227
- };
228
- };
229
187
  const finishProjectOpen = (data, io) => {
230
188
  const runner = data.resolvedRunner;
231
189
  if (runner?.mode === 'unavailable') {
@@ -308,25 +266,26 @@ const ensureProjectRuntime = async (context, io, dependencies = {}) => {
308
266
  return (0, envelope_1.errorResult)(COMMAND, 'SERVER_UNAVAILABLE', 'The registered project server is alive but its health cannot be verified. Leave it running and inspect its log before retrying.', { serverUnavailableReason: 'health_check_failed' });
309
267
  }
310
268
  let restartArgs;
269
+ let interruptedWork;
311
270
  if (existing) {
312
- const replacement = await replaceStaleServer(existing, io, timeoutFromEnv(env, UPGRADE_SHUTDOWN_TIMEOUT_ENV, DEFAULT_UPGRADE_SHUTDOWN_TIMEOUT_MS));
313
- if (replacement.outcome === 'shutdown_pending') {
314
- await lock.holdForProcess(existing.handshake.pid, 'retiring');
315
- shouldReleaseStartLock = false;
316
- return (0, envelope_1.errorResult)(COMMAND, 'SERVER_UNAVAILABLE', 'The project server accepted shutdown but has not exited yet. Retry `rivet open` in a moment.', { serverUnavailableReason: 'server_shutdown_pending' }, RETRY_OPEN_RECOVERY);
271
+ const replacement = await (0, projectRuntimeUpgrade_1.prepareRuntimeUpgrade)({
272
+ attached: existing,
273
+ io,
274
+ shutdownTimeoutMs: timeoutFromEnv(env, UPGRADE_SHUTDOWN_TIMEOUT_ENV, DEFAULT_UPGRADE_SHUTDOWN_TIMEOUT_MS),
275
+ });
276
+ if (replacement.outcome === 'failed') {
277
+ return (0, envelope_1.errorResult)(COMMAND, 'SERVER_UNAVAILABLE', replacement.message, {
278
+ serverUnavailableReason: 'server_upgrade_required',
279
+ upgradeReason: replacement.reason,
280
+ }, RETRY_OPEN_RECOVERY);
317
281
  }
318
282
  if (replacement.outcome === 'attach') {
319
- if (!replacement.upgrade) {
320
- const readinessError = await verifyRuntimeReadiness(existing, Math.min(serverStartTimeoutMs, APP_HEALTH_TIMEOUT_MS));
321
- if (readinessError)
322
- return readinessError;
323
- }
324
- const data = await openedData(existing, true);
325
- return finishProjectOpen({
326
- ...data,
327
- ...(replacement.upgrade ? { upgrade: replacement.upgrade } : {}),
328
- }, io);
283
+ const readinessError = await verifyRuntimeReadiness(existing, Math.min(serverStartTimeoutMs, APP_HEALTH_TIMEOUT_MS));
284
+ if (readinessError)
285
+ return readinessError;
286
+ return finishProjectOpen(await openedData(existing, true), io);
329
287
  }
288
+ interruptedWork = replacement.interruptedWork;
330
289
  restartArgs = replacement.restartArgs;
331
290
  }
332
291
  io.writeProgress(`Starting Rivet server for ${projectPath}…`);
@@ -360,7 +319,7 @@ const ensureProjectRuntime = async (context, io, dependencies = {}) => {
360
319
  if (readinessError)
361
320
  return readinessError;
362
321
  const data = await openedData(attached, false);
363
- return finishProjectOpen(data, io);
322
+ return finishProjectOpen({ ...data, ...(interruptedWork ? { interruptedWork } : {}) }, io);
364
323
  }
365
324
  finally {
366
325
  if (shouldReleaseStartLock) {
@@ -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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"}
@@ -23,7 +23,7 @@ const handleStatus = async (args, io) => {
23
23
  }
24
24
  const versionInfo = (0, serverVersion_1.serverVersionInfo)(attached.handshake);
25
25
  if (versionInfo.staleServer) {
26
- io.writeProgress(`${(0, serverVersion_1.staleWarningLine)(versionInfo)} Run \`rivet open\` to upgrade it (idle servers restart automatically), or \`rivet stop\` and reopen.`);
26
+ io.writeProgress(`${(0, serverVersion_1.staleWarningLine)(versionInfo)} Run \`rivet open\` to restart it and retry interrupted work.`);
27
27
  }
28
28
  const fetchStatus = async () => {
29
29
  try {
@@ -1 +1 @@
1
- {"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/update.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAqC3E,eAAO,MAAM,YAAY,GACvB,MAAM,MAAM,EAAE,KACb,OAAO,CAAC,gBAAgB,CA0C1B,CAAC"}
1
+ {"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/update.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAuC3E,eAAO,MAAM,YAAY,GACvB,MAAM,MAAM,EAAE,KACb,OAAO,CAAC,gBAAgB,CAqD1B,CAAC"}
@@ -6,6 +6,8 @@ const harnesses_1 = require("../../install/harnesses");
6
6
  const envelope_1 = require("../envelope");
7
7
  const serverVersion_1 = require("../serverVersion");
8
8
  const shared_1 = require("./shared");
9
+ const synchronizeRuntimes_1 = require("../synchronizeRuntimes");
10
+ const io_1 = require("../io");
9
11
  const COMMAND = 'update';
10
12
  const UPDATE_CHECKED_VERSION_ENV = 'RIVET_UPDATE_CHECKED_VERSION';
11
13
  const UPDATE_FAILURE_ENV = 'RIVET_UPDATE_FAILURE';
@@ -45,12 +47,14 @@ const handleUpdate = async (args) => {
45
47
  delete process.env[UPDATE_CHECKED_VERSION_ENV];
46
48
  delete process.env[UPDATE_PACKAGE_UPDATED_ENV];
47
49
  const integrations = (0, harnesses_1.updateHarnesses)({ isQuiet: true });
50
+ const runtimes = await (0, synchronizeRuntimes_1.synchronizeRuntimes)({ args, io: io_1.processCliIO });
48
51
  const result = {
49
52
  currentVersion: telemetry_1.RIVET_VERSION,
50
53
  checkedVersion,
51
54
  isLatest: !(0, serverVersion_1.isNewerVersion)(checkedVersion, telemetry_1.RIVET_VERSION),
52
55
  wasPackageUpdated,
53
56
  integrations,
57
+ runtimes,
54
58
  };
55
59
  if (updateFailure) {
56
60
  const message = updateFailure.targetVersion
@@ -61,6 +65,9 @@ const handleUpdate = async (args) => {
61
65
  updateFailure,
62
66
  });
63
67
  }
68
+ if (runtimes.failures.length > 0) {
69
+ return (0, envelope_1.errorResult)(COMMAND, 'SERVER_UNAVAILABLE', 'The CLI was updated, but some running servers could not be upgraded.', result, { isRecoverable: true });
70
+ }
64
71
  if (!integrations.isSuccessful) {
65
72
  return (0, envelope_1.errorResult)(COMMAND, 'OPERATION_FAILED', 'The CLI is current, but some agent integrations could not be refreshed.', result);
66
73
  }
@@ -1 +1 @@
1
- {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/cli/commands/update.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/cli/commands/update.ts"],"names":[],"mappings":";;;AAAA,sDAAuD;AACvD,uDAA0D;AAC1D,0CAA2E;AAC3E,oDAAkD;AAClD,qCAAgE;AAChE,gEAA6D;AAC7D,8BAAqC;AAErC,MAAM,OAAO,GAAG,QAAQ,CAAC;AACzB,MAAM,0BAA0B,GAAG,8BAA8B,CAAC;AAClE,MAAM,kBAAkB,GAAG,sBAAsB,CAAC;AAClD,MAAM,0BAA0B,GAAG,8BAA8B,CAAC;AASlE,MAAM,iBAAiB,GAAG,GAAyB,EAAE;IACnD,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAC1D,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACvC,IAAI,CAAC,iBAAiB;QAAE,OAAO,IAAI,CAAC;IACpC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAA2B,CAAC;QACxE,IACE,OAAO,OAAO,CAAC,cAAc,KAAK,QAAQ;YAC1C,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ;YACjC,OAAO,OAAO,CAAC,MAAM,KAAK,QAAQ;YAClC,CAAC,OAAO,CAAC,aAAa,KAAK,SAAS;gBAClC,OAAO,OAAO,CAAC,aAAa,KAAK,QAAQ,CAAC,EAC5C,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,OAAwB,CAAC;IAClC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,YAAY,GAAG,KAAK,EAC/B,IAAc,EACa,EAAE;IAC7B,MAAM,OAAO,GAAG,IAAA,4BAAmB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACnD,IAAI,IAAA,wBAAe,EAAC,OAAO,CAAC;QAAE,OAAO,OAAO,CAAC;IAC7C,IAAI,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzC,OAAO,IAAA,sBAAW,EAAC,OAAO,EAAE,aAAa,EAAE,qBAAqB,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,aAAa,GAAG,iBAAiB,EAAE,CAAC;IAC1C,MAAM,cAAc,GAClB,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC;QACvC,aAAa,EAAE,aAAa;QAC5B,yBAAa,CAAC;IAChB,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,KAAK,GAAG,CAAC;IAC1E,OAAO,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IAC/C,OAAO,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IAC/C,MAAM,YAAY,GAAG,IAAA,2BAAe,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,MAAM,IAAA,yCAAmB,EAAC,EAAE,IAAI,EAAE,EAAE,EAAE,iBAAY,EAAE,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG;QACb,cAAc,EAAE,yBAAa;QAC7B,cAAc;QACd,QAAQ,EAAE,CAAC,IAAA,8BAAc,EAAC,cAAc,EAAE,yBAAa,CAAC;QACxD,iBAAiB;QACjB,YAAY;QACZ,QAAQ;KACT,CAAC;IAEF,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,OAAO,GAAG,aAAa,CAAC,aAAa;YACzC,CAAC,CAAC,8BAA8B,aAAa,CAAC,aAAa,sBAAsB,aAAa,CAAC,cAAc,GAAG;YAChH,CAAC,CAAC,uDAAuD,aAAa,CAAC,cAAc,GAAG,CAAC;QAC3F,OAAO,IAAA,sBAAW,EAAC,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE;YACvD,GAAG,MAAM;YACT,aAAa;SACd,CAAC,CAAC;IACL,CAAC;IACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjC,OAAO,IAAA,sBAAW,EAChB,OAAO,EACP,oBAAoB,EACpB,sEAAsE,EACtE,MAAM,EACN,EAAE,aAAa,EAAE,IAAI,EAAE,CACxB,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;QAC/B,OAAO,IAAA,sBAAW,EAChB,OAAO,EACP,kBAAkB,EAClB,yEAAyE,EACzE,MAAM,CACP,CAAC;IACJ,CAAC;IACD,OAAO,IAAA,mBAAQ,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AACnC,CAAC,CAAC;AAvDW,QAAA,YAAY,gBAuDvB"}
@@ -1 +1 @@
1
- {"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/wait.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAqB3E,KAAK,aAAa,GAAG;IACnB,KAAK,CAAC,EAAE;QACN,MAAM,CAAC,EAAE,KAAK,CAAC;YAAE,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;QACvC,MAAM,CAAC,EAAE,KAAK,CAAC;YAAE,SAAS,CAAC,EAAE,MAAM,CAAC;YAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAA;SAAE,CAAC,CAAC;KACrE,CAAC;IACF,SAAS,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7D,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE;QACT,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,QAAQ,CAAC,EAAE,KAAK,CAAC;YACf,SAAS,CAAC,EAAE,MAAM,CAAC;YACnB,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,UAAU,CAAC,EAAE;gBAAE,MAAM,CAAC,EAAE,MAAM,CAAA;aAAE,CAAC;SAClC,CAAC,CAAC;KACJ,CAAC;CACH,CAAC;AAEF,KAAK,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;AAI/D,eAAO,MAAM,WAAW,GACtB,QAAQ,aAAa,EACrB,QAAQ,MAAM,KACb,SAoCF,CAAC;AAiBF,eAAO,MAAM,UAAU,GAAU,MAAM,MAAM,EAAE,KAAG,OAAO,CAAC,gBAAgB,CA2FzE,CAAC"}
1
+ {"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/wait.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAsB3E,KAAK,aAAa,GAAG;IACnB,KAAK,CAAC,EAAE;QACN,MAAM,CAAC,EAAE,KAAK,CAAC;YAAE,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;QACvC,MAAM,CAAC,EAAE,KAAK,CAAC;YAAE,SAAS,CAAC,EAAE,MAAM,CAAC;YAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAA;SAAE,CAAC,CAAC;KACrE,CAAC;IACF,SAAS,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7D,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE;QACT,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,QAAQ,CAAC,EAAE,KAAK,CAAC;YACf,SAAS,CAAC,EAAE,MAAM,CAAC;YACnB,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,UAAU,CAAC,EAAE;gBAAE,MAAM,CAAC,EAAE,MAAM,CAAA;aAAE,CAAC;SAClC,CAAC,CAAC;KACJ,CAAC;CACH,CAAC;AAEF,KAAK,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;AAI/D,eAAO,MAAM,WAAW,GACtB,QAAQ,aAAa,EACrB,QAAQ,MAAM,KACb,SAoCF,CAAC;AAoDF,eAAO,MAAM,UAAU,GAAU,MAAM,MAAM,EAAE,KAAG,OAAO,CAAC,gBAAgB,CAsGzE,CAAC"}
@@ -4,6 +4,7 @@ exports.handleWait = exports.workStateOf = void 0;
4
4
  const envelope_1 = require("../envelope");
5
5
  const flags_1 = require("../flags");
6
6
  const client_1 = require("../client");
7
+ const runtimeInterruption_1 = require("../runtimeInterruption");
7
8
  const shared_1 = require("./shared");
8
9
  const COMMAND = 'wait';
9
10
  const DEFAULT_WAIT_TIMEOUT_SECONDS = 600;
@@ -47,6 +48,26 @@ const waitTimeoutMessage = (workId, state, timeoutSeconds) => state === 'pending
47
48
  : `Work ${workId} is still running after ${timeoutSeconds}s. Re-issue \`rivet wait\` or check \`rivet status\`.`;
48
49
  const unknownWorkMessage = (workId) => `Unknown work id ${workId}. Check \`rivet status\` for queued, running, or recently settled work.`;
49
50
  const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
51
+ const interruptedWorkResult = ({ projectPath, workId, isWorkUnknown = false, }) => {
52
+ const receipts = (0, runtimeInterruption_1.readRuntimeInterruptions)(projectPath);
53
+ const confirmed = receipts.find((item) => item.workIds.includes(workId));
54
+ const interruption = confirmed ??
55
+ (isWorkUnknown
56
+ ? receipts
57
+ .filter((item) => item.workIds.length === 0)
58
+ .sort((a, b) => b.createdAt.localeCompare(a.createdAt))[0]
59
+ : undefined);
60
+ if (!interruption)
61
+ return null;
62
+ return (0, envelope_1.errorResult)(COMMAND, 'OPERATION_FAILED', confirmed
63
+ ? interruption.message
64
+ : 'Rivet restarted after an upgrade without retaining work IDs. This work is unavailable, but its interruption cannot be confirmed. Run `rivet open`, check saved history, and restart the original request if needed.', {
65
+ reason: 'runtime_upgraded',
66
+ workId,
67
+ interruption,
68
+ isWorkConfirmedInterrupted: Boolean(confirmed),
69
+ }, { isRecoverable: true });
70
+ };
50
71
  const handleWait = async (args) => {
51
72
  const context = (0, shared_1.parseCommandContext)(COMMAND, args, WAIT_FLAG_SPEC);
52
73
  if ((0, shared_1.isCommandResult)(context)) {
@@ -60,15 +81,22 @@ const handleWait = async (args) => {
60
81
  if (context.flags.errors.length > 0) {
61
82
  return (0, envelope_1.errorResult)(COMMAND, 'USAGE_ERROR', context.flags.errors.join('; '));
62
83
  }
84
+ const recovery = { projectPath: context.projectPath, workId };
85
+ const interrupted = interruptedWorkResult(recovery);
86
+ if (interrupted)
87
+ return interrupted;
63
88
  const attached = await (0, shared_1.attachOrUnavailable)(COMMAND, context.projectPath);
64
89
  if (!(0, shared_1.isAttached)(attached)) {
65
- return attached;
90
+ return (interruptedWorkResult({ ...recovery, isWorkUnknown: true }) ?? attached);
66
91
  }
67
92
  const deadline = Date.now() + timeoutSeconds * 1000;
68
93
  const unknownGraceDeadline = Date.now() + UNKNOWN_WORK_GRACE_MS;
69
94
  let wasObservedRunning = false;
70
95
  let wasObservedLive = false;
71
96
  for (;;) {
97
+ const interruption = interruptedWorkResult(recovery);
98
+ if (interruption)
99
+ return interruption;
72
100
  let status;
73
101
  try {
74
102
  const response = await (0, client_1.requestServer)(attached, '/api/cli/status');
@@ -78,7 +106,7 @@ const handleWait = async (args) => {
78
106
  status = response.body;
79
107
  }
80
108
  catch (error) {
81
- return (0, shared_1.transportErrorResult)(COMMAND, error);
109
+ return (interruptedWorkResult(recovery) ?? (0, shared_1.transportErrorResult)(COMMAND, error));
82
110
  }
83
111
  const workState = (0, exports.workStateOf)(status, workId);
84
112
  if (workState === 'settled') {
@@ -96,8 +124,13 @@ const handleWait = async (args) => {
96
124
  wasObservedRunning,
97
125
  });
98
126
  }
99
- if (Date.now() >= unknownGraceDeadline ||
100
- Date.now() >= deadline) {
127
+ if (Date.now() >= unknownGraceDeadline || Date.now() >= deadline) {
128
+ const recoveryResult = interruptedWorkResult({
129
+ ...recovery,
130
+ isWorkUnknown: true,
131
+ });
132
+ if (recoveryResult)
133
+ return recoveryResult;
101
134
  return (0, envelope_1.errorResult)(COMMAND, 'OPERATION_FAILED', unknownWorkMessage(workId), {
102
135
  workId,
103
136
  state: 'unknown',
@@ -1 +1 @@
1
- {"version":3,"file":"wait.js","sourceRoot":"","sources":["../../../src/cli/commands/wait.ts"],"names":[],"mappings":";;;AAAA,0CAA2E;AAC3E,oCAAuC;AACvC,sCAA0C;AAC1C,qCAOkB;AAElB,MAAM,OAAO,GAAG,MAAM,CAAC;AACvB,MAAM,4BAA4B,GAAG,GAAG,CAAC;AACzC,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAClC,MAAM,qBAAqB,GAAG,MAAM,CAAC;AAErC,MAAM,cAAc,GAAG;IACrB,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;CAC9B,CAAC;AAqBF,MAAM,yBAAyB,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;AAEzE,MAAM,WAAW,GAAG,CACzB,MAAqB,EACrB,MAAc,EACH,EAAE;IACb,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;IACnC,IACE,SAAS;QACT,CAAC,SAAS,CAAC,UAAU,KAAK,MAAM,IAAI,SAAS,CAAC,OAAO,KAAK,MAAM,CAAC,EACjE,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,MAAM,IAAI,EAAE,CAAC;IAC1C,IACE,MAAM,CAAC,IAAI,CACT,CAAC,KAAK,EAAE,EAAE,CACR,KAAK,CAAC,SAAS,KAAK,MAAM;QAC1B,CAAC,KAAK,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAClD,EACD,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,MAAM,IAAI,EAAE,CAAC;IAC1C,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,KAAK,MAAM,CAAC,EAAE,CAAC;QACrD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,kBAAkB,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CACjE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,KAAK,MAAM,CAC1C,CAAC;IACF,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,MAAM,oBAAoB,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAC/D,MAAM,aAAa,GAAG,OAAO,CAAC,UAAU,EAAE,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;YACnE,OAAO,CAAC,aAAa,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;QACH,OAAO,oBAAoB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IACtD,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACtD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAvCW,QAAA,WAAW,eAuCtB;AAEF,MAAM,kBAAkB,GAAG,CACzB,MAAc,EACd,KAAgB,EAChB,cAAsB,EACd,EAAE,CACV,KAAK,KAAK,SAAS;IACjB,CAAC,CAAC,QAAQ,MAAM,2BAA2B,cAAc,4BAA4B;IACrF,CAAC,CAAC,QAAQ,MAAM,2BAA2B,cAAc,uDAAuD,CAAC;AAErH,MAAM,kBAAkB,GAAG,CAAC,MAAc,EAAU,EAAE,CACpD,mBAAmB,MAAM,yEAAyE,CAAC;AAErG,MAAM,KAAK,GAAG,CAAC,EAAU,EAAiB,EAAE,CAC1C,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAE7C,MAAM,UAAU,GAAG,KAAK,EAAE,IAAc,EAA6B,EAAE;IAC5E,MAAM,OAAO,GAAG,IAAA,4BAAmB,EAAC,OAAO,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;IACnE,IAAI,IAAA,wBAAe,EAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAC5C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAA,sBAAW,EAChB,OAAO,EACP,aAAa,EACb,kDAAkD,CACnD,CAAC;IACJ,CAAC;IACD,MAAM,cAAc,GAClB,IAAA,mBAAW,EAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,4BAA4B,CAAC;IACxE,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpC,OAAO,IAAA,sBAAW,EAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9E,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,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,GAAG,IAAI,CAAC;IACpD,MAAM,oBAAoB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,qBAAqB,CAAC;IAChE,IAAI,kBAAkB,GAAG,KAAK,CAAC;IAC/B,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,SAAS,CAAC;QACR,IAAI,MAAqB,CAAC;QAC1B,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,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC;QACzB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,IAAA,6BAAoB,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC9C,CAAC;QAED,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,OAAO,IAAA,mBAAQ,EAAC,OAAO,EAAE;gBACvB,MAAM;gBACN,KAAK,EAAE,SAAS;gBAChB,kBAAkB;aACnB,CAAC,CAAC;QACL,CAAC;QACD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,IAAI,eAAe,EAAE,CAAC;gBACpB,OAAO,IAAA,mBAAQ,EAAC,OAAO,EAAE;oBACvB,MAAM;oBACN,KAAK,EAAE,SAAS;oBAChB,kBAAkB;iBACnB,CAAC,CAAC;YACL,CAAC;YACD,IACE,IAAI,CAAC,GAAG,EAAE,IAAI,oBAAoB;gBAClC,IAAI,CAAC,GAAG,EAAE,IAAI,QAAQ,EACtB,CAAC;gBACD,OAAO,IAAA,sBAAW,EAChB,OAAO,EACP,kBAAkB,EAClB,kBAAkB,CAAC,MAAM,CAAC,EAC1B;oBACE,MAAM;oBACN,KAAK,EAAE,SAAS;iBACjB,CACF,CAAC;YACJ,CAAC;QACH,CAAC;QACD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,kBAAkB,GAAG,IAAI,CAAC;QAC5B,CAAC;QACD,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YACvD,eAAe,GAAG,IAAI,CAAC;QACzB,CAAC;QAED,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,QAAQ,EAAE,CAAC;YAC3B,OAAO,IAAA,sBAAW,EAChB,OAAO,EACP,cAAc,EACd,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE,cAAc,CAAC,EACrD,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,CAC7B,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACrC,CAAC;AACH,CAAC,CAAC;AA3FW,QAAA,UAAU,cA2FrB"}
1
+ {"version":3,"file":"wait.js","sourceRoot":"","sources":["../../../src/cli/commands/wait.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"entry.d.ts","sourceRoot":"","sources":["../../src/cli/entry.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,eAAe,GAC1B,OAAM,MAAM,EAA0B,KACrC,OAAO,CAAC,IAAI,CAQd,CAAC"}
1
+ {"version":3,"file":"entry.d.ts","sourceRoot":"","sources":["../../src/cli/entry.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,eAAe,GAC1B,OAAM,MAAM,EAA0B,KACrC,OAAO,CAAC,IAAI,CAsCd,CAAC"}
package/dist/cli/entry.js CHANGED
@@ -36,10 +36,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
36
36
  exports.runControlPlane = void 0;
37
37
  const commandNames_1 = require("./commandNames");
38
38
  const runControlPlane = async (args = process.argv.slice(2)) => {
39
+ const { redirectLogsToStderr } = await Promise.resolve().then(() => __importStar(require('../utils/logger')));
40
+ redirectLogsToStderr();
39
41
  if (!(0, commandNames_1.isCliControlCommand)(args[0])) {
40
42
  const { main } = await Promise.resolve().then(() => __importStar(require('../index')));
41
43
  return main(args);
42
44
  }
45
+ if (!['__serve', '__hub', 'update', 'stop', 'auth', 'version'].includes(args[0])) {
46
+ const { synchronizeRuntimes } = await Promise.resolve().then(() => __importStar(require('./synchronizeRuntimes')));
47
+ const { processCliIO, emitResult } = await Promise.resolve().then(() => __importStar(require('./io')));
48
+ const { errorResult } = await Promise.resolve().then(() => __importStar(require('./envelope')));
49
+ const runtimes = await synchronizeRuntimes({ args, io: processCliIO });
50
+ if (runtimes.failures.length > 0) {
51
+ const message = 'Rivet could not upgrade all running servers. Retry after resolving the reported runtime failures.';
52
+ if (args[0] === 'mcp')
53
+ throw new Error(`${message} ${runtimes.failures.map((failure) => failure.message).join(' ')}`);
54
+ const exitCode = emitResult(processCliIO, errorResult(args[0], 'SERVER_UNAVAILABLE', message, { runtimes }, { isRecoverable: true }));
55
+ process.stdout.write('', () => process.exit(exitCode));
56
+ return;
57
+ }
58
+ }
43
59
  const { runCliControlCommand } = await Promise.resolve().then(() => __importStar(require('./router')));
44
60
  const exitCode = await runCliControlCommand(args);
45
61
  process.stdout.write('', () => process.exit(exitCode));
@@ -1 +1 @@
1
- {"version":3,"file":"entry.js","sourceRoot":"","sources":["../../src/cli/entry.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAqD;AAE9C,MAAM,eAAe,GAAG,KAAK,EAClC,OAAiB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EACvB,EAAE;IACjB,IAAI,CAAC,IAAA,kCAAmB,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClC,MAAM,EAAE,IAAI,EAAE,GAAG,wDAAa,UAAU,GAAC,CAAC;QAC1C,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IACD,MAAM,EAAE,oBAAoB,EAAE,GAAG,wDAAa,UAAU,GAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAClD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;AACzD,CAAC,CAAC;AAVW,QAAA,eAAe,mBAU1B"}
1
+ {"version":3,"file":"entry.js","sourceRoot":"","sources":["../../src/cli/entry.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAqD;AAE9C,MAAM,eAAe,GAAG,KAAK,EAClC,OAAiB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EACvB,EAAE;IACjB,MAAM,EAAE,oBAAoB,EAAE,GAAG,wDAAa,iBAAiB,GAAC,CAAC;IACjE,oBAAoB,EAAE,CAAC;IACvB,IAAI,CAAC,IAAA,kCAAmB,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClC,MAAM,EAAE,IAAI,EAAE,GAAG,wDAAa,UAAU,GAAC,CAAC;QAC1C,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IACD,IACE,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAC5E,CAAC;QACD,MAAM,EAAE,mBAAmB,EAAE,GAAG,wDAAa,uBAAuB,GAAC,CAAC;QACtE,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,wDAAa,MAAM,GAAC,CAAC;QAC1D,MAAM,EAAE,WAAW,EAAE,GAAG,wDAAa,YAAY,GAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;QACvE,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,MAAM,OAAO,GACX,mGAAmG,CAAC;YACtG,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK;gBACnB,MAAM,IAAI,KAAK,CACb,GAAG,OAAO,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAC9E,CAAC;YACJ,MAAM,QAAQ,GAAG,UAAU,CACzB,YAAY,EACZ,WAAW,CACT,IAAI,CAAC,CAAC,CAAC,EACP,oBAAoB,EACpB,OAAO,EACP,EAAE,QAAQ,EAAE,EACZ,EAAE,aAAa,EAAE,IAAI,EAAE,CACxB,CACF,CAAC;YACF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YACvD,OAAO;QACT,CAAC;IACH,CAAC;IACD,MAAM,EAAE,oBAAoB,EAAE,GAAG,wDAAa,UAAU,GAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAClD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;AACzD,CAAC,CAAC;AAxCW,QAAA,eAAe,mBAwC1B"}
@@ -0,0 +1,21 @@
1
+ import { type AttachedServer } from './client';
2
+ import { type RuntimeInterruption } from './runtimeInterruption';
3
+ import type { CliIO } from './io';
4
+ type RuntimeUpgradeOutcome = {
5
+ outcome: 'attach';
6
+ } | {
7
+ outcome: 'failed';
8
+ message: string;
9
+ reason: string;
10
+ } | {
11
+ outcome: 'spawn';
12
+ restartArgs?: string[];
13
+ interruptedWork?: RuntimeInterruption;
14
+ };
15
+ export declare const prepareRuntimeUpgrade: ({ attached, io, shutdownTimeoutMs, }: {
16
+ attached: AttachedServer;
17
+ io: CliIO;
18
+ shutdownTimeoutMs: number;
19
+ }) => Promise<RuntimeUpgradeOutcome>;
20
+ export {};
21
+ //# sourceMappingURL=projectRuntimeUpgrade.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"projectRuntimeUpgrade.d.ts","sourceRoot":"","sources":["../../src/cli/projectRuntimeUpgrade.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiB,KAAK,cAAc,EAAE,MAAM,UAAU,CAAC;AAQ9D,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAElC,KAAK,qBAAqB,GACtB;IAAE,OAAO,EAAE,QAAQ,CAAA;CAAE,GACrB;IAAE,OAAO,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACtD;IACE,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,eAAe,CAAC,EAAE,mBAAmB,CAAC;CACvC,CAAC;AAwBN,eAAO,MAAM,qBAAqB,GAAU,sCAIzC;IACD,QAAQ,EAAE,cAAc,CAAC;IACzB,EAAE,EAAE,KAAK,CAAC;IACV,iBAAiB,EAAE,MAAM,CAAC;CAC3B,KAAG,OAAO,CAAC,qBAAqB,CAwGhC,CAAC"}
@@ -0,0 +1,116 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.prepareRuntimeUpgrade = void 0;
7
+ const zod_1 = require("zod");
8
+ const fs_1 = __importDefault(require("fs"));
9
+ const client_1 = require("./client");
10
+ const serverVersion_1 = require("./serverVersion");
11
+ const serverShutdown_1 = require("./serverShutdown");
12
+ const stopRuntimeProcess_1 = require("../services/stopRuntimeProcess");
13
+ const runtimeActivity_1 = require("../services/runtimeActivity");
14
+ const runtimeInterruption_1 = require("./runtimeInterruption");
15
+ const healthSchema = zod_1.z.object({
16
+ pid: zod_1.z.number().int().positive(),
17
+ rivetVersion: zod_1.z.string().optional(),
18
+ projectPath: zod_1.z.string(),
19
+ framework: zod_1.z.string().optional(),
20
+ });
21
+ const upgradeSchema = zod_1.z.object({
22
+ stopping: zod_1.z.boolean().optional(),
23
+ reason: zod_1.z.string().optional(),
24
+ error: zod_1.z.string().optional(),
25
+ restartArgs: zod_1.z.array(zod_1.z.string()).optional(),
26
+ });
27
+ const devServerSchema = zod_1.z.object({
28
+ devServerHealth: zod_1.z
29
+ .object({ ownership: zod_1.z.string(), port: zod_1.z.number().nullable() })
30
+ .optional(),
31
+ });
32
+ const INTERRUPTIBLE_REASONS = new Set([
33
+ 'active_work',
34
+ 'unknown_execution_state',
35
+ ]);
36
+ const prepareRuntimeUpgrade = async ({ attached, io, shutdownTimeoutMs, }) => {
37
+ const info = (0, serverVersion_1.serverVersionInfo)(attached.handshake);
38
+ if (!info.staleServer)
39
+ return { outcome: 'attach' };
40
+ const fail = (reason, message) => ({
41
+ outcome: 'failed',
42
+ reason,
43
+ message,
44
+ });
45
+ try {
46
+ const processIdentity = (0, stopRuntimeProcess_1.runtimeProcessIdentity)(attached.handshake.pid);
47
+ const response = await (0, client_1.requestServer)(attached, '/api/health');
48
+ const health = healthSchema.safeParse(response.body);
49
+ if (response.status !== 200 ||
50
+ !health.success ||
51
+ health.data.pid !== attached.handshake.pid ||
52
+ fs_1.default.realpathSync(health.data.projectPath) !==
53
+ fs_1.default.realpathSync(attached.handshake.projectPath) ||
54
+ health.data.rivetVersion !== attached.handshake.rivetVersion)
55
+ return fail('server_identity_mismatch', 'The outdated project server could not verify its identity. It was not stopped.');
56
+ const status = await (0, client_1.requestServer)(attached, '/api/cli/status').catch(() => null);
57
+ if (status?.status === 401 || status?.status === 403)
58
+ return fail('server_access_denied', 'The outdated project server denied access. It was not stopped.');
59
+ const snapshot = status?.status === 200 ? status.body : null;
60
+ let upgrade = await (0, client_1.requestServer)(attached, '/api/cli/upgrade', {
61
+ method: 'POST',
62
+ body: { clientVersion: info.cliVersion },
63
+ });
64
+ let parsed = upgradeSchema.parse(upgrade.body);
65
+ const fallbackArgs = [
66
+ '--project',
67
+ attached.handshake.projectPath,
68
+ '--rivet-port',
69
+ String(attached.handshake.rivetPort),
70
+ ];
71
+ if (health.data.framework)
72
+ fallbackArgs.push('--framework', health.data.framework);
73
+ const devServer = devServerSchema.safeParse(snapshot);
74
+ if (devServer.success &&
75
+ devServer.data.devServerHealth?.ownership === 'external' &&
76
+ devServer.data.devServerHealth.port)
77
+ fallbackArgs.push('--user-port', String(devServer.data.devServerHealth.port));
78
+ if (upgrade.status === 404 ||
79
+ (upgrade.status === 409 && INTERRUPTIBLE_REASONS.has(parsed.reason ?? ''))) {
80
+ upgrade = await (0, client_1.requestServer)(attached, '/api/cli/shutdown', {
81
+ method: 'POST',
82
+ body: {},
83
+ });
84
+ parsed = upgradeSchema.parse(upgrade.body);
85
+ }
86
+ if (upgrade.status !== 200 || parsed.stopping !== true)
87
+ return fail(parsed.reason ?? 'server_upgrade_required', parsed.error ??
88
+ 'The outdated project server could not be restarted. Inspect its log and retry `rivet open`.');
89
+ const interruptedWork = (0, runtimeActivity_1.classifyRuntimeActivity)(snapshot) !== 'idle'
90
+ ? (0, runtimeInterruption_1.recordRuntimeInterruption)({ attached, snapshot })
91
+ : undefined;
92
+ if (interruptedWork)
93
+ io.writeProgress(`${interruptedWork.message} Recovery details: ${interruptedWork.receiptPath}`);
94
+ if (!(await (0, serverShutdown_1.waitForServerShutdown)(attached, shutdownTimeoutMs))) {
95
+ await (0, stopRuntimeProcess_1.stopRuntimeProcess)({
96
+ pid: attached.handshake.pid,
97
+ timeoutMs: shutdownTimeoutMs,
98
+ isOwned: async () => {
99
+ return (processIdentity !== null &&
100
+ (0, stopRuntimeProcess_1.runtimeProcessIdentity)(attached.handshake.pid) === processIdentity);
101
+ },
102
+ });
103
+ }
104
+ io.writeProgress(`Upgrading project server to rivet v${info.cliVersion}…`);
105
+ return {
106
+ outcome: 'spawn',
107
+ restartArgs: parsed.restartArgs ?? fallbackArgs,
108
+ ...(interruptedWork ? { interruptedWork } : {}),
109
+ };
110
+ }
111
+ catch (error) {
112
+ return fail('server_upgrade_required', error instanceof Error ? error.message : String(error));
113
+ }
114
+ };
115
+ exports.prepareRuntimeUpgrade = prepareRuntimeUpgrade;
116
+ //# sourceMappingURL=projectRuntimeUpgrade.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"projectRuntimeUpgrade.js","sourceRoot":"","sources":["../../src/cli/projectRuntimeUpgrade.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/cli/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,YAAY,CAAC;AACpB,OAAO,EAA4B,KAAK,KAAK,EAAE,MAAM,MAAM,CAAC;AAU5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AA0DrD,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,EAAE,KAAG,MAAM,EAAE,GAAG,IAM7D,CAAC;AAgBF,eAAO,MAAM,iCAAiC,GAAI,MAAM,MAAM,EAAE,KAAG,MAAM,EAuBxE,CAAC;AAEF,eAAO,MAAM,QAAQ,GACnB,SAAS,MAAM,EACf,MAAM,MAAM,EAAE,EACd,IAAI,KAAK,KACR,OAAO,CAAC,gBAAgB,CAsI1B,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,MAAM,MAAM,EAAE,EACd,KAAI,KAAoB,KACvB,OAAO,CAAC,MAAM,CAkEhB,CAAC"}
1
+ {"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/cli/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,YAAY,CAAC;AACpB,OAAO,EAA4B,KAAK,KAAK,EAAE,MAAM,MAAM,CAAC;AAU5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AA2DrD,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,EAAE,KAAG,MAAM,EAAE,GAAG,IAM7D,CAAC;AAgBF,eAAO,MAAM,iCAAiC,GAAI,MAAM,MAAM,EAAE,KAAG,MAAM,EAuBxE,CAAC;AAEF,eAAO,MAAM,QAAQ,GACnB,SAAS,MAAM,EACf,MAAM,MAAM,EAAE,EACd,IAAI,KAAK,KACR,OAAO,CAAC,gBAAgB,CAsI1B,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,MAAM,MAAM,EAAE,EACd,KAAI,KAAoB,KACvB,OAAO,CAAC,MAAM,CAkEhB,CAAC"}
@@ -44,8 +44,9 @@ Object.defineProperty(exports, "isCliControlCommand", { enumerable: true, get: f
44
44
  const COMMAND_USAGE = {
45
45
  context: [
46
46
  'rivet context <add|list|show|update|enable|disable|remove|resolve|inspect> [options]',
47
- 'Save named Markdown instructions for every generation in this account on this installation. add --title <title> --file <path>; update <id> [--title <title>] [--file <path>]; show|enable|disable|remove <id>. Files are copied when saved, not watched.',
48
- 'resolve [--guidance auto|off] [--exclude-guidance <JSON IDs>] returns current effective text without a model call. inspect <workId> --project <path> reads the retained generation text from the project runtime. Limits: 16 KiB per document and 32 KiB across enabled documents; excessive input is rejected without truncation.',
47
+ 'Save instructions and library references for every generation in this account on this installation. add --title <title> [--file <Markdown path>] [--references <manifest.json>]; update <id> [--title <title>] [--file <path>] [--references <manifest.json>]; show|enable|disable|remove <id>. Add requires Markdown or nonempty references. Files are copied when saved, not watched. Updates preserve omitted fields; an empty reference array removes references.',
48
+ 'Reference manifests contain an array of {kind:"url"|"repository",url,intent,revision?,files?:[{name,path}]}. File paths resolve relative to the manifest; names retain safe relative native layout. URLs identify sources and are not fetched. Selected UTF-8 files are limited to 1 MiB each, 5 MiB and 100 files per document, and 32 references.',
49
+ 'resolve [--guidance auto|off] [--exclude-guidance <JSON IDs>] returns current effective text and native paths without a model call. inspect <workId> --project <path> reads retained generation context. Guidance above 32 KiB emits an advisory warning, not a truncation or rejection. The HTTP request limit remains 50 MiB.',
49
50
  ],
50
51
  profile: [
51
52
  'rivet profile <status|diagnostics|discover|plan|import|onboarding|rebuild-index|enable|disable|connect|refresh|pause|resume|retry|add-text|add-images|pins|add-variant|inspect|references|reference|search|include|exclude|remove|suggest> [options]',
@@ -64,7 +65,7 @@ const COMMAND_USAGE = {
64
65
  ],
65
66
  update: [
66
67
  'rivet update',
67
- 'Check for the latest CLI and refresh installed agent integrations.',
68
+ 'Update the CLI, restart outdated Rivet servers, and refresh installed agent integrations.',
68
69
  ],
69
70
  version: [
70
71
  'rivet version status',