rivet-design 0.14.5 → 0.14.7
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/WorkerExecutorService.d.ts +15 -0
- package/dist/agent-variants/WorkerExecutorService.d.ts.map +1 -1
- package/dist/agent-variants/WorkerExecutorService.js +115 -5
- package/dist/agent-variants/WorkerExecutorService.js.map +1 -1
- package/dist/cli/commands/reference.d.ts.map +1 -1
- package/dist/cli/commands/reference.js +77 -3
- package/dist/cli/commands/reference.js.map +1 -1
- package/dist/cli/commands/serve.d.ts.map +1 -1
- package/dist/cli/commands/serve.js +33 -2
- package/dist/cli/commands/serve.js.map +1 -1
- package/dist/hosts/workerDefaults.d.ts +21 -19
- package/dist/hosts/workerDefaults.d.ts.map +1 -1
- package/dist/hosts/workerDefaults.js +24 -25
- package/dist/hosts/workerDefaults.js.map +1 -1
- package/dist/services/CliLogForwarder.d.ts +45 -0
- package/dist/services/CliLogForwarder.d.ts.map +1 -0
- package/dist/services/CliLogForwarder.js +162 -0
- package/dist/services/CliLogForwarder.js.map +1 -0
- package/dist/services/IntegrationsClient.d.ts +5 -0
- package/dist/services/IntegrationsClient.d.ts.map +1 -1
- package/dist/services/IntegrationsClient.js.map +1 -1
- package/dist/services/TelemetryService.d.ts +25 -0
- package/dist/services/TelemetryService.d.ts.map +1 -1
- package/dist/services/TelemetryService.js +29 -0
- package/dist/services/TelemetryService.js.map +1 -1
- package/dist/utils/skills/claude-skill.d.ts +1 -1
- package/dist/utils/skills/claude-skill.d.ts.map +1 -1
- 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 +1 -1
- package/dist/utils/skills/cursor-rules.d.ts +1 -1
- package/dist/utils/skills/cursor-rules.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/ui/dist/assets/main-BqM5p5EF.js +422 -0
- package/src/ui/dist/index.html +1 -1
- package/src/ui/dist/assets/main-CKRVbfJs.js +0 -422
|
@@ -32,6 +32,17 @@ type ReportCompleteArgs = {
|
|
|
32
32
|
model?: string;
|
|
33
33
|
costUsd?: number;
|
|
34
34
|
};
|
|
35
|
+
/** True when a worker failure message implicates model access rather than
|
|
36
|
+
* the work itself: unknown/invalid model, no access on this account, or a
|
|
37
|
+
* model-scoped rate limit. Deliberately conservative — ordinary failures
|
|
38
|
+
* must never silently downgrade the worker model, so matching requires
|
|
39
|
+
* either rate-limit grammar, an anchored model-error phrase, or the exact
|
|
40
|
+
* model id appearing alongside an availability word. */
|
|
41
|
+
export declare const isModelAvailabilityFailure: (message: string | undefined, model?: string) => boolean;
|
|
42
|
+
/** Normalized failure category for telemetry — the tracking spec forbids
|
|
43
|
+
* raw exception messages in event payloads. The structured API status wins
|
|
44
|
+
* over text: a 429 is rate-limited whatever the result text says. */
|
|
45
|
+
export declare const modelFailureReason: (message: string | undefined, apiErrorStatus?: number) => "model_rate_limited" | "model_unavailable";
|
|
35
46
|
/** Structural seam onto the orchestrator — keeps this module cycle-free and
|
|
36
47
|
* lets tests drive the executor with a fake. */
|
|
37
48
|
export interface ExecutorOrchestrator {
|
|
@@ -69,6 +80,8 @@ export type WorkerExecutorOptions = {
|
|
|
69
80
|
/** Tier for reference-backed create items (see workerDefaults). */
|
|
70
81
|
referenceCreateModel?: string;
|
|
71
82
|
referenceCreateEffort?: WorkerEffortLevel | string;
|
|
83
|
+
/** Retry-once model when a worker fails with a model-availability error. */
|
|
84
|
+
fallbackModel?: string;
|
|
72
85
|
timeoutMs?: number;
|
|
73
86
|
maxConcurrent?: number;
|
|
74
87
|
spawnWorker?: WorkerSpawn;
|
|
@@ -86,6 +99,8 @@ export declare class WorkerExecutorService {
|
|
|
86
99
|
private readonly workerCommand;
|
|
87
100
|
private readonly workerModel;
|
|
88
101
|
private readonly workerEffort;
|
|
102
|
+
/** Degradation target when the tier model is unavailable on the account. */
|
|
103
|
+
private readonly fallbackModel;
|
|
89
104
|
private readonly referenceCreateModel;
|
|
90
105
|
private readonly referenceCreateEffort;
|
|
91
106
|
private readonly workerTierOverridden;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkerExecutorService.d.ts","sourceRoot":"","sources":["../../src/agent-variants/WorkerExecutorService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,EAAE,MAAM,eAAe,CAAC;AAGpD,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAGL,KAAK,2BAA2B,EACjC,MAAM,aAAa,CAAC;AAIrB,gFAAgF;AAChF,eAAO,MAAM,oBAAoB,mBAAmB,CAAC;AAErD;;;;;;;GAOG;AACH,eAAO,MAAM,uBAAuB,GAClC,MAAK,MAAM,CAAC,UAAwB,KACnC,OAGF,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,WAAW,GAAG,QAAQ,CAAC;IAC/B,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1C,mFAAmF;IACnF,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;mEAE+D;IAC/D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;
|
|
1
|
+
{"version":3,"file":"WorkerExecutorService.d.ts","sourceRoot":"","sources":["../../src/agent-variants/WorkerExecutorService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.WorkerExecutorService = exports.isWorkerExecutorEnabled = exports.EXECUTOR_LEASE_OWNER = void 0;
|
|
3
|
+
exports.WorkerExecutorService = exports.modelFailureReason = exports.isModelAvailabilityFailure = exports.isWorkerExecutorEnabled = exports.EXECUTOR_LEASE_OWNER = void 0;
|
|
4
4
|
const child_process_1 = require("child_process");
|
|
5
5
|
const logger_1 = require("../utils/logger");
|
|
6
6
|
const workItemBriefing_1 = require("./workItemBriefing");
|
|
@@ -22,6 +22,77 @@ const isWorkerExecutorEnabled = (env = process.env) => {
|
|
|
22
22
|
return flag !== '0' && flag !== 'false' && flag !== 'off';
|
|
23
23
|
};
|
|
24
24
|
exports.isWorkerExecutorEnabled = isWorkerExecutorEnabled;
|
|
25
|
+
const RATE_LIMIT_FAILURE = /rate.?limit|usage limit|\b429\b/i;
|
|
26
|
+
// Anchored model-error grammar: the error word must sit ADJACENT to the word
|
|
27
|
+
// "model" (optionally across a quoted model name), never in a loose window —
|
|
28
|
+
// a filesystem `permission denied` on a `models/` path or an unrelated
|
|
29
|
+
// "invalid" elsewhere in the message must not match.
|
|
30
|
+
const MODEL_ERROR_PHRASE = /(unknown|invalid|unsupported|unrecognized)\s+model|model\s+(name\s+)?["'`]?[\w.:-]*["'`]?\s*(is\s+)?(not\s+(found|available|supported|recognized)|invalid|unknown|unavailable)|not_found_error[\s\S]{0,80}model|model[\s\S]{0,80}not_found_error|access\s+to\s+(the\s+)?(requested\s+)?model|model\s+access\s+(denied|revoked)|issue\s+with\s+the\s+selected\s+model|model\s*\([^)]{0,120}\)[\s\S]{0,80}(not\s+exist|not\s+have\s+access)/i;
|
|
31
|
+
/** True when a worker failure message implicates model access rather than
|
|
32
|
+
* the work itself: unknown/invalid model, no access on this account, or a
|
|
33
|
+
* model-scoped rate limit. Deliberately conservative — ordinary failures
|
|
34
|
+
* must never silently downgrade the worker model, so matching requires
|
|
35
|
+
* either rate-limit grammar, an anchored model-error phrase, or the exact
|
|
36
|
+
* model id appearing alongside an availability word. */
|
|
37
|
+
const isModelAvailabilityFailure = (message, model) => {
|
|
38
|
+
if (!message)
|
|
39
|
+
return false;
|
|
40
|
+
if (RATE_LIMIT_FAILURE.test(message))
|
|
41
|
+
return true;
|
|
42
|
+
if (MODEL_ERROR_PHRASE.test(message))
|
|
43
|
+
return true;
|
|
44
|
+
if (model &&
|
|
45
|
+
message.includes(model) &&
|
|
46
|
+
/not\s+(found|available|supported)|invalid|unknown|unavailable|no\s+access/i.test(message)) {
|
|
47
|
+
return true;
|
|
48
|
+
}
|
|
49
|
+
return false;
|
|
50
|
+
};
|
|
51
|
+
exports.isModelAvailabilityFailure = isModelAvailabilityFailure;
|
|
52
|
+
/** Normalized failure category for telemetry — the tracking spec forbids
|
|
53
|
+
* raw exception messages in event payloads. The structured API status wins
|
|
54
|
+
* over text: a 429 is rate-limited whatever the result text says. */
|
|
55
|
+
const modelFailureReason = (message, apiErrorStatus) => {
|
|
56
|
+
if (apiErrorStatus === 429)
|
|
57
|
+
return 'model_rate_limited';
|
|
58
|
+
if (apiErrorStatus !== undefined && MODEL_AVAILABILITY_STATUSES.has(apiErrorStatus)) {
|
|
59
|
+
return 'model_unavailable';
|
|
60
|
+
}
|
|
61
|
+
return message && /rate.?limit|usage limit|\b429\b/is.test(message)
|
|
62
|
+
? 'model_rate_limited'
|
|
63
|
+
: 'model_unavailable';
|
|
64
|
+
};
|
|
65
|
+
exports.modelFailureReason = modelFailureReason;
|
|
66
|
+
/** Error/result text from the headless CLI's stdout JSON. With
|
|
67
|
+
* `--output-format json` the CLI reports API and model failures in the
|
|
68
|
+
* stdout result object (`is_error` + `result` text), not on stderr — the
|
|
69
|
+
* failure message must include it or the model-fallback rung never sees
|
|
70
|
+
* model-availability errors. */
|
|
71
|
+
const parseWorkerResultError = (stdout) => {
|
|
72
|
+
try {
|
|
73
|
+
const trimmed = stdout.trim();
|
|
74
|
+
const start = trimmed.indexOf('{');
|
|
75
|
+
if (start === -1)
|
|
76
|
+
return {};
|
|
77
|
+
const parsed = JSON.parse(trimmed.slice(start));
|
|
78
|
+
const parts = [parsed.subtype, parsed.result, parsed.error]
|
|
79
|
+
.filter((value) => typeof value === 'string')
|
|
80
|
+
.join(': ');
|
|
81
|
+
return {
|
|
82
|
+
...(parts.length > 0 ? { text: parts } : {}),
|
|
83
|
+
...(typeof parsed.api_error_status === 'number'
|
|
84
|
+
? { apiErrorStatus: parsed.api_error_status }
|
|
85
|
+
: {}),
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
catch {
|
|
89
|
+
return {};
|
|
90
|
+
}
|
|
91
|
+
};
|
|
92
|
+
/** API statuses that mean the MODEL (not the work) was rejected: auth,
|
|
93
|
+
* permission, unknown model, rate limit. Structured and non-brittle —
|
|
94
|
+
* preferred over text matching whenever the CLI reports one. */
|
|
95
|
+
const MODEL_AVAILABILITY_STATUSES = new Set([401, 403, 404, 429]);
|
|
25
96
|
/** Parse the final result object the headless CLI prints on stdout. Returns
|
|
26
97
|
* undefined on any shape surprise — usage capture must never fail a run. */
|
|
27
98
|
const parseWorkerUsage = (stdout) => {
|
|
@@ -78,6 +149,8 @@ class WorkerExecutorService {
|
|
|
78
149
|
workerCommand;
|
|
79
150
|
workerModel;
|
|
80
151
|
workerEffort;
|
|
152
|
+
/** Degradation target when the tier model is unavailable on the account. */
|
|
153
|
+
fallbackModel;
|
|
81
154
|
referenceCreateModel;
|
|
82
155
|
referenceCreateEffort;
|
|
83
156
|
workerTierOverridden;
|
|
@@ -120,6 +193,10 @@ class WorkerExecutorService {
|
|
|
120
193
|
options.referenceCreateEffort ??
|
|
121
194
|
process.env.RIVET_EXECUTOR_REFERENCE_CREATE_EFFORT ??
|
|
122
195
|
workerDefaults_1.RIVET_WORKER_REFERENCE_CREATE_DEFAULTS.effort;
|
|
196
|
+
this.fallbackModel =
|
|
197
|
+
options.fallbackModel ??
|
|
198
|
+
process.env.RIVET_EXECUTOR_FALLBACK_MODEL ??
|
|
199
|
+
'claude-sonnet-5';
|
|
123
200
|
this.timeoutMs =
|
|
124
201
|
options.timeoutMs ??
|
|
125
202
|
Number(process.env.RIVET_EXECUTOR_TIMEOUT_MS ?? DEFAULT_TIMEOUT_MS);
|
|
@@ -271,8 +348,39 @@ class WorkerExecutorService {
|
|
|
271
348
|
attempt: item.attempt,
|
|
272
349
|
});
|
|
273
350
|
let outcome;
|
|
351
|
+
let ranModel = tier.model;
|
|
274
352
|
try {
|
|
275
353
|
outcome = await this.spawnAndWait(sessionId, item);
|
|
354
|
+
// Model-unavailable rung: an account without access to the default
|
|
355
|
+
// worker model (or a model-scoped rate limit) must degrade to a
|
|
356
|
+
// lesser worker, never to a failed variant. One retry, fallback
|
|
357
|
+
// model, same effort. Gated on the failure message implicating the
|
|
358
|
+
// model so ordinary worker failures are not silently downgraded.
|
|
359
|
+
// Workspace-pristine proxy: workers always emit output tokens before
|
|
360
|
+
// any tool edit, so tokensOut === 0 (or no result object at all)
|
|
361
|
+
// proves nothing was written. A mid-run limit AFTER edits must fail
|
|
362
|
+
// honestly instead of retrying on a partially mutated workspace —
|
|
363
|
+
// vary/refine treat existing files as source and would corrupt.
|
|
364
|
+
const workspacePristine = (outcome.usage?.tokensOut ?? 0) === 0;
|
|
365
|
+
if (outcome.status === 'failed' &&
|
|
366
|
+
tier.model !== this.fallbackModel &&
|
|
367
|
+
workspacePristine &&
|
|
368
|
+
(MODEL_AVAILABILITY_STATUSES.has(outcome.apiErrorStatus ?? -1) ||
|
|
369
|
+
(0, exports.isModelAvailabilityFailure)(outcome.message, tier.model))) {
|
|
370
|
+
this.telemetry?.track('agent_variants.executor_worker_model_fallback', {
|
|
371
|
+
source: 'mcp',
|
|
372
|
+
sessionId,
|
|
373
|
+
workItemId: item.workId,
|
|
374
|
+
fromModel: tier.model,
|
|
375
|
+
toModel: this.fallbackModel,
|
|
376
|
+
reason: (0, exports.modelFailureReason)(outcome.message, outcome.apiErrorStatus),
|
|
377
|
+
});
|
|
378
|
+
ranModel = this.fallbackModel;
|
|
379
|
+
outcome = await this.spawnAndWait(sessionId, item, {
|
|
380
|
+
model: this.fallbackModel,
|
|
381
|
+
effort: tier.effort,
|
|
382
|
+
});
|
|
383
|
+
}
|
|
276
384
|
}
|
|
277
385
|
catch (error) {
|
|
278
386
|
outcome = {
|
|
@@ -307,7 +415,7 @@ class WorkerExecutorService {
|
|
|
307
415
|
...(outcome.usage?.costUsd !== undefined
|
|
308
416
|
? { costUsd: outcome.usage.costUsd }
|
|
309
417
|
: {}),
|
|
310
|
-
model:
|
|
418
|
+
model: ranModel,
|
|
311
419
|
...(outcome.status === 'succeeded' &&
|
|
312
420
|
item.kind === 'code_gen' &&
|
|
313
421
|
item.workspace.kind === 'git_worktree'
|
|
@@ -386,8 +494,8 @@ class WorkerExecutorService {
|
|
|
386
494
|
}
|
|
387
495
|
}
|
|
388
496
|
}
|
|
389
|
-
spawnAndWait(sessionId, item) {
|
|
390
|
-
const tier = this.workerTierFor(item);
|
|
497
|
+
spawnAndWait(sessionId, item, tierOverride) {
|
|
498
|
+
const tier = tierOverride ?? this.workerTierFor(item);
|
|
391
499
|
const prompt = (0, workItemBriefing_1.renderWorkItemBriefing)(item, { completion: 'executor' });
|
|
392
500
|
const child = this.spawnWorker({
|
|
393
501
|
command: this.workerCommand,
|
|
@@ -445,12 +553,14 @@ class WorkerExecutorService {
|
|
|
445
553
|
child.on('close', (code) => {
|
|
446
554
|
clearTimeout(timer);
|
|
447
555
|
const usage = parseWorkerUsage(stdoutTail);
|
|
556
|
+
const { text: resultText, apiErrorStatus } = parseWorkerResultError(stdoutTail);
|
|
448
557
|
resolve(code === 0
|
|
449
558
|
? { status: 'succeeded', ...(usage ? { usage } : {}) }
|
|
450
559
|
: {
|
|
451
560
|
status: 'failed',
|
|
452
|
-
message: `worker exited ${code}: ${stderrTail.slice(-400)}`,
|
|
561
|
+
message: `worker exited ${code}: ${stderrTail.slice(-400)}${resultText ? ` | result: ${resultText.slice(-500)}` : ''}`,
|
|
453
562
|
...(usage ? { usage } : {}),
|
|
563
|
+
...(apiErrorStatus !== undefined ? { apiErrorStatus } : {}),
|
|
454
564
|
});
|
|
455
565
|
});
|
|
456
566
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkerExecutorService.js","sourceRoot":"","sources":["../../src/agent-variants/WorkerExecutorService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"WorkerExecutorService.js","sourceRoot":"","sources":["../../src/agent-variants/WorkerExecutorService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reference.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/reference.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reference.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/reference.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AA2G3E;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAC/B,MAAM,MAAM,EAAE,KACb,OAAO,CAAC,gBAAgB,CA2E1B,CAAC"}
|
|
@@ -32,11 +32,69 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
32
32
|
return result;
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
+
};
|
|
35
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
39
|
exports.handleReferenceFetch = void 0;
|
|
40
|
+
const fs_1 = __importDefault(require("fs"));
|
|
41
|
+
const path_1 = __importDefault(require("path"));
|
|
37
42
|
const envelope_1 = require("../envelope");
|
|
38
43
|
const shared_1 = require("./shared");
|
|
39
44
|
const COMMAND = 'reference.fetch';
|
|
45
|
+
/** Cap image downloads per fetch so a large board stays fast and bounded. */
|
|
46
|
+
const MAX_IMAGE_DOWNLOADS = 12;
|
|
47
|
+
const IMAGE_DOWNLOAD_TIMEOUT_MS = 15_000;
|
|
48
|
+
/**
|
|
49
|
+
* Agent-actionable messages for the proxy's stable failure reasons. The
|
|
50
|
+
* pin-not-accessible one matters most: Pinterest's API only exposes pins
|
|
51
|
+
* saved to the connected account, and the fix is a 5-second user action.
|
|
52
|
+
*/
|
|
53
|
+
const FAILURE_GUIDANCE = {
|
|
54
|
+
pin_not_accessible: 'Pinterest only lets Rivet read pins saved to the connected account, and this pin has no readable public data. Ask the user to save the pin to any of their Pinterest boards, then retry this command.',
|
|
55
|
+
unsupported_url: 'This link does not resolve to a Pinterest pin or board URL.',
|
|
56
|
+
board_not_owned: 'This board belongs to a different Pinterest account than the one connected to Rivet. Boards can only be read from the connected account.',
|
|
57
|
+
board_owner_unverified: 'The connected Pinterest account has no stored username, so Rivet cannot verify this board belongs to it. Ask the user to reconnect Pinterest from the Rivet editor, then retry.',
|
|
58
|
+
board_not_found: 'No board with this name was found on the connected Pinterest account.',
|
|
59
|
+
};
|
|
60
|
+
/**
|
|
61
|
+
* Download each pin's largest image into `.rivet/references/` and stamp
|
|
62
|
+
* `local_path` on the pin, so host agents can view the reference natively
|
|
63
|
+
* (Read tool) and pass it to variant workers via `--context-images` without
|
|
64
|
+
* relaying URLs. Failures are per-pin and non-fatal — the URLs remain.
|
|
65
|
+
*/
|
|
66
|
+
const downloadPinImages = async (projectPath, pins) => {
|
|
67
|
+
const dir = path_1.default.join(projectPath, '.rivet', 'references');
|
|
68
|
+
const localPaths = [];
|
|
69
|
+
let dirReady = false;
|
|
70
|
+
for (const pin of pins.slice(0, MAX_IMAGE_DOWNLOADS)) {
|
|
71
|
+
const imageUrl = pin.image_urls[pin.image_urls.length - 1];
|
|
72
|
+
if (!imageUrl || !pin.id) {
|
|
73
|
+
continue;
|
|
74
|
+
}
|
|
75
|
+
try {
|
|
76
|
+
const response = await fetch(imageUrl, {
|
|
77
|
+
signal: AbortSignal.timeout(IMAGE_DOWNLOAD_TIMEOUT_MS),
|
|
78
|
+
});
|
|
79
|
+
if (!response.ok) {
|
|
80
|
+
continue;
|
|
81
|
+
}
|
|
82
|
+
if (!dirReady) {
|
|
83
|
+
fs_1.default.mkdirSync(dir, { recursive: true });
|
|
84
|
+
dirReady = true;
|
|
85
|
+
}
|
|
86
|
+
const ext = path_1.default.extname(new URL(imageUrl).pathname).toLowerCase() || '.jpg';
|
|
87
|
+
const filePath = path_1.default.join(dir, `pinterest-${pin.id.replace(/[^a-zA-Z0-9_-]/g, '')}${ext}`);
|
|
88
|
+
fs_1.default.writeFileSync(filePath, Buffer.from(await response.arrayBuffer()));
|
|
89
|
+
pin.local_path = filePath;
|
|
90
|
+
localPaths.push(filePath);
|
|
91
|
+
}
|
|
92
|
+
catch {
|
|
93
|
+
// Keep going — a failed download leaves the pin with URLs only.
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
return localPaths;
|
|
97
|
+
};
|
|
40
98
|
/**
|
|
41
99
|
* Map a reference URL to its provider by host: Pinterest (pinterest.com /
|
|
42
100
|
* pin.it, including subdomains) or Are.na. Unsupported hosts are reported in
|
|
@@ -88,9 +146,25 @@ const handleReferenceFetch = async (args) => {
|
|
|
88
146
|
const { IntegrationsClient } = await Promise.resolve().then(() => __importStar(require('../../services/IntegrationsClient')));
|
|
89
147
|
const client = new IntegrationsClient();
|
|
90
148
|
try {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
:
|
|
149
|
+
if (provider === 'pinterest') {
|
|
150
|
+
const result = await client.fetchPinterest(url);
|
|
151
|
+
// Failed fetches are real failures: exit non-zero with actionable
|
|
152
|
+
// guidance instead of burying the error inside an ok envelope.
|
|
153
|
+
if (result.status === 'error') {
|
|
154
|
+
return (0, envelope_1.errorResult)(COMMAND, 'OPERATION_FAILED', result.reason ? FAILURE_GUIDANCE[result.reason] : result.message, { reason: result.reason, providerMessage: result.message });
|
|
155
|
+
}
|
|
156
|
+
// Download reference images locally so agents can view them natively
|
|
157
|
+
// and hand them to variant workers as context-images paths.
|
|
158
|
+
if (result.status === 'ok') {
|
|
159
|
+
const images = await downloadPinImages(context.projectPath, result.pins);
|
|
160
|
+
return (0, envelope_1.okResult)(COMMAND, { provider, ...result, images });
|
|
161
|
+
}
|
|
162
|
+
return (0, envelope_1.okResult)(COMMAND, { provider, ...result });
|
|
163
|
+
}
|
|
164
|
+
const result = await client.fetchArena(url);
|
|
165
|
+
if (result.status === 'error') {
|
|
166
|
+
return (0, envelope_1.errorResult)(COMMAND, 'OPERATION_FAILED', result.message);
|
|
167
|
+
}
|
|
94
168
|
return (0, envelope_1.okResult)(COMMAND, { provider, ...result });
|
|
95
169
|
}
|
|
96
170
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reference.js","sourceRoot":"","sources":["../../../src/cli/commands/reference.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reference.js","sourceRoot":"","sources":["../../../src/cli/commands/reference.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE3E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAiBnC;;;;GAIG;AACH,eAAO,MAAM,WAAW,GACtB,MAAM,MAAM,EAAE,EACd,IAAI,KAAK,KACR,OAAO,CAAC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE3E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAiBnC;;;;GAIG;AACH,eAAO,MAAM,WAAW,GACtB,MAAM,MAAM,EAAE,EACd,IAAI,KAAK,KACR,OAAO,CAAC,gBAAgB,CA6M1B,CAAC"}
|
|
@@ -82,6 +82,13 @@ const handleServe = async (args, io) => {
|
|
|
82
82
|
enabled: flags.values['no-telemetry'] !== true,
|
|
83
83
|
source: 'cli',
|
|
84
84
|
});
|
|
85
|
+
// Mirror the server's log stream to PostHog logs (same pipeline the desktop
|
|
86
|
+
// app uses) so field failures are diagnosable without the local server.log.
|
|
87
|
+
const { CliLogForwarder } = await Promise.resolve().then(() => __importStar(require('../../services/CliLogForwarder')));
|
|
88
|
+
const logForwarder = new CliLogForwarder({
|
|
89
|
+
enabled: flags.values['no-telemetry'] !== true,
|
|
90
|
+
});
|
|
91
|
+
logForwarder.init();
|
|
85
92
|
const framework = (0, flags_1.stringFlag)(flags, 'framework');
|
|
86
93
|
const agentDevServer = await resolveAgentDevServer({
|
|
87
94
|
projectPath,
|
|
@@ -131,8 +138,13 @@ const handleServe = async (args, io) => {
|
|
|
131
138
|
if (agentDevServer.ownedProcess) {
|
|
132
139
|
const ownedDevServerPort = devServerContext.port;
|
|
133
140
|
registerOwnedDevServerSignalHandlers(agentDevServer.ownedProcess);
|
|
134
|
-
agentDevServer.ownedProcess.once('exit', () => {
|
|
141
|
+
agentDevServer.ownedProcess.once('exit', (exitCode) => {
|
|
135
142
|
updateOwnedDevServerHealthOnExit(bridge, ownedDevServerPort);
|
|
143
|
+
telemetry.trackDevServerLost({
|
|
144
|
+
port: ownedDevServerPort,
|
|
145
|
+
framework: project.framework,
|
|
146
|
+
exitCode,
|
|
147
|
+
});
|
|
136
148
|
});
|
|
137
149
|
}
|
|
138
150
|
let rivetPort = (0, flags_1.integerFlag)(flags, 'rivet-port') ??
|
|
@@ -159,7 +171,10 @@ const handleServe = async (args, io) => {
|
|
|
159
171
|
rivetPort,
|
|
160
172
|
isGitEnabled: flags.values['no-git'] ? false : true,
|
|
161
173
|
skipProcessHandlers: retries > 0,
|
|
162
|
-
beforeShutdown:
|
|
174
|
+
beforeShutdown: async () => {
|
|
175
|
+
await agentDevServer.cleanup?.();
|
|
176
|
+
await logForwarder.shutdown();
|
|
177
|
+
},
|
|
163
178
|
cliShutdown: () => process.kill(process.pid, 'SIGTERM'),
|
|
164
179
|
});
|
|
165
180
|
serverStarted = true;
|
|
@@ -180,6 +195,22 @@ const handleServe = async (args, io) => {
|
|
|
180
195
|
await agentDevServer.cleanup?.();
|
|
181
196
|
return (0, envelope_1.errorResult)(COMMAND, 'SERVER_UNAVAILABLE', `Could not start the Rivet server after ${maxRetries} attempts.`);
|
|
182
197
|
}
|
|
198
|
+
// Same predicate as startServer: static mode moves the editor to `/` and
|
|
199
|
+
// turns `/rivet` into a redirect, so record which mode this instance
|
|
200
|
+
// actually came up in (and whether a dev server was attached).
|
|
201
|
+
const hasUserDevServer = typeof userDevServerPort === 'number' &&
|
|
202
|
+
Number.isInteger(userDevServerPort) &&
|
|
203
|
+
userDevServerPort > 0;
|
|
204
|
+
telemetry.trackServerStarted({
|
|
205
|
+
mode: project.framework === 'static' && !hasUserDevServer
|
|
206
|
+
? 'static'
|
|
207
|
+
: 'attached',
|
|
208
|
+
framework: project.framework,
|
|
209
|
+
hasUserDevServer,
|
|
210
|
+
userDevServerPort,
|
|
211
|
+
ownedDevServer: Boolean(agentDevServer.ownedProcess),
|
|
212
|
+
rivetPort,
|
|
213
|
+
});
|
|
183
214
|
// Keep the project's Cursor rules current so in-editor agents discover
|
|
184
215
|
// the CLI without a global install step.
|
|
185
216
|
writeCursorRulesIfNeeded(projectPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../../src/cli/commands/serve.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA2E;AAC3E,oCAAmD;AAEnD,qCAAgE;AAChE,wCAA0C;AAC1C,kDAAsD;AACtD,wDAAkE;AAElE,MAAM,OAAO,GAAG,SAAS,CAAC;AAE1B,MAAM,eAAe,GAAG;IACtB,YAAY,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;IAClC,WAAW,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;IACjC,SAAS,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;IAC/B,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;IAC3B,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;IAC3B,QAAQ,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE;CAChC,CAAC;AAEF;;;;GAIG;AACI,MAAM,WAAW,GAAG,KAAK,EAC9B,IAAc,EACd,EAAS,EACkB,EAAE;IAC7B,MAAM,OAAO,GAAG,IAAA,4BAAmB,EAAC,OAAO,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;IACpE,IAAI,IAAA,wBAAe,EAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAEhD,sEAAsE;IACtE,0EAA0E;IAC1E,uEAAuE;IACvE,uEAAuE;IACvE,MAAM,EAAE,oBAAoB,EAAE,GAAG,wDAAa,4BAA4B,GAAC,CAAC;IAC5E,oBAAoB,EAAE,CAAC;IAEvB,MAAM,mBAAmB,GAAG,IAAA,8CAA4B,EACtD,IAAA,kBAAU,EAAC,KAAK,EAAE,OAAO,CAAC,CAC3B,CAAC;IACF,IAAI,mBAAmB,EAAE,CAAC;QACxB,OAAO,IAAA,sBAAW,EAAC,OAAO,EAAE,aAAa,EAAE,mBAAmB,CAAC,CAAC;IAClE,CAAC;IAED,2EAA2E;IAC3E,wEAAwE;IACxE,MAAM,EACJ,qBAAqB,EACrB,yBAAyB,EACzB,oCAAoC,EACpC,gCAAgC,EAChC,YAAY,GACb,GAAG,wDAAa,aAAa,GAAC,CAAC;IAChC,MAAM,EAAE,WAAW,EAAE,GAAG,wDAAa,cAAc,GAAC,CAAC;IACrD,MAAM,EAAE,gBAAgB,EAAE,GAAG,wDAAa,iCAAiC,GAAC,CAAC;IAC7E,MAAM,EAAE,qBAAqB,EAAE,GAC7B,wDAAa,gCAAgC,GAAC,CAAC;IACjD,MAAM,EAAE,iBAAiB,EAAE,GAAG,wDAAa,uBAAuB,GAAC,CAAC;IACpE,MAAM,EAAE,wBAAwB,EAAE,GAAG,wDAAa,yBAAyB,GAAC,CAAC;IAE7E,MAAM,SAAS,GAAG,IAAI,gBAAgB,CAAC;QACrC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,IAAI;QAC9C,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../../src/cli/commands/serve.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,30 +13,32 @@
|
|
|
13
13
|
* enforced config (agent definition) > protocol data (worker hint) >
|
|
14
14
|
* omit.
|
|
15
15
|
*
|
|
16
|
-
* Defaults come from the 2026-07-
|
|
17
|
-
*
|
|
18
|
-
*
|
|
19
|
-
*
|
|
20
|
-
*
|
|
16
|
+
* Defaults come from the 2026-07-19 opus-effort grid plus that week's visual
|
|
17
|
+
* QA: model switching is a capability cliff (every quality incident — thin
|
|
18
|
+
* pages, brand-font misses, "not visually interesting" — was a capability
|
|
19
|
+
* gap, not an effort gap), so ALL workers run opus and fidelity varies
|
|
20
|
+
* EFFORT only. Effort collapses vary/refine deliberation (~110s → ~57s
|
|
21
|
+
* workers, high → medium) while 0→1 authorship latency is output-bound and
|
|
22
|
+
* effort-insensitive (±10% across the ladder).
|
|
21
23
|
*/
|
|
22
24
|
import type { WorkerFidelity } from '../agent-variants/contracts';
|
|
23
25
|
export type WorkerHostId = 'claude' | 'codex' | 'cursor' | 'unknown';
|
|
24
26
|
export type WorkerEffortLevel = 'low' | 'medium' | 'high';
|
|
25
27
|
/**
|
|
26
|
-
* User-facing fidelity → worker tier.
|
|
27
|
-
*
|
|
28
|
-
*
|
|
29
|
-
*
|
|
30
|
-
*
|
|
28
|
+
* User-facing fidelity → worker tier. One model, one dial: every tier runs
|
|
29
|
+
* opus and fidelity varies EFFORT. Model switching made fidelity a
|
|
30
|
+
* capability cliff — the 2026-07-19 visual QA found sonnet-tier defaults
|
|
31
|
+
* regressing design quality significantly even under the briefing
|
|
32
|
+
* scaffolding, while the same day's opus-effort grid
|
|
33
|
+
* (`benchmarks/runs/exec-opus-effort-*-20260719`) showed effort is the
|
|
34
|
+
* right per-lane knob:
|
|
31
35
|
*
|
|
32
|
-
* low —
|
|
33
|
-
* ~
|
|
34
|
-
*
|
|
35
|
-
*
|
|
36
|
-
*
|
|
37
|
-
*
|
|
38
|
-
* up to a few minutes. The tier the 4-star visual QA baselines
|
|
39
|
-
* were authored on; briefings drop the size cap here.
|
|
36
|
+
* low — opus/low, fastest deliberation (vary workers ~54–57s; 0→1
|
|
37
|
+
* ~111–137s). Sketch-grade intent without changing the designer.
|
|
38
|
+
* medium — opus/medium, the default (vary ~57–63s; 0→1 ~127–155s).
|
|
39
|
+
* high — opus/high, maximum deliberation headroom (vary ~78–109s; 0→1
|
|
40
|
+
* ~113–149s — effort is nearly latency-free on creates, which
|
|
41
|
+
* are output-bound). Briefings drop the size cap here.
|
|
40
42
|
*/
|
|
41
43
|
export declare const FIDELITY_WORKER_TIERS: Record<WorkerFidelity, {
|
|
42
44
|
model: string;
|
|
@@ -90,7 +92,7 @@ export declare const RIVET_WORKER_REFERENCE_CREATE_DEFAULTS: {
|
|
|
90
92
|
};
|
|
91
93
|
export declare const workerProfileFor: (callerAgent?: string) => HostWorkerProfile;
|
|
92
94
|
/** Version marker gating rewrites of the installed agent definition. */
|
|
93
|
-
export declare const RIVET_WORKER_AGENT_VERSION =
|
|
95
|
+
export declare const RIVET_WORKER_AGENT_VERSION = 2;
|
|
94
96
|
export declare const RIVET_WORKER_AGENT_FILENAME = "rivet-worker.md";
|
|
95
97
|
/**
|
|
96
98
|
* Claude Code agent definition installed to `~/.claude/agents/`. The
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workerDefaults.d.ts","sourceRoot":"","sources":["../../src/hosts/workerDefaults.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"workerDefaults.d.ts","sourceRoot":"","sources":["../../src/hosts/workerDefaults.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC;AAErE,MAAM,MAAM,iBAAiB,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE1D;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,qBAAqB,EAAE,MAAM,CACxC,cAAc,EACd;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,iBAAiB,CAAA;CAAE,CAK7C,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,cAAyB,CAAC;AAEhE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,YAAY,CAAC;IACjB;;;;;;;;;OASG;IACH,OAAO,EAAE,kBAAkB,GAAG,MAAM,CAAC;IACrC,8EAA8E;IAC9E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,iBAAiB,CAAA;KAAE,CAAC;CACzD,CAAC;AAEF,eAAO,MAAM,uBAAuB,iBAAiB,CAAC;AAEtD,eAAO,MAAM,qBAAqB,EAAE;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,iBAAiB,CAAC;CACsB,CAAC;AAEnD;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,sCAAsC,EAAE;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,iBAAiB,CAAC;CACsB,CAAC;AAcnD,eAAO,MAAM,gBAAgB,GAAI,cAAc,MAAM,KAAG,iBAMvD,CAAC;AAEF,wEAAwE;AACxE,eAAO,MAAM,0BAA0B,IAAI,CAAC;AAE5C,eAAO,MAAM,2BAA2B,oBAAkC,CAAC;AAE3E;;;;;;;GAOG;AACH,eAAO,MAAM,0BAA0B,QAgBtC,CAAC"}
|