@spotpatch/vite 1.0.0 → 1.1.0

package/dist/index.d.cts

@@ -1,8 +1,19 @@
 import { Plugin } from 'vite';
-import { ContextBudget, SpotPatchLocalePreference, ResolvedAiOptions, AiOptions } from '@spotpatch/shared';
-export { AgentApplyMode, AgentCheckDefinition, AgentLimits, AiExecutionOptions, AiModelProfile, AiOptions, AiProviderProtocol, ContextBudget, DEFAULT_AGENT_LIMITS, OpenAICompatibleProviderOptions } from '@spotpatch/shared';
+import { ContextBudget, SpotPatchLocalePreference, ResolvedAiOptions, AiProviderProtocol, AiProviderAuthentication, AiExecutionOptions, AiOptions } from '@spotpatch/shared';
+export { AgentApplyMode, AgentCheckDefinition, AgentLimits, AiExecutionOptions, AiModelProfile, AiOptions, AiProviderAuthentication, AiProviderProtocol, ContextBudget, DEFAULT_AGENT_LIMITS, OpenAICompatibleProviderOptions } from '@spotpatch/shared';
 
 type FilterEntry = string | RegExp;
+interface SimpleAiOptions {
+    readonly baseURL: string;
+    readonly model: string;
+    readonly apiKeyEnv?: string;
+    readonly protocol?: AiProviderProtocol;
+    readonly authentication?: AiProviderAuthentication;
+    readonly providerLabel?: string;
+    readonly modelLabel?: string;
+    readonly execution?: AiExecutionOptions;
+}
+type SpotPatchAiOptions = false | SimpleAiOptions | AiOptions;
 interface SpotPatchOptions {
     readonly enabled?: boolean;
     readonly include?: readonly FilterEntry[];
@@ -15,7 +26,7 @@ interface SpotPatchOptions {
     readonly debug?: boolean;
     readonly locale?: SpotPatchLocalePreference;
     readonly maxTargets?: number;
-    readonly ai?: false | AiOptions;
+    readonly ai?: SpotPatchAiOptions;
 }
 interface ResolvedSpotPatchOptions {
     readonly enabled: boolean;
@@ -52,8 +63,8 @@ declare const DEFAULT_OPTIONS: Readonly<{
     maxTargets: number;
     ai: false;
 }>;
-declare function resolveOptions(options?: SpotPatchOptions): ResolvedSpotPatchOptions;
+declare function resolveOptions(options?: SpotPatchOptions, environmentAi?: false | SimpleAiOptions): ResolvedSpotPatchOptions;
 
 declare function spotPatch(userOptions?: SpotPatchOptions): Plugin[];
 
-export { DEFAULT_OPTIONS, type ResolvedSpotPatchOptions, type SpotPatchOptions, resolveOptions, spotPatch };
+export { DEFAULT_OPTIONS, type ResolvedSpotPatchOptions, type SimpleAiOptions, type SpotPatchAiOptions, type SpotPatchOptions, resolveOptions, spotPatch };

package/dist/index.d.ts

@@ -1,8 +1,19 @@
 import { Plugin } from 'vite';
-import { ContextBudget, SpotPatchLocalePreference, ResolvedAiOptions, AiOptions } from '@spotpatch/shared';
-export { AgentApplyMode, AgentCheckDefinition, AgentLimits, AiExecutionOptions, AiModelProfile, AiOptions, AiProviderProtocol, ContextBudget, DEFAULT_AGENT_LIMITS, OpenAICompatibleProviderOptions } from '@spotpatch/shared';
+import { ContextBudget, SpotPatchLocalePreference, ResolvedAiOptions, AiProviderProtocol, AiProviderAuthentication, AiExecutionOptions, AiOptions } from '@spotpatch/shared';
+export { AgentApplyMode, AgentCheckDefinition, AgentLimits, AiExecutionOptions, AiModelProfile, AiOptions, AiProviderAuthentication, AiProviderProtocol, ContextBudget, DEFAULT_AGENT_LIMITS, OpenAICompatibleProviderOptions } from '@spotpatch/shared';
 
 type FilterEntry = string | RegExp;
+interface SimpleAiOptions {
+    readonly baseURL: string;
+    readonly model: string;
+    readonly apiKeyEnv?: string;
+    readonly protocol?: AiProviderProtocol;
+    readonly authentication?: AiProviderAuthentication;
+    readonly providerLabel?: string;
+    readonly modelLabel?: string;
+    readonly execution?: AiExecutionOptions;
+}
+type SpotPatchAiOptions = false | SimpleAiOptions | AiOptions;
 interface SpotPatchOptions {
     readonly enabled?: boolean;
     readonly include?: readonly FilterEntry[];
@@ -15,7 +26,7 @@ interface SpotPatchOptions {
     readonly debug?: boolean;
     readonly locale?: SpotPatchLocalePreference;
     readonly maxTargets?: number;
-    readonly ai?: false | AiOptions;
+    readonly ai?: SpotPatchAiOptions;
 }
 interface ResolvedSpotPatchOptions {
     readonly enabled: boolean;
@@ -52,8 +63,8 @@ declare const DEFAULT_OPTIONS: Readonly<{
     maxTargets: number;
     ai: false;
 }>;
-declare function resolveOptions(options?: SpotPatchOptions): ResolvedSpotPatchOptions;
+declare function resolveOptions(options?: SpotPatchOptions, environmentAi?: false | SimpleAiOptions): ResolvedSpotPatchOptions;
 
 declare function spotPatch(userOptions?: SpotPatchOptions): Plugin[];
 
-export { DEFAULT_OPTIONS, type ResolvedSpotPatchOptions, type SpotPatchOptions, resolveOptions, spotPatch };
+export { DEFAULT_OPTIONS, type ResolvedSpotPatchOptions, type SimpleAiOptions, type SpotPatchAiOptions, type SpotPatchOptions, resolveOptions, spotPatch };

package/dist/index.js

@@ -1,3 +1,68 @@
+// src/plugin.ts
+import path10 from "path";
+import { loadEnv } from "vite";
+
+// src/environment-ai.ts
+var AI_ENVIRONMENT_NAMES = Object.freeze({
+  authentication: "SPOTPATCH_AI_AUTHENTICATION",
+  baseURL: "SPOTPATCH_AI_BASE_URL",
+  credential: "SPOTPATCH_AI_API_KEY",
+  model: "SPOTPATCH_AI_MODEL",
+  protocol: "SPOTPATCH_AI_PROTOCOL"
+});
+function normalizedValue(environment, name) {
+  const value = environment[name];
+  if (value === void 0 || value.trim().length === 0) {
+    return void 0;
+  }
+  return value.trim();
+}
+function resolveEnvironmentAiConfiguration(environment) {
+  const baseURL = normalizedValue(environment, AI_ENVIRONMENT_NAMES.baseURL);
+  const model = normalizedValue(environment, AI_ENVIRONMENT_NAMES.model);
+  const credential = normalizedValue(environment, AI_ENVIRONMENT_NAMES.credential);
+  const protocol = normalizedValue(environment, AI_ENVIRONMENT_NAMES.protocol);
+  const authentication = normalizedValue(
+    environment,
+    AI_ENVIRONMENT_NAMES.authentication
+  );
+  const configuredValues = [baseURL, model, credential, protocol, authentication];
+  if (configuredValues.every((value) => value === void 0)) {
+    return Object.freeze({ ai: false });
+  }
+  const missing = [
+    [AI_ENVIRONMENT_NAMES.baseURL, baseURL],
+    [AI_ENVIRONMENT_NAMES.model, model],
+    [AI_ENVIRONMENT_NAMES.credential, credential]
+  ].filter((entry) => entry[1] === void 0).map(([name]) => name);
+  if (missing.length > 0) {
+    throw new RangeError(
+      `SpotPatch AI environment configuration is incomplete; missing ${missing.join(", ")}.`
+    );
+  }
+  if (baseURL === void 0 || model === void 0 || credential === void 0) {
+    throw new RangeError("SpotPatch AI environment configuration is incomplete.");
+  }
+  if (protocol !== void 0 && protocol !== "responses" && protocol !== "chat-completions") {
+    throw new RangeError(
+      "SpotPatch SPOTPATCH_AI_PROTOCOL must be responses or chat-completions."
+    );
+  }
+  if (authentication !== void 0 && authentication !== "bearer" && authentication !== "x-api-key") {
+    throw new RangeError(
+      "SpotPatch SPOTPATCH_AI_AUTHENTICATION must be bearer or x-api-key."
+    );
+  }
+  return Object.freeze({
+    ai: Object.freeze({
+      baseURL,
+      model,
+      ...protocol === void 0 ? {} : { protocol },
+      ...authentication === void 0 ? {} : { authentication }
+    })
+  });
+}
+
 // src/options.ts
 import {
   DEFAULT_AGENT_LIMITS,
@@ -66,6 +131,7 @@ var aiOptionsSchema = z.strictObject({
       type: z.literal("openai-compatible"),
       label: z.string(),
       protocol: z.enum(["responses", "chat-completions"]),
+      authentication: z.enum(["bearer", "x-api-key"]).optional(),
       baseURL: z.string(),
       apiKeyEnv: z.string(),
       models: z.record(
@@ -83,6 +149,16 @@ var aiOptionsSchema = z.strictObject({
     limits: agentLimitsSchema
   }).optional()
 });
+var simpleAiOptionsSchema = z.strictObject({
+  baseURL: z.string(),
+  model: z.string(),
+  apiKeyEnv: z.string().optional(),
+  protocol: z.enum(["responses", "chat-completions"]).optional(),
+  authentication: z.enum(["bearer", "x-api-key"]).optional(),
+  providerLabel: z.string().optional(),
+  modelLabel: z.string().optional(),
+  execution: aiOptionsSchema.shape.execution
+});
 function assertIdentifier(value, label) {
   if (!PROFILE_ID_PATTERN.test(value)) {
     throw new RangeError(
@@ -182,6 +258,7 @@ function resolveProviders(providers) {
             type: provider.type,
             label: nonEmpty(provider.label, "provider label", 100),
             protocol: provider.protocol,
+            authentication: provider.authentication ?? "bearer",
             baseURL: normalizeProviderBaseURL(provider.baseURL),
             apiKeyEnv: provider.apiKeyEnv,
             models,
@@ -225,7 +302,36 @@ function resolveAiOptions(options) {
   if (options === void 0 || options === false) {
     return false;
   }
-  const parsed = aiOptionsSchema.safeParse(options);
+  const expanded = "providers" in options ? options : (() => {
+    const simple = simpleAiOptionsSchema.safeParse(options);
+    if (!simple.success) {
+      throw new RangeError("SpotPatch AI configuration is invalid.");
+    }
+    const providerId = "default";
+    const modelId = "default";
+    return {
+      providers: {
+        [providerId]: {
+          type: "openai-compatible",
+          label: simple.data.providerLabel ?? "AI provider",
+          protocol: simple.data.protocol ?? "chat-completions",
+          authentication: simple.data.authentication ?? "bearer",
+          baseURL: simple.data.baseURL,
+          apiKeyEnv: simple.data.apiKeyEnv ?? "SPOTPATCH_AI_API_KEY",
+          models: {
+            [modelId]: {
+              label: simple.data.modelLabel ?? "AI model",
+              model: simple.data.model
+            }
+          },
+          defaultModel: modelId
+        }
+      },
+      defaultProvider: providerId,
+      ...simple.data.execution === void 0 ? {} : { execution: simple.data.execution }
+    };
+  })();
+  const parsed = aiOptionsSchema.safeParse(expanded);
   if (!parsed.success) {
     throw new RangeError("SpotPatch AI configuration is invalid.");
   }
@@ -285,7 +391,7 @@ function assertPositiveBudget(budget) {
     }
   }
 }
-function resolveOptions(options = {}) {
+function resolveOptions(options = {}, environmentAi) {
   const budget = Object.freeze({
     ...DEFAULT_OPTIONS.budget,
     ...options.budget
@@ -313,7 +419,7 @@ function resolveOptions(options = {}) {
     debug: options.debug ?? DEFAULT_OPTIONS.debug,
     locale,
     maxTargets,
-    ai: resolveAiOptions(options.ai)
+    ai: resolveAiOptions(options.ai ?? environmentAi)
   };
   if (resolved.shortcut.trim().length === 0) {
     throw new RangeError("SpotPatch shortcut cannot be empty.");
@@ -370,7 +476,7 @@ import path2 from "path";
 // package.json
 var package_default = {
   name: "@spotpatch/vite",
-  version: "1.0.0",
+  version: "1.1.0",
   description: "Vite development plugin for SpotPatch.",
   license: "MIT",
   repository: {
@@ -462,15 +568,16 @@ function readConsumerViteVersion(root) {
   return VITE_VERSION;
 }
 function createClientModule(input, clientBundle, viteVersion) {
+  const options = input.context.getOptions();
   const runtimeConfig = {
-    ai: createRuntimeAiConfig(input.options.ai),
-    budget: input.options.budget,
-    debug: input.options.debug,
-    locale: input.options.locale,
-    maxTargets: input.options.maxTargets,
-    redact: input.options.redact,
+    ai: createRuntimeAiConfig(options.ai),
+    budget: options.budget,
+    debug: options.debug,
+    locale: options.locale,
+    maxTargets: options.maxTargets,
+    redact: options.redact,
     sessionToken: input.session.token,
-    shortcut: input.options.shortcut,
+    shortcut: options.shortcut,
     spotPatchVersion: package_default.version,
     viteVersion
   };
@@ -602,7 +709,7 @@ function snapshot(job) {
   );
 }
 function capabilityCacheKey(provider, model) {
-  const configurationDigest = createHash("sha256").update(provider.baseURL).update("\0").update(provider.protocol).digest("hex");
+  const configurationDigest = createHash("sha256").update(provider.baseURL).update("\0").update(provider.protocol).update("\0").update(provider.authentication).digest("hex");
   return `${provider.id}:${model.id}:${configurationDigest}`;
 }
 function freezeEvent(event) {
@@ -1550,18 +1657,18 @@ var EVENT_STREAM_END_STATUSES = /* @__PURE__ */ new Set([
   "reverted",
   "failed"
 ]);
-function matchAgentRequestPath(path10) {
-  if (path10 === SPOTPATCH_ENDPOINTS.agentCapability) {
+function matchAgentRequestPath(path11) {
+  if (path11 === SPOTPATCH_ENDPOINTS.agentCapability) {
     return Object.freeze({ kind: "capability" });
   }
-  if (path10 === SPOTPATCH_ENDPOINTS.agentJobs) {
+  if (path11 === SPOTPATCH_ENDPOINTS.agentJobs) {
     return Object.freeze({ kind: "create-job" });
   }
   const prefix = `${SPOTPATCH_ENDPOINTS.agentJobs}/`;
-  if (!path10.startsWith(prefix)) {
+  if (!path11.startsWith(prefix)) {
     return void 0;
   }
-  const segments = path10.slice(prefix.length).split("/");
+  const segments = path11.slice(prefix.length).split("/");
   const jobId = segments[0];
   const action = segments[1];
   if (segments.length !== 2 || jobId === void 0 || !AGENT_JOB_ID_PATTERN.test(jobId) || action === void 0 || !AGENT_JOB_ACTIONS.has(action)) {
@@ -1903,9 +2010,9 @@ async function handleOpenEditor(request, options) {
 }
 function createSpotPatchMiddleware(options) {
   return (request, response, next) => {
-    const path10 = requestPath(request);
-    const agentRoute = matchAgentRequestPath(path10);
-    if (path10 !== SPOTPATCH_ENDPOINTS2.sourceContext && path10 !== SPOTPATCH_ENDPOINTS2.openEditor && agentRoute === void 0 && !path10.startsWith(`${SPOTPATCH_API_BASE}/`)) {
+    const path11 = requestPath(request);
+    const agentRoute = matchAgentRequestPath(path11);
+    if (path11 !== SPOTPATCH_ENDPOINTS2.sourceContext && path11 !== SPOTPATCH_ENDPOINTS2.openEditor && agentRoute === void 0 && !path11.startsWith(`${SPOTPATCH_API_BASE}/`)) {
       next();
       return;
     }
@@ -1914,7 +2021,7 @@ function createSpotPatchMiddleware(options) {
         allowLan: options.options.allowLan,
         sessionToken: options.session.token
       });
-      if (path10 === SPOTPATCH_ENDPOINTS2.sourceContext) {
+      if (path11 === SPOTPATCH_ENDPOINTS2.sourceContext) {
         if (request.method !== "POST") {
           throw new SpotPatchError8(ERROR_CODES8.INVALID_REQUEST);
         }
@@ -1922,7 +2029,7 @@ function createSpotPatchMiddleware(options) {
         writeJson(response, 200, { ok: true, data });
         return;
       }
-      if (path10 === SPOTPATCH_ENDPOINTS2.openEditor) {
+      if (path11 === SPOTPATCH_ENDPOINTS2.openEditor) {
         if (request.method !== "POST") {
           throw new SpotPatchError8(ERROR_CODES8.INVALID_REQUEST);
         }
@@ -1970,11 +2077,16 @@ function createServerPlugin(input) {
         throw new Error("SpotPatch server initialized before Vite config resolution.");
       }
       const root = path6.resolve(config.root);
-      agentManager = input.options.ai === false ? void 0 : createAgentJobManager({ ai: input.options.ai, root });
+      const options = input.context.getOptions();
+      agentManager = options.ai === false ? void 0 : createAgentJobManager({
+        ai: options.ai,
+        environment: input.context.getCredentialEnvironment(),
+        root
+      });
       server.middlewares.use(
         createSpotPatchMiddleware({
           ...agentManager === void 0 ? {} : { agentManager },
-          options: input.options,
+          options,
           registry: input.registry,
           root,
           session: input.session,
@@ -1985,7 +2097,7 @@ function createServerPlugin(input) {
         void closeResources();
       });
       config.logger.info(
-        `[spotpatch:vite] Ready. Toggle picker with ${input.options.shortcut}.`
+        `[spotpatch:vite] Ready. Toggle picker with ${options.shortcut}.`
       );
     },
     async closeBundle() {
@@ -2180,7 +2292,7 @@ function getDisplayPath(root, id) {
 }
 function createTransformPlugin(input) {
   let root = process.cwd();
-  let filter = createTransformFilter(root, input.options);
+  let filter = createTransformFilter(root, input.context.getOptions());
   let logger;
   const warnedFiles = /* @__PURE__ */ new Set();
   const cache = /* @__PURE__ */ new Map();
@@ -2188,9 +2300,12 @@ function createTransformPlugin(input) {
     name: "spotpatch:transform",
     apply: "serve",
     enforce: "pre",
+    config(config, environment) {
+      input.configure?.(config, environment);
+    },
     configResolved(config) {
       root = path9.resolve(config.root);
-      filter = createTransformFilter(root, input.options);
+      filter = createTransformFilter(root, input.context.getOptions());
       logger = config.logger;
     },
     transform(code, id) {
@@ -2203,6 +2318,7 @@ function createTransformPlugin(input) {
         return cache.get(cacheKey) ?? null;
       }
       const startedAt = performance.now();
+      const options = input.context.getOptions();
       try {
         const result = injectSourceMarkers({
           code,
@@ -2220,7 +2336,7 @@ function createTransformPlugin(input) {
           map: result.map.toString()
         });
         cache.set(cacheKey, output);
-        if (input.options.debug) {
+        if (options.debug) {
           const elapsed = performance.now() - startedAt;
           logger?.info(
             `[spotpatch:transform] ${getDisplayPath(root, id)} ${elapsed.toFixed(2)}ms`
@@ -2230,7 +2346,7 @@ function createTransformPlugin(input) {
       } catch (error) {
         if (!warnedFiles.has(cleanId)) {
           warnedFiles.add(cleanId);
-          const detail = input.options.debug && error instanceof Error ? `: ${error.message}` : "";
+          const detail = options.debug && error instanceof Error ? `: ${error.message}` : "";
           logger?.warn(
             `[spotpatch:transform] Failed to transform ${getDisplayPath(root, id)}; using original module${detail}`
           );
@@ -2243,16 +2359,46 @@ function createTransformPlugin(input) {
 
 // src/plugin.ts
 function spotPatch(userOptions = {}) {
-  const options = resolveOptions(userOptions);
+  let options = resolveOptions(userOptions);
+  let credentialEnvironment = Object.freeze({});
   if (!options.enabled) {
     return [];
   }
   const registry = createSourceRegistry();
   const session = createSession();
+  const context = Object.freeze({
+    getCredentialEnvironment: () => credentialEnvironment,
+    getOptions: () => options
+  });
+  const configure = (config, environment) => {
+    const root = path10.resolve(process.cwd(), config.root ?? ".");
+    const loadedEnvironment = config.envDir === false ? process.env : loadEnv(environment.mode, path10.resolve(root, config.envDir ?? "."), "");
+    const environmentAi = userOptions.ai === void 0 ? resolveEnvironmentAiConfiguration(loadedEnvironment).ai : false;
+    options = resolveOptions(userOptions, environmentAi);
+    if (options.ai === false) {
+      credentialEnvironment = Object.freeze({});
+      return;
+    }
+    const names = new Set(
+      Object.values(options.ai.providers).map((provider) => provider.apiKeyEnv)
+    );
+    const missing = [...names].filter((name) => {
+      const value = loadedEnvironment[name];
+      return value === void 0 || value.trim().length === 0;
+    });
+    if (missing.length > 0) {
+      throw new RangeError(
+        `SpotPatch AI credential environment is missing ${missing.join(", ")}.`
+      );
+    }
+    credentialEnvironment = Object.freeze(
+      Object.fromEntries([...names].map((name) => [name, loadedEnvironment[name]]))
+    );
+  };
   return [
-    createTransformPlugin({ options, registry }),
-    createRuntimeInjectionPlugin({ options, session }),
-    createServerPlugin({ options, registry, session })
+    createTransformPlugin({ configure, context, registry }),
+    createRuntimeInjectionPlugin({ context, session }),
+    createServerPlugin({ context, registry, session })
   ];
 }