rivet-design 0.8.3 → 0.8.5

package/dist/services/CommentVariationService.js

@@ -1,70 +1,97 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateCommentStyleVariants = exports.normalizeVariationJsonPayload = void 0;
-const zod_1 = require("zod");
+exports.generateCommentStyleVariants = exports.readFileExcerpts = void 0;
+const path_1 = __importDefault(require("path"));
+const fs_1 = require("fs");
+const v3_1 = require("zod/v3");
 const logger_1 = require("../utils/logger");
 const commentVariationPrompts_1 = require("../prompts/commentVariationPrompts");
-const AgentCore_1 = require("./agent/AgentCore");
+const GatewayClient_1 = require("./GatewayClient");
 const log = (0, logger_1.createLogger)('CommentVariationService');
 const MIN_VARIANT_COUNT = 2;
 const MAX_VARIANT_COUNT = 5;
-const MAX_REASONING_BLOCKS_FOR_JSON_SEARCH = 5;
-/** Model tuned for highest-quality structured JSON for design variants. */
-const DEFAULT_VARIATION_MODEL = 'claude-opus-4-6';
+/**
+ * Sonnet 4.6 is fast enough for direction-text generation while still
+ * producing coherent multi-direction designs. Phase 2 (code generation) keeps
+ * using Opus through the agent loop where structural reasoning matters more.
+ */
+const DEFAULT_VARIATION_MODEL = 'claude-sonnet-4-6';
 const DEFAULT_AGENT_CWD = process.cwd();
-const VARIATION_AGENT_SYSTEM_PROMPT = `You are a senior design systems engineer producing structured style-variation output for one selected comment target with nearby UI context.
+const MAX_TOKENS = 4000;
+const TEMPERATURE = 0.7;
+const MAX_FILES_FOR_CONTEXT = 3;
+const MAX_BYTES_PER_FILE = 6000;
+const VARIATION_SYSTEM_PROMPT = `You are a senior design systems engineer producing structured style-variation output for one selected comment target with nearby UI context.
 
-Use provided element, sibling, and file context to propose coherent visual directions. Nearby sibling/container adjustments are allowed when necessary for a coherent result.
+Use the provided element, sibling, and file context to propose coherent visual directions. Nearby sibling/container adjustments are allowed when necessary for a coherent result.
 
-Never modify files. Use read-only tools only to inspect context.
-
-Output JSON only. No markdown fences. No explanation text.
-
-Required shape:
-{"variants":[{"label":"short name","summary":"one sentence","changeSpec":"implementation instruction"}]}`;
-const styleVariantSchema = zod_1.z.object({
-    label: zod_1.z.string(),
-    summary: zod_1.z.string(),
-    changeSpec: zod_1.z.string().optional(),
+Submit your final output by calling the submit_variants tool exactly once.`;
+const variantSchema = v3_1.z.object({
+    label: v3_1.z.string(),
+    summary: v3_1.z.string(),
+    changeSpec: v3_1.z.string(),
 });
