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.
- package/dist/agent-variants/WorktreeOrchestrator.d.ts +1 -1
- package/dist/agent-variants/WorktreeOrchestrator.d.ts.map +1 -1
- package/dist/agent-variants/WorktreeOrchestrator.js +6 -7
- package/dist/agent-variants/WorktreeOrchestrator.js.map +1 -1
- package/dist/agent-variants/contracts.d.ts +286 -286
- package/dist/agent-variants/guidancePrompt.d.ts.map +1 -1
- package/dist/agent-variants/guidancePrompt.js +17 -0
- package/dist/agent-variants/guidancePrompt.js.map +1 -1
- package/dist/agent-variants/workItemBriefing.d.ts.map +1 -1
- package/dist/agent-variants/workItemBriefing.js +1 -1
- package/dist/agent-variants/workItemBriefing.js.map +1 -1
- package/dist/agent-variants/workItemContextFiles.d.ts.map +1 -1
- package/dist/agent-variants/workItemContextFiles.js +9 -4
- package/dist/agent-variants/workItemContextFiles.js.map +1 -1
- package/dist/cli/commands/contextRequest.d.ts.map +1 -1
- package/dist/cli/commands/contextRequest.js +19 -4
- package/dist/cli/commands/contextRequest.js.map +1 -1
- package/dist/cli/commands/generationPreflight.js +1 -1
- package/dist/cli/commands/generationPreflight.js.map +1 -1
- package/dist/cli/commands/guidanceReferences.d.ts +11 -0
- package/dist/cli/commands/guidanceReferences.d.ts.map +1 -0
- package/dist/cli/commands/guidanceReferences.js +56 -0
- package/dist/cli/commands/guidanceReferences.js.map +1 -0
- package/dist/cli/commands/mcpServe.d.ts.map +1 -1
- package/dist/cli/commands/mcpServe.js +9 -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 +18 -59
- package/dist/cli/commands/open.js.map +1 -1
- package/dist/cli/commands/status.js +1 -1
- package/dist/cli/commands/status.js.map +1 -1
- package/dist/cli/commands/update.d.ts.map +1 -1
- package/dist/cli/commands/update.js +7 -0
- package/dist/cli/commands/update.js.map +1 -1
- package/dist/cli/commands/wait.d.ts.map +1 -1
- package/dist/cli/commands/wait.js +37 -4
- package/dist/cli/commands/wait.js.map +1 -1
- package/dist/cli/entry.d.ts.map +1 -1
- package/dist/cli/entry.js +16 -0
- package/dist/cli/entry.js.map +1 -1
- package/dist/cli/projectRuntimeUpgrade.d.ts +21 -0
- package/dist/cli/projectRuntimeUpgrade.d.ts.map +1 -0
- package/dist/cli/projectRuntimeUpgrade.js +116 -0
- package/dist/cli/projectRuntimeUpgrade.js.map +1 -0
- package/dist/cli/router.d.ts.map +1 -1
- package/dist/cli/router.js +4 -3
- package/dist/cli/router.js.map +1 -1
- package/dist/cli/runtimeInterruption.d.ts +32 -0
- package/dist/cli/runtimeInterruption.d.ts.map +1 -0
- package/dist/cli/runtimeInterruption.js +65 -0
- package/dist/cli/runtimeInterruption.js.map +1 -0
- package/dist/cli/serverVersion.js +1 -1
- package/dist/cli/serverVersion.js.map +1 -1
- package/dist/cli/synchronizeRuntimes.d.ts +19 -0
- package/dist/cli/synchronizeRuntimes.d.ts.map +1 -0
- package/dist/cli/synchronizeRuntimes.js +113 -0
- package/dist/cli/synchronizeRuntimes.js.map +1 -0
- package/dist/library/HubClient.d.ts +2 -0
- package/dist/library/HubClient.d.ts.map +1 -1
- package/dist/library/HubClient.js +48 -9
- package/dist/library/HubClient.js.map +1 -1
- package/dist/routes/cli.d.ts +1 -0
- package/dist/routes/cli.d.ts.map +1 -1
- package/dist/routes/cli.js +11 -4
- package/dist/routes/cli.js.map +1 -1
- package/dist/routes/library/guidance.d.ts.map +1 -1
- package/dist/routes/library/guidance.js +6 -1
- package/dist/routes/library/guidance.js.map +1 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +1 -0
- package/dist/server.js.map +1 -1
- package/dist/services/RuntimeAdmission.d.ts +1 -1
- package/dist/services/RuntimeAdmission.d.ts.map +1 -1
- package/dist/services/RuntimeAdmission.js +3 -2
- package/dist/services/RuntimeAdmission.js.map +1 -1
- package/dist/services/VariantRunService.d.ts +1 -0
- package/dist/services/VariantRunService.d.ts.map +1 -1
- package/dist/services/VariantRunService.js +8 -2
- package/dist/services/VariantRunService.js.map +1 -1
- package/dist/services/guidanceDelivery.d.ts.map +1 -1
- package/dist/services/guidanceDelivery.js +15 -11
- package/dist/services/guidanceDelivery.js.map +1 -1
- package/dist/services/guidanceReferences.d.ts +6 -0
- package/dist/services/guidanceReferences.d.ts.map +1 -0
- package/dist/services/guidanceReferences.js +133 -0
- package/dist/services/guidanceReferences.js.map +1 -0
- package/dist/services/profiles/DesignProfiles.d.ts +66 -1
- package/dist/services/profiles/DesignProfiles.d.ts.map +1 -1
- package/dist/services/profiles/DesignProfiles.js +5 -1
- package/dist/services/profiles/DesignProfiles.js.map +1 -1
- package/dist/services/profiles/ProfilePlanning.d.ts +1 -1
- package/dist/services/runtimeVersion.d.ts +1 -1
- package/dist/services/runtimeVersion.d.ts.map +1 -1
- package/dist/services/runtimeVersion.js +1 -1
- package/dist/services/runtimeVersion.js.map +1 -1
- package/dist/services/stopRuntimeProcess.d.ts +9 -0
- package/dist/services/stopRuntimeProcess.d.ts.map +1 -0
- package/dist/services/stopRuntimeProcess.js +84 -0
- package/dist/services/stopRuntimeProcess.js.map +1 -0
- package/dist/storage/profiles/ProfilePlans.d.ts +4 -4
- package/dist/storage/profiles/ProfileRecords.d.ts +1 -1
- package/dist/storage/profiles/ProfileRecords.d.ts.map +1 -1
- package/dist/storage/profiles/ProfileRecords.js +3 -1
- package/dist/storage/profiles/ProfileRecords.js.map +1 -1
- package/dist/storage/profiles/migrations.d.ts +2 -2
- package/dist/storage/profiles/migrations.d.ts.map +1 -1
- package/dist/storage/profiles/migrations.js +3 -0
- package/dist/storage/profiles/migrations.js.map +1 -1
- package/dist/storage/profiles/planSchema.d.ts +1 -1
- package/dist/storage/profiles/schema.d.ts +29 -1
- package/dist/storage/profiles/schema.d.ts.map +1 -1
- package/dist/storage/profiles/schema.js +1 -0
- package/dist/storage/profiles/schema.js.map +1 -1
- package/dist/types/design-profile.d.ts +2 -2
- package/dist/types/guidance-references.d.ts +230 -0
- package/dist/types/guidance-references.d.ts.map +1 -0
- package/dist/types/guidance-references.js +133 -0
- package/dist/types/guidance-references.js.map +1 -0
- package/dist/types/guidance.d.ts +662 -1
- package/dist/types/guidance.d.ts.map +1 -1
- package/dist/types/guidance.js +10 -2
- package/dist/types/guidance.js.map +1 -1
- package/dist/types/reference-onboarding.d.ts +2 -2
- package/dist/utils/skills/cli-guidance.d.ts +1 -1
- package/dist/utils/skills/cli-guidance.d.ts.map +1 -1
- package/dist/utils/skills/cli-guidance.js +4 -2
- package/dist/utils/skills/cli-guidance.js.map +1 -1
- package/package.json +3 -2
- package/src/ui/dist/assets/{LibraryEntry-B5kPF3Ey.js → LibraryEntry-yoxzWNdQ.js} +1 -1
- package/src/ui/dist/assets/{main-Er_TRZTd.js → main-DlZAsDUG.js} +2 -2
- package/src/ui/dist/index.html +1 -1
package/dist/cli/router.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/cli/router.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAIoB;AACpB,6BAA4D;AAC5D,uCAA0D;AAC1D,+DAAgE;AAChE,2CAKqB;AAErB,+CAAqD;AAA5C,mHAAA,mBAAmB,OAAA;AAE5B,MAAM,aAAa,GAA6B;IAC9C,OAAO,EAAE;QACP,sFAAsF;QACtF,
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/cli/router.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import type { AttachedServer } from './client';
|
|
3
|
+
declare const interruptionSchema: z.ZodObject<{
|
|
4
|
+
receiptPath: z.ZodString;
|
|
5
|
+
serverVersion: z.ZodNullable<z.ZodString>;
|
|
6
|
+
clientVersion: z.ZodString;
|
|
7
|
+
createdAt: z.ZodString;
|
|
8
|
+
workIds: z.ZodArray<z.ZodString, "many">;
|
|
9
|
+
message: z.ZodString;
|
|
10
|
+
}, "strip", z.ZodTypeAny, {
|
|
11
|
+
message: string;
|
|
12
|
+
clientVersion: string;
|
|
13
|
+
createdAt: string;
|
|
14
|
+
receiptPath: string;
|
|
15
|
+
serverVersion: string | null;
|
|
16
|
+
workIds: string[];
|
|
17
|
+
}, {
|
|
18
|
+
message: string;
|
|
19
|
+
clientVersion: string;
|
|
20
|
+
createdAt: string;
|
|
21
|
+
receiptPath: string;
|
|
22
|
+
serverVersion: string | null;
|
|
23
|
+
workIds: string[];
|
|
24
|
+
}>;
|
|
25
|
+
export type RuntimeInterruption = z.infer<typeof interruptionSchema>;
|
|
26
|
+
export declare const recordRuntimeInterruption: ({ attached, snapshot, }: {
|
|
27
|
+
attached: AttachedServer;
|
|
28
|
+
snapshot: unknown;
|
|
29
|
+
}) => RuntimeInterruption;
|
|
30
|
+
export declare const readRuntimeInterruptions: (projectPath: string) => RuntimeInterruption[];
|
|
31
|
+
export {};
|
|
32
|
+
//# sourceMappingURL=runtimeInterruption.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtimeInterruption.d.ts","sourceRoot":"","sources":["../../src/cli/runtimeInterruption.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAG/C,QAAA,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;EAOtB,CAAC;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAyBrE,eAAO,MAAM,yBAAyB,GAAI,yBAGvC;IACD,QAAQ,EAAE,cAAc,CAAC;IACzB,QAAQ,EAAE,OAAO,CAAC;CACnB,KAAG,mBAqBH,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,aAAa,MAAM,KAClB,mBAAmB,EAWrB,CAAC"}
|
|
@@ -0,0 +1,65 @@
|
|
|
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.readRuntimeInterruptions = exports.recordRuntimeInterruption = void 0;
|
|
7
|
+
const fs_1 = __importDefault(require("fs"));
|
|
8
|
+
const path_1 = __importDefault(require("path"));
|
|
9
|
+
const zod_1 = require("zod");
|
|
10
|
+
const crypto_1 = require("crypto");
|
|
11
|
+
const serverHandshake_1 = require("./serverHandshake");
|
|
12
|
+
const telemetry_1 = require("../config/telemetry");
|
|
13
|
+
const interruptionSchema = zod_1.z.object({
|
|
14
|
+
receiptPath: zod_1.z.string(),
|
|
15
|
+
serverVersion: zod_1.z.string().nullable(),
|
|
16
|
+
clientVersion: zod_1.z.string(),
|
|
17
|
+
createdAt: zod_1.z.string(),
|
|
18
|
+
workIds: zod_1.z.array(zod_1.z.string()),
|
|
19
|
+
message: zod_1.z.string(),
|
|
20
|
+
});
|
|
21
|
+
const interruptionDirectory = (projectPath) => path_1.default.join((0, serverHandshake_1.serverRuntimeDirectory)(projectPath), 'interruptions');
|
|
22
|
+
const collectWorkIds = (value) => {
|
|
23
|
+
if (Array.isArray(value))
|
|
24
|
+
return value.flatMap(collectWorkIds);
|
|
25
|
+
if (!value || typeof value !== 'object')
|
|
26
|
+
return [];
|
|
27
|
+
if ('status' in value &&
|
|
28
|
+
['succeeded', 'failed', 'cancelled'].includes(String(value.status)))
|
|
29
|
+
return 'refinement' in value ? collectWorkIds(value.refinement) : [];
|
|
30
|
+
return Object.entries(value).flatMap(([key, item]) => {
|
|
31
|
+
if (['workId', 'workItemId', 'requestId', 'agentRunId', 'traceId'].includes(key) &&
|
|
32
|
+
typeof item === 'string')
|
|
33
|
+
return [item];
|
|
34
|
+
return collectWorkIds(item);
|
|
35
|
+
});
|
|
36
|
+
};
|
|
37
|
+
const recordRuntimeInterruption = ({ attached, snapshot, }) => {
|
|
38
|
+
const directory = interruptionDirectory(attached.handshake.projectPath);
|
|
39
|
+
fs_1.default.mkdirSync(directory, { recursive: true, mode: 0o700 });
|
|
40
|
+
const receiptPath = path_1.default.join(directory, `${(0, crypto_1.randomUUID)()}.json`);
|
|
41
|
+
const interruption = {
|
|
42
|
+
receiptPath,
|
|
43
|
+
serverVersion: attached.handshake.rivetVersion ?? null,
|
|
44
|
+
clientVersion: telemetry_1.RIVET_VERSION,
|
|
45
|
+
createdAt: new Date().toISOString(),
|
|
46
|
+
workIds: Array.from(new Set(collectWorkIds(snapshot))),
|
|
47
|
+
message: 'Rivet interrupted this work to upgrade its server. Restart the original request with the updated CLI. Saved completed directions remain in history; the previous session and leases no longer apply.',
|
|
48
|
+
};
|
|
49
|
+
const temporaryPath = `${receiptPath}.tmp`;
|
|
50
|
+
fs_1.default.writeFileSync(temporaryPath, JSON.stringify({ ...interruption, snapshot }), { mode: 0o600, flag: 'wx' });
|
|
51
|
+
fs_1.default.renameSync(temporaryPath, receiptPath);
|
|
52
|
+
return interruption;
|
|
53
|
+
};
|
|
54
|
+
exports.recordRuntimeInterruption = recordRuntimeInterruption;
|
|
55
|
+
const readRuntimeInterruptions = (projectPath) => {
|
|
56
|
+
const directory = interruptionDirectory(projectPath);
|
|
57
|
+
if (!fs_1.default.existsSync(directory))
|
|
58
|
+
return [];
|
|
59
|
+
return fs_1.default
|
|
60
|
+
.readdirSync(directory)
|
|
61
|
+
.filter((name) => name.endsWith('.json'))
|
|
62
|
+
.map((name) => interruptionSchema.parse(JSON.parse(fs_1.default.readFileSync(path_1.default.join(directory, name), 'utf8'))));
|
|
63
|
+
};
|
|
64
|
+
exports.readRuntimeInterruptions = readRuntimeInterruptions;
|
|
65
|
+
//# sourceMappingURL=runtimeInterruption.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtimeInterruption.js","sourceRoot":"","sources":["../../src/cli/runtimeInterruption.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ const versionEnvelopeFields = (handshake) => {
|
|
|
22
22
|
...(info.staleServer
|
|
23
23
|
? {
|
|
24
24
|
staleServer: true,
|
|
25
|
-
upgradeHint: 'The project server is running an older
|
|
25
|
+
upgradeHint: 'The project server is running an older Rivet than this CLI. Run `rivet open` to restart it now. Interrupted work will need to be retried; saved directions remain available.',
|
|
26
26
|
}
|
|
27
27
|
: {}),
|
|
28
28
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverVersion.js","sourceRoot":"","sources":["../../src/cli/serverVersion.ts"],"names":[],"mappings":";;;AAAA,+DAAsE;AACtE,6DAA4D;AAAnD,gHAAA,cAAc,OAAA;AACvB,mDAAoD;AAS7C,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,EAAE,CAAC,IAAA,yCAAwB,EAAC,yBAAa,EAAE,aAAa,CAAC;KACrE,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,iBAAiB,qBAS5B;AAEK,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,
|
|
1
|
+
{"version":3,"file":"serverVersion.js","sourceRoot":"","sources":["../../src/cli/serverVersion.ts"],"names":[],"mappings":";;;AAAA,+DAAsE;AACtE,6DAA4D;AAAnD,gHAAA,cAAc,OAAA;AACvB,mDAAoD;AAS7C,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,EAAE,CAAC,IAAA,yCAAwB,EAAC,yBAAa,EAAE,aAAa,CAAC;KACrE,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,iBAAiB,qBAS5B;AAEK,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,8KAA8K;aACjL;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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { type ProjectRuntimeDependencies } from './commands/open';
|
|
2
|
+
import type { CliIO } from './io';
|
|
3
|
+
interface RuntimeSynchronization {
|
|
4
|
+
wasCoordinatorRestarted: boolean;
|
|
5
|
+
projectsRestarted: number;
|
|
6
|
+
failures: Array<{
|
|
7
|
+
projectPath?: string;
|
|
8
|
+
message: string;
|
|
9
|
+
}>;
|
|
10
|
+
}
|
|
11
|
+
interface SynchronizationOptions {
|
|
12
|
+
args: string[];
|
|
13
|
+
io: CliIO;
|
|
14
|
+
env?: NodeJS.ProcessEnv;
|
|
15
|
+
runtimeDependencies?: ProjectRuntimeDependencies;
|
|
16
|
+
}
|
|
17
|
+
export declare const synchronizeRuntimes: ({ args, io, env, runtimeDependencies, }: SynchronizationOptions) => Promise<RuntimeSynchronization>;
|
|
18
|
+
export {};
|
|
19
|
+
//# sourceMappingURL=synchronizeRuntimes.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"synchronizeRuntimes.d.ts","sourceRoot":"","sources":["../../src/cli/synchronizeRuntimes.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,KAAK,0BAA0B,EAChC,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAElC,UAAU,sBAAsB;IAC9B,uBAAuB,EAAE,OAAO,CAAC;IACjC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,KAAK,CAAC;QAAE,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC5D;AACD,UAAU,sBAAsB;IAC9B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,EAAE,EAAE,KAAK,CAAC;IACV,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,mBAAmB,CAAC,EAAE,0BAA0B,CAAC;CAClD;AASD,eAAO,MAAM,mBAAmB,GAAU,yCAKvC,sBAAsB,KAAG,OAAO,CAAC,sBAAsB,CAoFzD,CAAC"}
|
|
@@ -0,0 +1,113 @@
|
|
|
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.synchronizeRuntimes = void 0;
|
|
7
|
+
const fs_1 = __importDefault(require("fs"));
|
|
8
|
+
const path_1 = __importDefault(require("path"));
|
|
9
|
+
const HubDiscovery_1 = require("../services/HubDiscovery");
|
|
10
|
+
const ProjectRegistry_1 = require("../services/ProjectRegistry");
|
|
11
|
+
const ProjectLibrary_1 = require("../services/ProjectLibrary");
|
|
12
|
+
const HubClient_1 = require("../library/HubClient");
|
|
13
|
+
const serverHandshake_1 = require("./serverHandshake");
|
|
14
|
+
const serverVersion_1 = require("./serverVersion");
|
|
15
|
+
const open_1 = require("./commands/open");
|
|
16
|
+
const shared_1 = require("./commands/shared");
|
|
17
|
+
const flagValue = (args, flag) => {
|
|
18
|
+
const index = args.indexOf(flag);
|
|
19
|
+
return index >= 0
|
|
20
|
+
? args[index + 1]
|
|
21
|
+
: args.find((arg) => arg.startsWith(`${flag}=`))?.slice(flag.length + 1);
|
|
22
|
+
};
|
|
23
|
+
const synchronizeRuntimes = async ({ args, io, env = process.env, runtimeDependencies, }) => {
|
|
24
|
+
const result = {
|
|
25
|
+
wasCoordinatorRestarted: false,
|
|
26
|
+
projectsRestarted: 0,
|
|
27
|
+
failures: [],
|
|
28
|
+
};
|
|
29
|
+
const root = (0, ProjectLibrary_1.currentLibraryRoot)(env);
|
|
30
|
+
let registry;
|
|
31
|
+
let discovery;
|
|
32
|
+
try {
|
|
33
|
+
registry = await ProjectRegistry_1.ProjectRegistry.open(root);
|
|
34
|
+
discovery = await HubDiscovery_1.HubDiscovery.open(root);
|
|
35
|
+
const coordinator = discovery.read();
|
|
36
|
+
if (coordinator && (0, serverHandshake_1.isPidAlive)(coordinator.pid)) {
|
|
37
|
+
try {
|
|
38
|
+
await (0, HubClient_1.ensureHub)({ root, env });
|
|
39
|
+
result.wasCoordinatorRestarted =
|
|
40
|
+
discovery.read()?.pid !== coordinator.pid;
|
|
41
|
+
}
|
|
42
|
+
catch (error) {
|
|
43
|
+
result.failures.push({
|
|
44
|
+
message: error instanceof Error ? error.message : String(error),
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
const candidates = new Set([
|
|
49
|
+
path_1.default.resolve(flagValue(args, '--project') ?? process.cwd()),
|
|
50
|
+
...registry
|
|
51
|
+
.list()
|
|
52
|
+
.map((project) => project.id)
|
|
53
|
+
.flatMap(registry.historyRoots.bind(registry)),
|
|
54
|
+
]);
|
|
55
|
+
for (const candidate of candidates) {
|
|
56
|
+
if (!fs_1.default.existsSync(candidate))
|
|
57
|
+
continue;
|
|
58
|
+
let projectPath = candidate;
|
|
59
|
+
try {
|
|
60
|
+
projectPath = fs_1.default.realpathSync(candidate);
|
|
61
|
+
const handshake = (0, serverHandshake_1.readHandshake)(projectPath);
|
|
62
|
+
if (!handshake ||
|
|
63
|
+
!(0, serverHandshake_1.isPidAlive)(handshake.pid) ||
|
|
64
|
+
!(0, serverVersion_1.serverVersionInfo)(handshake).staleServer)
|
|
65
|
+
continue;
|
|
66
|
+
const handoffArgs = [
|
|
67
|
+
'--caller-agent',
|
|
68
|
+
'--caller-model',
|
|
69
|
+
'--caller-session',
|
|
70
|
+
'--handoff',
|
|
71
|
+
].flatMap((flag) => {
|
|
72
|
+
const value = flagValue(args, flag);
|
|
73
|
+
return value ? [flag, value] : [];
|
|
74
|
+
});
|
|
75
|
+
const context = (0, shared_1.parseCommandContext)('open', [
|
|
76
|
+
'--project',
|
|
77
|
+
projectPath,
|
|
78
|
+
...handoffArgs,
|
|
79
|
+
]);
|
|
80
|
+
if ((0, shared_1.isCommandResult)(context))
|
|
81
|
+
throw new Error('Could not resolve the project upgrade context.');
|
|
82
|
+
const opened = await (0, open_1.ensureProjectRuntime)(context, io, {
|
|
83
|
+
...runtimeDependencies,
|
|
84
|
+
env,
|
|
85
|
+
});
|
|
86
|
+
if (!opened.envelope.ok)
|
|
87
|
+
throw new Error(opened.envelope.error.message);
|
|
88
|
+
const current = (0, serverHandshake_1.readHandshake)(projectPath);
|
|
89
|
+
if (!current || (0, serverVersion_1.serverVersionInfo)(current).staleServer)
|
|
90
|
+
throw new Error('The replacement server is still outdated.');
|
|
91
|
+
result.projectsRestarted += 1;
|
|
92
|
+
}
|
|
93
|
+
catch (error) {
|
|
94
|
+
result.failures.push({
|
|
95
|
+
projectPath,
|
|
96
|
+
message: error instanceof Error ? error.message : String(error),
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
catch (error) {
|
|
102
|
+
result.failures.push({
|
|
103
|
+
message: error instanceof Error ? error.message : String(error),
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
finally {
|
|
107
|
+
discovery?.close();
|
|
108
|
+
registry?.close();
|
|
109
|
+
}
|
|
110
|
+
return result;
|
|
111
|
+
};
|
|
112
|
+
exports.synchronizeRuntimes = synchronizeRuntimes;
|
|
113
|
+
//# sourceMappingURL=synchronizeRuntimes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"synchronizeRuntimes.js","sourceRoot":"","sources":["../../src/cli/synchronizeRuntimes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { HubDiscovery } from '../services/HubDiscovery';
|
|
1
2
|
export interface ConnectedHub {
|
|
2
3
|
url: string;
|
|
3
4
|
token: string;
|
|
@@ -20,6 +21,7 @@ export declare class LibraryRequestError extends Error {
|
|
|
20
21
|
});
|
|
21
22
|
}
|
|
22
23
|
export declare const findHub: (root: string) => Promise<ConnectedHub | null>;
|
|
24
|
+
export declare const waitForHub: (discovery: HubDiscovery, isStopped?: () => boolean) => Promise<ConnectedHub | null>;
|
|
23
25
|
export declare const ensureHub: ({ root, env, }: {
|
|
24
26
|
root: string;
|
|
25
27
|
env?: NodeJS.ProcessEnv;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HubClient.d.ts","sourceRoot":"","sources":["../../src/library/HubClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"HubClient.d.ts","sourceRoot":"","sources":["../../src/library/HubClient.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAkB,MAAM,0BAA0B,CAAC;AAOxE,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AACD,UAAU,UAAU;IAClB,GAAG,EAAE,YAAY,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AACD,qBAAa,mBAAoB,SAAQ,KAAK;IAC5C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;gBAEX,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE;CAMtE;AAiDD,eAAO,MAAM,OAAO,GAAU,MAAM,MAAM,KAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAYvE,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,WAAW,YAAY,EACvB,YAAW,MAAM,OAAqB,KACrC,OAAO,CAAC,YAAY,GAAG,IAAI,CAY7B,CAAC;AAEF,eAAO,MAAM,SAAS,GAAU,gBAG7B;IACD,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB,KAAG,OAAO,CAAC,YAAY,CAqFvB,CAAC;AAEF,eAAO,MAAM,UAAU,GAAU,CAAC,EAAE,gEAOjC,UAAU,KAAG,OAAO,CAAC,CAAC,CAqCxB,CAAC"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.requestHub = exports.ensureHub = exports.findHub = exports.LibraryRequestError = void 0;
|
|
6
|
+
exports.requestHub = exports.ensureHub = exports.waitForHub = exports.findHub = exports.LibraryRequestError = void 0;
|
|
7
7
|
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
9
|
const child_process_1 = require("child_process");
|
|
@@ -13,6 +13,7 @@ const pid_1 = require("../utils/pid");
|
|
|
13
13
|
const telemetry_1 = require("../config/telemetry");
|
|
14
14
|
const runtimeVersion_1 = require("../services/runtimeVersion");
|
|
15
15
|
const hubPort_1 = require("./hubPort");
|
|
16
|
+
const stopRuntimeProcess_1 = require("../services/stopRuntimeProcess");
|
|
16
17
|
class LibraryRequestError extends Error {
|
|
17
18
|
status;
|
|
18
19
|
body;
|
|
@@ -28,6 +29,8 @@ const START_TIMEOUT_MS = 20_000;
|
|
|
28
29
|
const POLL_INTERVAL_MS = 100;
|
|
29
30
|
const HEALTH_TIMEOUT_MS = 1_000;
|
|
30
31
|
const REQUEST_TIMEOUT_MS = 120_000;
|
|
32
|
+
class CoordinatorUpgradeRequired extends Error {
|
|
33
|
+
}
|
|
31
34
|
const connect = async (record) => {
|
|
32
35
|
if (!record?.port || !(0, pid_1.isPidAlive)(record.pid))
|
|
33
36
|
return null;
|
|
@@ -59,14 +62,21 @@ const connect = async (record) => {
|
|
|
59
62
|
const version = typeof runningVersion === 'string'
|
|
60
63
|
? `v${runningVersion}`
|
|
61
64
|
: 'an unversioned build';
|
|
62
|
-
throw new
|
|
65
|
+
throw new CoordinatorUpgradeRequired(`The shared Rivet coordinator (PID ${record.pid}) is running ${version}; this CLI requires v${telemetry_1.RIVET_VERSION} or newer. Run \`rivet open\` to restart it.`);
|
|
63
66
|
}
|
|
64
67
|
return { url, token: record.token };
|
|
65
68
|
};
|
|
66
69
|
const findHub = async (root) => {
|
|
67
70
|
const discovery = await HubDiscovery_1.HubDiscovery.open(root);
|
|
68
71
|
try {
|
|
69
|
-
|
|
72
|
+
try {
|
|
73
|
+
return await connect(discovery.read());
|
|
74
|
+
}
|
|
75
|
+
catch (error) {
|
|
76
|
+
if (!(error instanceof CoordinatorUpgradeRequired))
|
|
77
|
+
throw error;
|
|
78
|
+
return await (0, exports.ensureHub)({ root });
|
|
79
|
+
}
|
|
70
80
|
}
|
|
71
81
|
finally {
|
|
72
82
|
discovery.close();
|
|
@@ -79,21 +89,50 @@ const waitForHub = async (discovery, isStopped = () => false) => {
|
|
|
79
89
|
const hub = await connect(discovery.read());
|
|
80
90
|
if (hub)
|
|
81
91
|
return hub;
|
|
82
|
-
if (isStopped())
|
|
83
|
-
|
|
92
|
+
if (isStopped()) {
|
|
93
|
+
const owner = discovery.read();
|
|
94
|
+
if (!owner || !(0, pid_1.isPidAlive)(owner.pid))
|
|
95
|
+
return null;
|
|
96
|
+
}
|
|
84
97
|
await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
|
|
85
98
|
}
|
|
86
99
|
return null;
|
|
87
100
|
};
|
|
101
|
+
exports.waitForHub = waitForHub;
|
|
88
102
|
const ensureHub = async ({ root, env = process.env, }) => {
|
|
89
103
|
const discovery = await HubDiscovery_1.HubDiscovery.open(root);
|
|
90
104
|
try {
|
|
91
105
|
const initial = discovery.read();
|
|
92
|
-
|
|
106
|
+
let connected;
|
|
107
|
+
try {
|
|
108
|
+
connected = await connect(initial);
|
|
109
|
+
}
|
|
110
|
+
catch (error) {
|
|
111
|
+
if (!(error instanceof CoordinatorUpgradeRequired) ||
|
|
112
|
+
!initial ||
|
|
113
|
+
initial.pid === process.pid)
|
|
114
|
+
throw error;
|
|
115
|
+
await (0, stopRuntimeProcess_1.stopRuntimeProcess)({
|
|
116
|
+
pid: initial.pid,
|
|
117
|
+
isOwned: async () => {
|
|
118
|
+
const current = discovery.read();
|
|
119
|
+
if (current?.pid !== initial.pid || current.token !== initial.token)
|
|
120
|
+
return false;
|
|
121
|
+
try {
|
|
122
|
+
await connect(initial);
|
|
123
|
+
return false;
|
|
124
|
+
}
|
|
125
|
+
catch (failure) {
|
|
126
|
+
return failure instanceof CoordinatorUpgradeRequired;
|
|
127
|
+
}
|
|
128
|
+
},
|
|
129
|
+
});
|
|
130
|
+
connected = null;
|
|
131
|
+
}
|
|
93
132
|
if (connected)
|
|
94
133
|
return connected;
|
|
95
134
|
if (initial?.port === null && (0, pid_1.isPidAlive)(initial.pid)) {
|
|
96
|
-
const starting = await waitForHub(discovery);
|
|
135
|
+
const starting = await (0, exports.waitForHub)(discovery);
|
|
97
136
|
if (starting)
|
|
98
137
|
return starting;
|
|
99
138
|
}
|
|
@@ -126,7 +165,7 @@ const ensureHub = async ({ root, env = process.env, }) => {
|
|
|
126
165
|
finally {
|
|
127
166
|
fs_1.default.closeSync(output);
|
|
128
167
|
}
|
|
129
|
-
const started = await waitForHub(discovery, () => childExited);
|
|
168
|
+
const started = await (0, exports.waitForHub)(discovery, () => childExited);
|
|
130
169
|
if (started)
|
|
131
170
|
return started;
|
|
132
171
|
const startupLog = fs_1.default.readFileSync(logPath, 'utf8').slice(logOffset);
|
|
@@ -134,7 +173,7 @@ const ensureHub = async ({ root, env = process.env, }) => {
|
|
|
134
173
|
throw new Error(`Rivet could not bind localhost:${port}: the port is in use. Stop the other process or set RIVET_LIBRARY_PORT to an available port.`);
|
|
135
174
|
throw new Error(`The shared Rivet application did not become ready. See ${logPath}`);
|
|
136
175
|
}
|
|
137
|
-
const hub = await waitForHub(discovery);
|
|
176
|
+
const hub = await (0, exports.waitForHub)(discovery);
|
|
138
177
|
if (hub)
|
|
139
178
|
return hub;
|
|
140
179
|
throw new Error(`The shared Rivet application did not become ready. See ${path_1.default.join(root, 'runtime', 'coordinator.log')}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HubClient.js","sourceRoot":"","sources":["../../src/library/HubClient.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,iDAAsC;AACtC,6BAAwB;AACxB,2DAAwE;AACxE,sCAA0C;AAC1C,mDAAoD;AACpD,+DAAsE;AACtE,uCAAoC;
|
|
1
|
+
{"version":3,"file":"HubClient.js","sourceRoot":"","sources":["../../src/library/HubClient.ts"],"names":[],"mappings":"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"}
|
package/dist/routes/cli.d.ts
CHANGED
|
@@ -9,6 +9,7 @@ export type CreateCliRouterOptions = {
|
|
|
9
9
|
rivetPort: number;
|
|
10
10
|
queueAccessToken?: string | null;
|
|
11
11
|
onShutdown?: () => void;
|
|
12
|
+
beforeUpgrade?: () => void;
|
|
12
13
|
admission?: RuntimeAdmission;
|
|
13
14
|
restartArgs?: string[];
|
|
14
15
|
inlineStart?: Pick<InlineStartTracker, 'isStarting'>;
|
package/dist/routes/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/routes/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAA+B,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/routes/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAA+B,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAM/D,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,oBAAoB,CAAC;IAC7B,YAAY,CAAC,EAAE,yBAAyB,CAAC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,CAAC,EAAE,IAAI,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC;CACtD,CAAC;AAWF,eAAO,MAAM,eAAe,GAAI,SAAS,sBAAsB,KAAG,MAyIjE,CAAC"}
|
package/dist/routes/cli.js
CHANGED
|
@@ -7,6 +7,7 @@ const runtimeActivity_1 = require("../services/runtimeActivity");
|
|
|
7
7
|
const telemetry_1 = require("../config/telemetry");
|
|
8
8
|
const loopback_1 = require("../utils/loopback");
|
|
9
9
|
const queueAccess_1 = require("../utils/queueAccess");
|
|
10
|
+
const runtimeInterruption_1 = require("../cli/runtimeInterruption");
|
|
10
11
|
const rejectNonLocalRequest = (req, res) => {
|
|
11
12
|
if ((0, loopback_1.isLoopbackAddress)(req.socket.remoteAddress))
|
|
12
13
|
return false;
|
|
@@ -38,6 +39,7 @@ const createCliRouter = (options) => {
|
|
|
38
39
|
const readStatus = () => {
|
|
39
40
|
const runtimeInfo = bridge.getSessionRuntimeInfo();
|
|
40
41
|
const activeRun = bridge.getActiveRunCorrelation();
|
|
42
|
+
const projectPath = bridge.getProjectPath();
|
|
41
43
|
return {
|
|
42
44
|
session: {
|
|
43
45
|
isActive: bridge.isActive(),
|
|
@@ -65,6 +67,9 @@ const createCliRouter = (options) => {
|
|
|
65
67
|
rivetPort,
|
|
66
68
|
rivetVersion: telemetry_1.RIVET_VERSION,
|
|
67
69
|
upgrade: admission.status(),
|
|
70
|
+
runtimeInterruptions: projectPath
|
|
71
|
+
? (0, runtimeInterruption_1.readRuntimeInterruptions)(projectPath)
|
|
72
|
+
: [],
|
|
68
73
|
};
|
|
69
74
|
};
|
|
70
75
|
router.get('/status', (req, res) => {
|
|
@@ -98,16 +103,17 @@ const createCliRouter = (options) => {
|
|
|
98
103
|
return;
|
|
99
104
|
}
|
|
100
105
|
const activity = (0, runtimeActivity_1.classifyRuntimeActivity)(readStatus());
|
|
101
|
-
if (!admission.beginRetirement(activity)) {
|
|
106
|
+
if (!admission.beginRetirement(activity, true)) {
|
|
102
107
|
res.status(409).json({
|
|
103
|
-
reason:
|
|
104
|
-
error: 'Rivet is
|
|
108
|
+
reason: 'server_retiring',
|
|
109
|
+
error: 'Rivet is already restarting. Retry after the runtime handoff completes.',
|
|
105
110
|
upgrade: admission.status(),
|
|
106
111
|
});
|
|
107
112
|
return;
|
|
108
113
|
}
|
|
109
114
|
try {
|
|
110
|
-
if (orchestrator &&
|
|
115
|
+
if (orchestrator &&
|
|
116
|
+
!(await orchestrator.isHistoryDurableForRestart(true))) {
|
|
111
117
|
admission.cancelRetirement();
|
|
112
118
|
res.status(409).json({
|
|
113
119
|
reason: 'history_not_durable',
|
|
@@ -126,6 +132,7 @@ const createCliRouter = (options) => {
|
|
|
126
132
|
});
|
|
127
133
|
return;
|
|
128
134
|
}
|
|
135
|
+
options.beforeUpgrade?.();
|
|
129
136
|
res.json({
|
|
130
137
|
stopping: true,
|
|
131
138
|
restartArgs: options.restartArgs,
|
package/dist/routes/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/routes/cli.ts"],"names":[],"mappings":";;;AAAA,qCAA8D;AAC9D,mEAAgE;AAChE,iEAAsE;AAItE,mDAAoD;AACpD,gDAAsD;AACtD,sDAA+D;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/routes/cli.ts"],"names":[],"mappings":";;;AAAA,qCAA8D;AAC9D,mEAAgE;AAChE,iEAAsE;AAItE,mDAAoD;AACpD,gDAAsD;AACtD,sDAA+D;AAC/D,oEAAsE;AActE,MAAM,qBAAqB,GAAG,CAAC,GAAY,EAAE,GAAa,EAAW,EAAE;IACrE,IAAI,IAAA,4BAAiB,EAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;QACnB,KAAK,EAAE,6DAA6D;QACpE,MAAM,EAAE,mBAAmB;KAC5B,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,CAAC,OAA+B,EAAU,EAAE;IACzE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;IACtE,MAAM,MAAM,GAAG,IAAA,gBAAM,GAAE,CAAC;IACxB,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,mCAAgB,CAAC,yBAAa,CAAC,CAAC;IAE3E,MAAM,kBAAkB,GAAG,CAAC,GAAY,EAAE,GAAa,EAAW,EAAE;QAClE,IAAI,qBAAqB,CAAC,GAAG,EAAE,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC;QACjD,IACE,CAAC,IAAA,qCAAuB,EAAC;YACvB,gBAAgB;YAChB,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;SACtC,CAAC,EACF,CAAC;YACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,KAAK,EAAE,qBAAqB;gBAC5B,MAAM,EAAE,sBAAsB;aAC/B,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,MAAM,WAAW,GAAG,MAAM,CAAC,qBAAqB,EAAE,CAAC;QACnD,MAAM,SAAS,GAAG,MAAM,CAAC,uBAAuB,EAAE,CAAC;QACnD,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,EAAE,CAAC;QAC5C,OAAO;YACL,OAAO,EAAE;gBACP,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;gBAC3B,SAAS,EAAE,MAAM,CAAC,YAAY,EAAE;gBAChC,WAAW,EAAE,MAAM,CAAC,cAAc,EAAE;gBACpC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE;gBAC1B,eAAe,EAAE,MAAM,CAAC,kBAAkB,EAAE;gBAC5C,SAAS,EAAE,WAAW,CAAC,gBAAgB;gBACvC,cAAc,EAAE,WAAW,CAAC,cAAc;gBAC1C,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;aAC/C;YACD,KAAK,EAAE;gBACL,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC;gBACtC,OAAO,EAAE,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC;gBAC1C,MAAM,EAAE,MAAM,CAAC,sBAAsB,EAAE;gBACvC,MAAM,EAAE,MAAM,CAAC,sBAAsB,EAAE;aACxC;YACD,SAAS;YACT,iBAAiB,EAAE,MAAM,CAAC,oBAAoB,EAAE;YAChD,QAAQ,EAAE;gBACR,GAAG,CAAC,YAAY,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;gBAC7D,QAAQ,EAAE,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,IAAI,KAAK;aACrD;YACD,eAAe,EAAE,MAAM,CAAC,kBAAkB,EAAE;YAC5C,SAAS;YACT,YAAY,EAAE,yBAAa;YAC3B,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE;YAC3B,oBAAoB,EAAE,WAAW;gBAC/B,CAAC,CAAC,IAAA,8CAAwB,EAAC,WAAW,CAAC;gBACvC,CAAC,CAAC,EAAE;SACP,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACjC,IAAI,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC;YAAE,OAAO;QACzC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;QACnD,IAAI,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC;YAAE,OAAO;QACzC,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC5B,MAAM,aAAa,GAAY,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC;YACvD,IACE,OAAO,aAAa,KAAK,QAAQ;gBACjC,CAAC,8BAA8B,CAAC,IAAI,CAAC,aAAa,CAAC,EACnD,CAAC;gBACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,oCAAoC,EAAE,CAAC,CAAC;gBACtE,OAAO;YACT,CAAC;YACD,SAAS,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;QACzC,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,KAAK,EACH,qEAAqE;gBACvE,MAAM,EAAE,sBAAsB;aAC/B,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YAC7B,SAAS,CAAC,aAAa,EAAE,CAAC;YAC1B,GAAG,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC1D,YAAY,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAC3C,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GAAG,IAAA,yCAAuB,EAAC,UAAU,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;YAC/C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,MAAM,EAAE,iBAAiB;gBACzB,KAAK,EACH,yEAAyE;gBAC3E,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE;aAC5B,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,IAAI,CAAC;YACH,IACE,YAAY;gBACZ,CAAC,CAAC,MAAM,YAAY,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC,EACtD,CAAC;gBACD,SAAS,CAAC,gBAAgB,EAAE,CAAC;gBAC7B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACnB,MAAM,EAAE,qBAAqB;oBAC7B,KAAK,EACH,uJAAuJ;oBACzJ,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE;iBAC5B,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,SAAS,CAAC,gBAAgB,EAAE,CAAC;YAC7B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,MAAM,EAAE,qBAAqB;gBAC7B,KAAK,EACH,iEAAiE;gBACnE,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE;aAC5B,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;QAC1B,GAAG,CAAC,IAAI,CAAC;YACP,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE;SAC5B,CAAC,CAAC;QACH,YAAY,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAC7C,CAAC,CAAC;IACF,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAChC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAEjC,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAzIW,QAAA,eAAe,mBAyI1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"guidance.d.ts","sourceRoot":"","sources":["../../../src/routes/library/guidance.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EAIP,MAAM,SAAS,CAAC;AAEjB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,KAAK,EAEV,gBAAgB,EACjB,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"guidance.d.ts","sourceRoot":"","sources":["../../../src/routes/library/guidance.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EAIP,MAAM,SAAS,CAAC;AAEjB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,KAAK,EAEV,gBAAgB,EACjB,MAAM,iCAAiC,CAAC;AA4CzC,eAAO,MAAM,oBAAoB,GAC/B,UAAU,cAAc,EACxB,YAAY,gBAAgB,KAC3B,MAyFF,CAAC"}
|
|
@@ -20,7 +20,12 @@ const callerAccount = (req) => zod_1.z.string().min(1).optional().parse(req.get(
|
|
|
20
20
|
const describeDocuments = (res, documents) => {
|
|
21
21
|
res.locals.guidanceMetadata = {
|
|
22
22
|
documentCount: documents.length,
|
|
23
|
-
byteCount: (0, guidance_1.guidancePayloadByteLength)(documents.map(({ id, title, markdown }) => ({
|
|
23
|
+
byteCount: (0, guidance_1.guidancePayloadByteLength)(documents.map(({ id, title, markdown, references }) => ({
|
|
24
|
+
id,
|
|
25
|
+
title,
|
|
26
|
+
markdown,
|
|
27
|
+
...(references ? { references } : {}),
|
|
28
|
+
}))),
|
|
24
29
|
};
|
|
25
30
|
};
|
|
26
31
|
const createGuidanceRoutes = (profiles, telemetry) => {
|