Merge remote-tracking branch 'origin/main' into lg/import-slices

Author: jomifepe

packages/adapter-next/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/adapter-next",
-	"version": "0.3.88",
+	"version": "0.3.91",
 	"description": "Slice Machine adapter for Next.js.",
 	"keywords": [
 		"typescript",

packages/adapter-nuxt/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/adapter-nuxt",
-	"version": "0.3.88",
+	"version": "0.3.91",
 	"description": "Slice Machine adapter for Nuxt.",
 	"keywords": [
 		"typescript",

packages/adapter-nuxt2/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/adapter-nuxt2",
-	"version": "0.3.88",
+	"version": "0.3.91",
 	"description": "Slice Machine adapter for Nuxt 2.",
 	"keywords": [
 		"typescript",

packages/adapter-sveltekit/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/adapter-sveltekit",
-	"version": "0.3.88",
+	"version": "0.3.91",
 	"description": "Slice Machine adapter for SvelteKit.",
 	"keywords": [
 		"typescript",

packages/init/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/init",
-	"version": "2.10.44",
+	"version": "2.10.47",
 	"description": "Init Prismic Slice Machine in your project",
 	"keywords": [
 		"typescript",

packages/init/test/__setup__.ts

@@ -39,29 +39,10 @@ vi.mock("log-symbols", async () => {
 
 vi.mock("fs", async () => {
 	const memfs: typeof import("memfs") = await vi.importActual("memfs");
-	const _fs: typeof import("node:fs") = await vi.importActual("node:fs");
-
-	// Create escape mechanism for realpathSync to allow the Claude SDK to initialize
-	// The SDK calls realpathSync at module load time, which needs the real filesystem
-	const realpathSync = (
-		path: string | Buffer,
-		options?: { encoding?: BufferEncoding },
-	) => {
-		try {
-			return _fs.realpathSync(path, options);
-		} catch {
-			// If real fs fails, try memfs
-			return memfs.fs.realpathSync(path, options);
-		}
-	};
 
 	return {
 		...memfs.fs,
-		realpathSync,
-		default: {
-			...memfs.fs,
-			realpathSync,
-		},
+		default: memfs.fs,
 	};
 });
 
@@ -104,7 +85,6 @@ vi.mock("@anthropic-ai/claude-agent-sdk", () => {
 	return {
 		createClient: vi.fn(),
 		Agent: vi.fn(),
-		query: vi.fn(),
 	};
 });
 

packages/manager/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/manager",
-	"version": "0.26.1",
+	"version": "0.26.4",
 	"description": "Manage all aspects of a Slice Machine project.",
 	"repository": {
 		"type": "git",

packages/manager/src/errors.ts

@@ -43,6 +43,10 @@ export class UnsupportedError extends SliceMachineError {
 	name = "SMUnsupportedError" as const;
 }
 
+export class InferSliceAbortError extends SliceMachineError {
+	name = "SMInferSliceAbortError" as const;
+}
+
 type SliceMachineErrorNames =
 	| "SMSliceMachineError"
 	| UnauthorizedError["name"]
@@ -53,7 +57,8 @@ type SliceMachineErrorNames =
 	| PluginError["name"]
 	| PluginHookResultError["name"]
 	| InvalidActiveEnvironmentError["name"]
-	| UnsupportedError["name"];
+	| UnsupportedError["name"]
+	| InferSliceAbortError["name"];
 
 type ShallowSliceMachineError<TName extends SliceMachineErrorNames> = Error & {
 	name: TName;
@@ -117,3 +122,9 @@ export const isUnsupportedError = (
 ): error is ShallowSliceMachineError<"SMUnsupportedError"> => {
 	return isSliceMachineError(error, "SMUnsupportedError");
 };
+
+export const isInferSliceAbortError = (
+	error: unknown,
+): error is ShallowSliceMachineError<"SMInferSliceAbortError"> => {
+	return isSliceMachineError(error, "SMInferSliceAbortError");
+};

packages/manager/src/index.ts

@@ -41,6 +41,7 @@ export {
 	PluginHookResultError,
 	InvalidActiveEnvironmentError,
 	UnsupportedError,
+	InferSliceAbortError,
 } from "./errors";
 
 export { getEnvironmentInfo } from "./getEnvironmentInfo";

packages/manager/src/managers/customTypes/CustomTypesManager.ts

@@ -32,7 +32,7 @@ import fetch from "../../lib/fetch";
 import { OnlyHookErrors } from "../../types";
 import { API_ENDPOINTS } from "../../constants/API_ENDPOINTS";
 import { SLICE_MACHINE_USER_AGENT } from "../../constants/SLICE_MACHINE_USER_AGENT";
-import { UnauthorizedError } from "../../errors";
+import { InferSliceAbortError, UnauthorizedError } from "../../errors";
 
 import { BaseManager } from "../BaseManager";
 import { CustomTypeFormat } from "./types";
@@ -42,13 +42,16 @@ import { randomUUID } from "node:crypto";
 import { join as joinPath, relative as relativePath } from "node:path";
 import {
 	mkdtemp,
-	rename,
 	rm,
 	writeFile,
 	readFile,
 	readdir,
+	copyFile,
 } from "node:fs/promises";
-import { query as queryClaude } from "@anthropic-ai/claude-agent-sdk";
+import {
+	AbortError as ClaudeAbortError,
+	query as queryClaude,
+} from "@anthropic-ai/claude-agent-sdk";
 
 type SliceMachineManagerReadCustomTypeLibraryReturnType = {
 	ids: string[];
@@ -580,6 +583,8 @@ export class CustomTypesManager extends BaseManager {
 		console.info(`inferSlice (${source}) started for request ${requestId}`);
 		const startTime = Date.now();
 
+		const claudeErrors: string[] = [];
+
 		try {
 			if (source === "figma") {
 				const { libraryID } = args;
@@ -595,6 +600,7 @@ export class CustomTypesManager extends BaseManager {
 					.parse(exp.payload);
 
 				let tmpDir: string | undefined;
+
 				try {
 					const config = await this.project.getSliceMachineConfig();
 
@@ -814,13 +820,23 @@ FINAL REMINDERS:
 - DO NOT ATTEMPT TO BUILD THE APPLICATION
 - START IMMEDIATELY WITH STEP 1.1 - NO PRELIMINARY ANALYSIS`;
 
+					void this.telemetry.track({
+						event: "slice-generation:started",
+						source,
+						llmProxyUrl,
+					});
+
 					const queries = queryClaude({
 						prompt,
 						options: {
 							cwd,
-							stderr: (data) => {
-								if (!data.startsWith("Spawning Claude Code process")) {
-									console.error("inferSlice error:" + data);
+							stderr: (error) => {
+								if (!error.startsWith("Spawning Claude Code process")) {
+									claudeErrors.push(error);
+									console.error(
+										`inferSlice - stderr for request ${requestId}:`,
+										error,
+									);
 								}
 							},
 							model: "claude-haiku-4-5",
@@ -850,7 +866,7 @@ FINAL REMINDERS:
 								]),
 							],
 							env: {
-								...process.env,
+								...this.sanitizeClaudeEnv(process.env),
 								ANTHROPIC_BASE_URL: llmProxyUrl,
 								ANTHROPIC_CUSTOM_HEADERS:
 									`x-prismic-token: ${authToken}\n` +
@@ -873,10 +889,25 @@ FINAL REMINDERS:
 					for await (const query of queries) {
 						switch (query.type) {
 							case "result":
-								if (query.subtype === "success") {
-									newSliceAbsPath = query.result.match(
-										/<new_slice_path>(.*)<\/new_slice_path>/s,
-									)?.[1];
+								switch (query.subtype) {
+									case "success":
+										if (!query.is_error) {
+											newSliceAbsPath = query.result.match(
+												/<new_slice_path>(.*)<\/new_slice_path>/s,
+											)?.[1];
+										} else {
+											claudeErrors.push(query.result);
+										}
+										break;
+									case "error_during_execution":
+									case "error_max_budget_usd":
+									case "error_max_turns":
+										claudeErrors.push(...query.errors);
+										console.error(
+											`inferSlice - result query error for request ${requestId}}:`,
+											query.errors,
+										);
+										break;
 								}
 								break;
 						}
@@ -897,12 +928,21 @@ FINAL REMINDERS:
 						);
 					}
 
-					// move the screenshot image to the new slice directory
-					await rename(
+					// copy instead of moving because the file might be in a different volume
+					await copyFile(
 						tmpImageAbsPath,
 						joinPath(newSliceAbsPath, "screenshot-default.png"),
 					);
 
+					try {
+						await rm(tmpImageAbsPath);
+					} catch (error) {
+						console.warn(
+							`inferSlice - Failed to delete temporary slice screenshot at ${tmpImageAbsPath}`,
+							error,
+						);
+					}
+
 					return InferSliceResponse.parse({ slice: JSON.parse(model) });
 				} finally {
 					if (tmpDir && existsSync(tmpDir)) {
@@ -930,12 +970,25 @@ FINAL REMINDERS:
 				return InferSliceResponse.parse(json);
 			}
 		} catch (error) {
+			if (
+				error instanceof ClaudeAbortError ||
+				(error instanceof Error && error.name === "AbortError")
+			) {
+				console.warn(`inferSlice (${source}) request ${requestId} was aborted`);
+				throw new InferSliceAbortError();
+			}
+
 			console.error(
 				`inferSlice (${source}) failed for request ${requestId}`,
 				error,
 			);
-
-			throw error;
+			throw new Error(`inferSlice encountered errors`, {
+				cause: {
+					error,
+					...(claudeErrors.length > 0 ? { claudeErrors } : {}),
+					args,
+				},
+			});
 		} finally {
 			this.inferSliceAbortControllers.delete(requestId);
 			clearTimeout(timeoutId);
@@ -947,6 +1000,35 @@ FINAL REMINDERS:
 		}
 	}
 
+	// https://code.claude.com/docs/en/settings#environment-variables
+	private claudeExcludePatterns = [
+		"ANTHROPIC_",
+		"CLAUDE_",
+		"MCP_",
+		"VERTEX_",
+		"DISABLE_",
+		"BASH_",
+		"AWS_",
+		"SLASH_COMMAND_",
+		"NO_PROXY",
+		"HTTP_PROXY",
+		"HTTPS_PROXY",
+		"HTTP_MAX_REDIRECTS",
+		"MAX_THINKING_TOKENS",
+		"USE_BUILTIN_RIPGREP",
+	];
+
+	private sanitizeClaudeEnv(env: Record<string, string | undefined>) {
+		return Object.fromEntries(
+			Object.entries(env).filter(([key, value]) => {
+				return (
+					value !== undefined &&
+					!this.claudeExcludePatterns.some((pattern) => key.startsWith(pattern))
+				);
+			}),
+		);
+	}
+
 	cancelInferSlice(args: { requestId: string }): { cancelled: boolean } {
 		const { requestId } = args;
 		const abortController = this.inferSliceAbortControllers.get(requestId);