-const responseSchema = zod_1.z.object({
-    variants: zod_1.z.array(styleVariantSchema),
+const responseSchema = v3_1.z.object({
+    variants: v3_1.z.array(variantSchema),
 });
-const stripCodeFences = (raw) => {
-    let text = raw.trim();
-    if (text.startsWith('```')) {
-        text = text.replace(/^```(?:json)?\s*/i, '').replace(/\s*```\s*$/i, '');
-    }
-    return text.trim();
-};
-const normalizeVariationJsonPayload = (raw) => {
-    const stripped = stripCodeFences(raw);
-    const firstBrace = stripped.indexOf('{');
-    const lastBrace = stripped.lastIndexOf('}');
-    if (firstBrace !== -1 && lastBrace > firstBrace) {
-        return stripped.slice(firstBrace, lastBrace + 1).trim();
-    }
-    return stripped;
+const SUBMIT_VARIANTS_TOOL = {
+    name: 'submit_variants',
+    strict: true,
+    description: 'Submit the final list of style variants for the commented element. Call this exactly once with all variants.',
+    input_schema: {
+        type: 'object',
+        properties: {
+            variants: {
+                type: 'array',
+                items: {
+                    type: 'object',
+                    properties: {
+                        label: { type: 'string' },
+                        summary: { type: 'string' },
+                        changeSpec: { type: 'string' },
+                    },
+                    required: ['label', 'summary', 'changeSpec'],
+                    additionalProperties: false,
+                },
+            },
+        },
+        required: ['variants'],
+        additionalProperties: false,
+    },
 };
-exports.normalizeVariationJsonPayload = normalizeVariationJsonPayload;
-const extractJsonCandidateFromReasoning = (reasoning) => {
-    const tailBlocks = reasoning
-        .slice(-MAX_REASONING_BLOCKS_FOR_JSON_SEARCH)
-        .map((block) => block.trim())
-        .filter((block) => block.length > 0);
-    for (let i = tailBlocks.length - 1; i >= 0; i--) {
-        const block = tailBlocks[i];
-        if (block.includes('{') && block.includes('"variants"')) {
-            return block;
+const readFileExcerpts = async (projectPath, element) => {
+    const filePaths = element.filePaths?.map((f) => f.filePath).slice(0, MAX_FILES_FOR_CONTEXT) ??
+        [];
+    const excerpts = [];
+    for (const relPath of filePaths) {
+        const absPath = path_1.default.isAbsolute(relPath)
+            ? relPath
+            : path_1.default.join(projectPath, relPath);
+        try {
+            const stat = await fs_1.promises.stat(absPath);
+            if (!stat.isFile())
+                continue;
+            const buf = await fs_1.promises.readFile(absPath, 'utf8');
+            const content = buf.length > MAX_BYTES_PER_FILE
+                ? buf.slice(0, MAX_BYTES_PER_FILE) + '\n... (truncated)'
+                : buf;
+            excerpts.push({ path: relPath, content });
+        }
+        catch (e) {
+            log.debug(`Skipping file excerpt for ${relPath}:`, e);
         }
     }
-    if (tailBlocks.length > 0) {
-        return tailBlocks[tailBlocks.length - 1];
-    }
-    throw new Error('Invalid variation response from model');
+    return excerpts;
 };
+exports.readFileExcerpts = readFileExcerpts;
 /**
- * Calls agent-core in read-only mode and returns CSS-preview variants for a commented element.
+ * Generates style-variant directions for a commented element by calling the
+ * gateway directly with a forced tool-use schema. Skips the agent loop because
+ * direction text doesn't require codebase exploration — the relevant file
+ * contents are pre-loaded into the prompt.
  */
 const generateCommentStyleVariants = async ({ instruction, element, variantCount, projectPath, model, }) => {
     if (variantCount < MIN_VARIANT_COUNT ||
@@ -72,31 +99,35 @@ const generateCommentStyleVariants = async ({ instruction, element, variantCount
         !Number.isInteger(variantCount)) {
         throw new Error('variantCount must be an integer between 2 and 5');
     }
-    const agentCore = new AgentCore_1.AgentCore();
-    const prompt = (0, commentVariationPrompts_1.buildCommentVariationPrompt)(instruction, element, variantCount);
-    log.info(`Comment variation prompt (to Railway):\n${prompt}`);
-    const agentResult = await agentCore.execute({
-        systemPrompt: VARIATION_AGENT_SYSTEM_PROMPT,
-        userPrompt: prompt,
-        allowedTools: ['Read', 'Glob', 'Grep'],
-        permissionMode: 'default',
-        cwd: projectPath || DEFAULT_AGENT_CWD,
+    const cwd = projectPath || DEFAULT_AGENT_CWD;
+    const fileExcerpts = await (0, exports.readFileExcerpts)(cwd, element);
+    const prompt = (0, commentVariationPrompts_1.buildCommentVariationPrompt)(instruction, element, variantCount, fileExcerpts);
+    log.info(`Comment variation request — model=${model ?? DEFAULT_VARIATION_MODEL} files=${fileExcerpts.length} count=${variantCount}`);
+    const gateway = new GatewayClient_1.GatewayClient();
+    const startedAt = Date.now();
+    const toolInput = await gateway.sendToolUse({
         model: model ?? DEFAULT_VARIATION_MODEL,
-        executionPolicy: {
-            disableBash: true,
-            disableSubagents: true,
-            maxTaskCalls: 0,
-        },
-        onProgress: () => { },
+        maxTokens: MAX_TOKENS,
+        temperature: TEMPERATURE,
+        system: VARIATION_SYSTEM_PROMPT,
+        prompt,
+        tool: SUBMIT_VARIANTS_TOOL,
+        cacheSystemPrompt: true,
     });
-    const rawText = extractJsonCandidateFromReasoning(agentResult.reasoning);
-    const parsedJson = JSON.parse((0, exports.normalizeVariationJsonPayload)(rawText));
-    const parsed = responseSchema.safeParse(parsedJson);
+    log.info(`Comment variation completed in ${Date.now() - startedAt}ms`);
+    const parsed = responseSchema.safeParse(toolInput);
     if (!parsed.success) {
-        log.warn('Variation JSON validation failed', parsed.error.flatten());
+        log.warn('Variation tool input failed schema validation', {
+            validationError: parsed.error.flatten(),
+            received: toolInput,
+        });
         throw new Error('Invalid variation response from model');
     }
     if (parsed.data.variants.length !== variantCount) {
+        log.warn('Variation count mismatch', {
+            expected: variantCount,
+            received: parsed.data.variants.length,
+        });
         throw new Error('Invalid variation response from model');
     }
     return parsed.data.variants;

package/dist/services/CommentVariationService.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommentVariationService.js","sourceRoot":"","sources":["../../src/services/CommentVariationService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CommentVariationService.js","sourceRoot":"","sources":["../../src/services/CommentVariationService.ts"],"names":[],"mappings":"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"}

package/dist/services/DesktopVersionPolicyService.d.ts

@@ -0,0 +1,21 @@
+export type DesktopVersionPolicy = {
+    minimumVersion: string;
+    latestVersion: string;
+    downloadUrl?: string;
+    sourceTimestamp: string;
+};
+declare class DesktopVersionPolicyService {
+    private cache;
+    private inFlightFetch;
+    private readonly policyUrl;
+    private readonly cacheTtlMs;
+    private readonly fetchTimeoutMs;
+    constructor();
+    private shouldUseFreshCache;
+    getPolicy(): Promise<DesktopVersionPolicy | null>;
+    private fetchAndCachePolicy;
+}
+export declare const getDesktopVersionPolicyService: () => DesktopVersionPolicyService;
+export declare const resetDesktopVersionPolicyServiceForTests: () => void;
+export {};
+//# sourceMappingURL=DesktopVersionPolicyService.d.ts.map

package/dist/services/DesktopVersionPolicyService.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DesktopVersionPolicyService.d.ts","sourceRoot":"","sources":["../../src/services/DesktopVersionPolicyService.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,oBAAoB,GAAG;IACjC,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAuEF,cAAM,2BAA2B;IAC/B,OAAO,CAAC,KAAK,CAGX;IAEF,OAAO,CAAC,aAAa,CAAqD;IAE1E,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IAEnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IAEpC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;;IAsBxC,OAAO,CAAC,mBAAmB;IAOrB,SAAS,IAAI,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;YAoBzC,mBAAmB;CAmClC;AAID,eAAO,MAAM,8BAA8B,QAAO,2BAKjD,CAAC;AAEF,eAAO,MAAM,wCAAwC,QAAO,IAE3D,CAAC"}

package/dist/services/DesktopVersionPolicyService.js

@@ -0,0 +1,151 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resetDesktopVersionPolicyServiceForTests = exports.getDesktopVersionPolicyService = void 0;
+const logger_1 = require("../utils/logger");
+const log = (0, logger_1.createLogger)('DesktopVersionPolicyService');
+const DEFAULT_POLICY_URL = 'https://releases.rivet.design/desktop-version-policy.json';
+const DEFAULT_CACHE_TTL_MS = 5 * 60 * 1000;
+const DEFAULT_POLICY_FETCH_TIMEOUT_MS = 5000;
+const normalizeSemverCore = (version) => {
+    const [core] = version.trim().split('-');
+    const parts = core.split('.');
+    if (parts.length !== 3) {
+        return null;
+    }
+    const [major, minor, patch] = parts.map((part) => Number.parseInt(part, 10));
+    if (!Number.isInteger(major) ||
+        !Number.isInteger(minor) ||
+        !Number.isInteger(patch)) {
+        return null;
+    }
+    return `${major}.${minor}.${patch}`;
+};
+const computeMinorFloor = (version) => {
+    const normalized = normalizeSemverCore(version);
+    if (!normalized) {
+        return null;
+    }
+    const [major, minor] = normalized.split('.');
+    return `${major}.${minor}.0`;
+};
+const parseDesktopVersionPolicy = (payload) => {
+    if (!payload || typeof payload !== 'object') {
+        return null;
+    }
+    const record = payload;
+    if (typeof record.latestVersion !== 'string') {
+        return null;
+    }
+    const normalizedLatest = normalizeSemverCore(record.latestVersion);
+    if (!normalizedLatest) {
+        return null;
+    }
+    const normalizedMinimumFromPayload = typeof record.minimumVersion === 'string'
+        ? normalizeSemverCore(record.minimumVersion)
+        : null;
+    const minimumVersion = normalizedMinimumFromPayload ?? computeMinorFloor(normalizedLatest);
+    if (!minimumVersion) {
+        return null;
+    }
+    const sourceTimestamp = typeof record.publishedAt === 'string' && record.publishedAt.length > 0
+        ? record.publishedAt
+        : new Date().toISOString();
+    return {
+        minimumVersion,
+        latestVersion: normalizedLatest,
+        downloadUrl: typeof record.downloadUrl === 'string' ? record.downloadUrl : undefined,
+        sourceTimestamp,
+    };
+};
+class DesktopVersionPolicyService {
+    cache = {
+        value: null,
+        fetchedAtMs: 0,
+    };
+    inFlightFetch = null;
+    policyUrl;
+    cacheTtlMs;
+    fetchTimeoutMs;
+    constructor() {
+        this.policyUrl = process.env.RIVET_DESKTOP_POLICY_URL ?? DEFAULT_POLICY_URL;
+        const ttlFromEnv = Number.parseInt(process.env.RIVET_DESKTOP_POLICY_CACHE_TTL_MS ?? '', 10);
+        this.cacheTtlMs =
+            Number.isInteger(ttlFromEnv) && ttlFromEnv > 0
+                ? ttlFromEnv
+                : DEFAULT_CACHE_TTL_MS;
+        const timeoutFromEnv = Number.parseInt(process.env.RIVET_DESKTOP_POLICY_FETCH_TIMEOUT_MS ?? '', 10);
+        this.fetchTimeoutMs =
+            Number.isInteger(timeoutFromEnv) && timeoutFromEnv > 0
+                ? timeoutFromEnv
+                : DEFAULT_POLICY_FETCH_TIMEOUT_MS;
+    }
+    shouldUseFreshCache(nowMs) {
+        if (this.cache.fetchedAtMs <= 0) {
+            return false;
+        }
+        return nowMs - this.cache.fetchedAtMs < this.cacheTtlMs;
+    }
+    async getPolicy() {
+        const nowMs = Date.now();
+        if (this.shouldUseFreshCache(nowMs)) {
+            return this.cache.value;
+        }
+        if (!this.inFlightFetch) {
+            this.inFlightFetch = this.fetchAndCachePolicy().finally(() => {
+                this.inFlightFetch = null;
+            });
+        }
+        const fetched = await this.inFlightFetch;
+        if (fetched) {
+            return fetched;
+        }
+        // Fail open: stale cached value is still returned if network fetch fails.
+        return this.cache.value;
+    }
+    async fetchAndCachePolicy() {
+        try {
+            const abortController = new AbortController();
+            const timeoutId = setTimeout(() => abortController.abort(), this.fetchTimeoutMs);
+            const response = await fetch(this.policyUrl, {
+                signal: abortController.signal,
+            }).finally(() => {
+                clearTimeout(timeoutId);
+            });
+            if (!response.ok) {
+                throw new Error(`Policy request failed with status ${response.status}`);
+            }
+            const parsed = parseDesktopVersionPolicy(await response.json());
+            if (!parsed) {
+                throw new Error('Policy payload shape is invalid');
+            }
+            this.cache = {
+                value: parsed,
+                fetchedAtMs: Date.now(),
+            };
+            return parsed;
+        }
+        catch (error) {
+            log.warn('Failed to fetch desktop version policy:', error);
+            // Negative cache failures so repeated /api/config calls don't trigger
+            // a fresh network timeout every time while the policy endpoint is down.
+            this.cache = {
+                value: this.cache.value,
+                fetchedAtMs: Date.now(),
+            };
+            return null;
+        }
+    }
+}
+let instance = null;
+const getDesktopVersionPolicyService = () => {
+    if (!instance) {
+        instance = new DesktopVersionPolicyService();
+    }
+    return instance;
+};
+exports.getDesktopVersionPolicyService = getDesktopVersionPolicyService;
+const resetDesktopVersionPolicyServiceForTests = () => {
+    instance = null;
+};
+exports.resetDesktopVersionPolicyServiceForTests = resetDesktopVersionPolicyServiceForTests;
+//# sourceMappingURL=DesktopVersionPolicyService.js.map

package/dist/services/DesktopVersionPolicyService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DesktopVersionPolicyService.js","sourceRoot":"","sources":["../../src/services/DesktopVersionPolicyService.ts"],"names":[],"mappings":"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"}

package/dist/services/GatewayClient.d.ts

@@ -4,6 +4,21 @@ type GatewayRequestOptions = {
     temperature: number;
     prompt: string;
 };
+type GatewayToolUseOptions = {
+    model: string;
+    maxTokens: number;
+    temperature: number;
+    system: string;
+    prompt: string;
+    tool: {
+        name: string;
+        description: string;
+        input_schema: Record<string, unknown>;
+        strict?: boolean;
+    };
+    /** Wrap the system prompt in a cache_control block for prompt caching. */
+    cacheSystemPrompt?: boolean;
+};
 export declare const asReasonText: (value: unknown) => string;
 /**
  * Sends authenticated requests to the Rivet LLM gateway.
@@ -16,7 +31,14 @@ export declare class GatewayClient {
     constructor(gatewayUrl?: string, proxyUrl?: string);
     /** Send a message to the gateway and return the raw text response. */
     sendMessage(options: GatewayRequestOptions): Promise<string>;
-    private makeRequest;
+    /**
+     * Send a request that forces the model to invoke a single tool, and return
+     * the parsed `input` of that tool call. Throws if the model didn't call the
+     * tool (which the API guarantees won't happen with `tool_choice: { type:
+     * 'tool' }`, but we check anyway).
+     */
+    sendToolUse<TInput>(options: GatewayToolUseOptions): Promise<TInput>;
+    private postMessages;
     /** Refresh the access token using the stored refresh token. */
     private refreshAccessToken;
 }

package/dist/services/GatewayClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GatewayClient.d.ts","sourceRoot":"","sources":["../../src/services/GatewayClient.ts"],"names":[],"mappings":"AAMA,KAAK,qBAAqB,GAAG;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,OAAO,OAAO,KAAG,MAsB7C,CAAC;AAEF;;;GAGG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,aAAa,CAAsB;IAC3C,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAS;gBAEb,UAAU,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM;IAKlD,sEAAsE;IAChE,WAAW,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;YAIpD,WAAW;IAyEzB,+DAA+D;YACjD,kBAAkB;CAoCjC"}
+{"version":3,"file":"GatewayClient.d.ts","sourceRoot":"","sources":["../../src/services/GatewayClient.ts"],"names":[],"mappings":"AAMA,KAAK,qBAAqB,GAAG;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACtC,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,CAAC;IACF,0EAA0E;IAC1E,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,OAAO,OAAO,KAAG,MAsB7C,CAAC;AAEF;;;GAGG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,aAAa,CAAsB;IAC3C,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAS;gBAEb,UAAU,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM;IAKlD,sEAAsE;IAChE,WAAW,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAkBlE;;;;;OAKG;IACG,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;YA0B5D,YAAY;IAmE1B,+DAA+D;YACjD,kBAAkB;CAoCjC"}

package/dist/services/GatewayClient.js

@@ -44,38 +44,73 @@ class GatewayClient {
     }
     /** Send a message to the gateway and return the raw text response. */
     async sendMessage(options) {
-        return this.makeRequest(options, 0);
+        const result = await this.postMessages({
+            model: options.model,
+            max_tokens: options.maxTokens,
+            temperature: options.temperature,
+            messages: [{ role: 'user', content: options.prompt }],
+        }, 0);
+        const content = result.content?.[0]?.text;
+        if (!content) {
+            throw new Error('No response content from LLM');
+        }
+        return content;
+    }
+    /**
+     * Send a request that forces the model to invoke a single tool, and return
+     * the parsed `input` of that tool call. Throws if the model didn't call the
+     * tool (which the API guarantees won't happen with `tool_choice: { type:
+     * 'tool' }`, but we check anyway).
+     */
+    async sendToolUse(options) {
+        const systemContent = options.cacheSystemPrompt
+            ? [{ type: 'text', text: options.system, cache_control: { type: 'ephemeral' } }]
+            : options.system;
+        const result = await this.postMessages({
+            model: options.model,
+            max_tokens: options.maxTokens,
+            temperature: options.temperature,
+            system: systemContent,
+            messages: [{ role: 'user', content: options.prompt }],
+            tools: [options.tool],
+            tool_choice: { type: 'tool', name: options.tool.name },
+        }, 0, { enableCaching: options.cacheSystemPrompt });
+        const toolUse = result.content
+            ?.find((b) => b.type === 'tool_use');
+        if (!toolUse || toolUse.input === undefined) {
+            throw new Error('Model did not return a tool_use block');
+        }
+        return toolUse.input;
     }
-    async makeRequest(options, retryCount) {
+    async postMessages(body, retryCount, options) {
         const authToken = this.configManager.getAuthToken();
         if (!authToken) {
             throw new Error('Not authenticated. Please run `rivet login` to authenticate.');
         }
+        const headers = {
+            Authorization: `Bearer ${authToken}`,
+            'Content-Type': 'application/json',
+            'anthropic-version': '2023-06-01',
+        };
+        if (options?.enableCaching) {
+            headers['anthropic-beta'] = 'prompt-caching-2024-07-31';
+        }
         const response = await fetch(`${this.gatewayUrl}/v1/messages`, {
             method: 'POST',
-            headers: {
-                Authorization: `Bearer ${authToken}`,
-                'Content-Type': 'application/json',
-                'anthropic-version': '2023-06-01',
-            },
-            body: JSON.stringify({
-                model: options.model,
-                max_tokens: options.maxTokens,
-                temperature: options.temperature,
-                messages: [{ role: 'user', content: options.prompt }],
-            }),
+            headers,
+            body: JSON.stringify({ ...body, service_tier: 'auto' }),
         });
         // Handle 401 — could be token expiry or a spend limit rejection from the gateway
         if (response.status === 401 && retryCount === 0) {
-            const body = await response.json().catch(() => ({}));
-            const reason = (0, exports.asReasonText)(body.message ?? body.error ?? body);
+            const errBody = await response.json().catch(() => ({}));
+            const reason = (0, exports.asReasonText)(errBody.message ?? errBody.error ?? errBody);
             if (reason.includes('SPEND_LIMIT_EXCEEDED:')) {
                 throw new Error(reason);
             }
             log.warn('Token expired, attempting to refresh...');
             const isRefreshed = await this.refreshAccessToken();
             if (isRefreshed) {
-                return this.makeRequest(options, retryCount + 1);
+                return this.postMessages(body, retryCount + 1, options);
             }
             throw new Error('Authentication expired. Please run `rivet logout` and `rivet login` to re-authenticate.');
         }
@@ -93,12 +128,7 @@ class GatewayClient {
                 .catch(() => 'Unable to read error');
             throw new Error(`Gateway request failed (${response.status}): ${errorText}`);
         }
-        const result = await response.json();
-        const content = result.content?.[0]?.text;
-        if (!content) {
-            throw new Error('No response content from LLM');
-        }
-        return content;
+        return response.json();
     }
     /** Refresh the access token using the stored refresh token. */
     async refreshAccessToken() {

package/dist/services/GatewayClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"GatewayClient.js","sourceRoot":"","sources":["../../src/services/GatewayClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GatewayClient.js","sourceRoot":"","sources":["../../src/services/GatewayClient.ts"],"names":[],"mappings":"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"}

package/dist/services/VariantCodeGeneratorService.d.ts

@@ -24,9 +24,16 @@ type GenerateParams = {
     instruction: string;
     element: ElementContext;
     variants: VariantInput[];
+    /**
+     * Diff currently applied to the main project tree (e.g. a finalized variant
+     * from another comment). Reversed before worktrees are created so each
+     * variant's diff is captured against the user's clean state, then re-applied
+     * after generation completes so the iframe doesn't visibly lose state.
+     */
+    currentAppliedDiff?: string;
     onEvent: (event: VariantCodeEvent) => void;
     abortController?: AbortController;
 };
-export declare const generateVariantCode: ({ sessionId, projectPath, instruction, element, variants, onEvent, abortController, }: GenerateParams) => Promise<void>;
+export declare const generateVariantCode: ({ sessionId, projectPath, instruction, element, variants, currentAppliedDiff, onEvent, abortController, }: GenerateParams) => Promise<void>;
 export {};
 //# sourceMappingURL=VariantCodeGeneratorService.d.ts.map

package/dist/services/VariantCodeGeneratorService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VariantCodeGeneratorService.d.ts","sourceRoot":"","sources":["../../src/services/VariantCodeGeneratorService.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAK5D,MAAM,MAAM,gBAAgB,GACxB;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACjE;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC9D;IAAE,IAAI,EAAE,kBAAkB,CAAA;CAAE,CAAC;AAEjC,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,cAAc,CAAC;IACxB,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,OAAO,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAC3C,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AA2BF,eAAO,MAAM,mBAAmB,GAAU,uFAQvC,cAAc,KAAG,OAAO,CAAC,IAAI,CAuC/B,CAAC"}
+{"version":3,"file":"VariantCodeGeneratorService.d.ts","sourceRoot":"","sources":["../../src/services/VariantCodeGeneratorService.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAM5D,MAAM,MAAM,gBAAgB,GACxB;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACjE;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC9D;IAAE,IAAI,EAAE,kBAAkB,CAAA;CAAE,CAAC;AAEjC,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,cAAc,CAAC;IACxB,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAC3C,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAsCF,eAAO,MAAM,mBAAmB,GAAU,2GASvC,cAAc,KAAG,OAAO,CAAC,IAAI,CAiF/B,CAAC"}