wave-agent-sdk 0.9.2 → 0.9.4

package/src/services/configurationService.ts

@@ -69,30 +69,10 @@ export class ConfigurationService {
     workdir: string,
   ): Promise<ConfigurationLoadResult> {
     try {
-      const userConfigPaths = getUserConfigPaths();
-      const projectConfigPaths = getProjectConfigPaths(workdir);
-
       // Use the merged configuration function (this loads user and project configs internally)
       const mergedConfig = loadMergedWaveConfig(workdir);
 
-      // Track loading context for better error messages by checking which files exist
-      const loadingContext: string[] = [];
-      const userPath = userConfigPaths.find((path) => existsSync(path));
-      if (userPath) {
-        loadingContext.push(`user config from ${userPath}`);
-      }
-
-      const projectPath = projectConfigPaths.find((path) => existsSync(path));
-      if (projectPath) {
-        loadingContext.push(`project config from ${projectPath}`);
-      }
-
       if (!mergedConfig) {
-        const message =
-          loadingContext.length > 0
-            ? `No valid configuration found despite attempting to load: ${loadingContext.join(", ")}`
-            : "No configuration files found in user or project directories";
-
         // Still set system environment variables even if no config is found
         const env = { WAVE_PROJECT_DIR: workdir };
         this.setEnvironmentVars(env);
@@ -100,7 +80,9 @@ export class ConfigurationService {
         return {
           configuration: { env },
           success: true, // No config is valid
-          warnings: [message],
+          warnings: [
+            "No configuration files found in user or project directories",
+          ],
         };
       }
 
@@ -108,11 +90,10 @@ export class ConfigurationService {
       const validation = this.validateConfiguration(mergedConfig);
 
       if (!validation.isValid) {
-        const sourcePaths = loadingContext.join(" and ");
         return {
           configuration: null,
           success: false,
-          error: `Merged configuration validation failed (sources: ${sourcePaths}): ${validation.errors.join(", ")}`,
+          error: `Merged configuration validation failed: ${validation.errors.join(", ")}`,
           warnings: validation.warnings,
         };
       }
@@ -128,12 +109,10 @@ export class ConfigurationService {
       this.setEnvironmentVars(env);
       mergedConfig.env = env;
 
-      const sourcePaths = loadingContext.join(" and ");
-
       return {
         configuration: mergedConfig,
         success: true,
-        sourcePath: sourcePaths || "merged configuration",
+        sourcePath: "merged configuration",
         warnings: validation.warnings,
       };
     } catch (error) {
@@ -342,13 +321,6 @@ export class ConfigurationService {
 
   // Utility operations
 
-  /**
-   * Get currently loaded configuration
-   */
-  getCurrentConfiguration(): WaveConfiguration | null {
-    return this.currentConfiguration;
-  }
-
   /**
    * Set environment variables from configuration
    * This replaces direct process.env modification
@@ -408,16 +380,6 @@ export class ConfigurationService {
       resolvedBaseURL = this.env.WAVE_BASE_URL || "";
     }
 
-    // If we have a parent configuration, use it as a fallback for API key and base URL
-    if (this.currentConfiguration?.env) {
-      if (resolvedApiKey === undefined) {
-        resolvedApiKey = this.currentConfiguration.env.WAVE_API_KEY;
-      }
-      if (!resolvedBaseURL) {
-        resolvedBaseURL = this.currentConfiguration.env.WAVE_BASE_URL || "";
-      }
-    }
-
     // Fallback to process.env if still not resolved (for dynamic updates in tests)
     if (resolvedApiKey === undefined) {
       resolvedApiKey = process.env.WAVE_API_KEY;
@@ -486,9 +448,6 @@ export class ConfigurationService {
     // Resolve agent model: override > options > env (settings.json) > process.env > default
     let resolvedAgentModel = model || this.options.model || this.env.WAVE_MODEL;
 
-    if (!resolvedAgentModel && this.currentConfiguration?.env?.WAVE_MODEL) {
-      resolvedAgentModel = this.currentConfiguration.env.WAVE_MODEL;
-    }
     resolvedAgentModel =
       resolvedAgentModel || process.env.WAVE_MODEL || DEFAULT_AGENT_MODEL;
 
@@ -496,9 +455,6 @@ export class ConfigurationService {
     let resolvedFastModel =
       fastModel || this.options.fastModel || this.env.WAVE_FAST_MODEL;
 
-    if (!resolvedFastModel && this.currentConfiguration?.env?.WAVE_FAST_MODEL) {
-      resolvedFastModel = this.currentConfiguration.env.WAVE_FAST_MODEL;
-    }
     resolvedFastModel =
       resolvedFastModel || process.env.WAVE_FAST_MODEL || DEFAULT_FAST_MODEL;
 
@@ -638,7 +594,7 @@ export class ConfigurationService {
   }
 
   /**
-   * Add a permission rule to the project's settings.local.json
+   * Add a permission rule to the local settings.local.json
    */
   async addAllowedRule(workdir: string, rule: string): Promise<void> {
     const localConfigPath = path.join(workdir, ".wave", "settings.local.json");
@@ -691,11 +647,11 @@ export class ConfigurationService {
 
     let configPath: string;
     if (scope === "user") {
-      configPath = getUserConfigPaths()[1]; // settings.json
+      configPath = getUserConfigPaths()[0]; // settings.json
     } else if (scope === "project") {
       configPath = getProjectConfigPaths(workdir)[1]; // settings.json
     } else {
-      configPath = getProjectConfigPaths(workdir)[0]; // settings.local.json
+      configPath = getProjectConfigPaths(workdir)[0]; // local settings.local.json
     }
 
     // Ensure directory exists
@@ -737,11 +693,11 @@ export class ConfigurationService {
 
     let configPath: string;
     if (scope === "user") {
-      configPath = getUserConfigPaths()[1]; // settings.json
+      configPath = getUserConfigPaths()[0]; // settings.json
     } else if (scope === "project") {
       configPath = getProjectConfigPaths(workdir)[1]; // settings.json
     } else {
-      configPath = getProjectConfigPaths(workdir)[0]; // settings.local.json
+      configPath = getProjectConfigPaths(workdir)[0]; // local settings.local.json
     }
 
     if (!existsSync(configPath)) {
@@ -907,29 +863,6 @@ export function loadWaveConfigFromFile(
     const content = readFileSync(filePath, "utf-8");
     const config = JSON.parse(content) as WaveConfiguration;
 
-    // Validate basic structure
-    if (!config || typeof config !== "object") {
-      throw new Error(`Invalid configuration structure in ${filePath}`);
-    }
-
-    // Validate environment variables if present
-    if (config.env !== undefined) {
-      const envValidation = validateEnvironmentConfig(config.env, filePath);
-
-      if (!envValidation.isValid) {
-        throw new Error(
-          `Environment variable validation failed in ${filePath}: ${envValidation.errors.join(", ")}`,
-        );
-      }
-
-      // Log warnings if any
-      if (envValidation.warnings.length > 0) {
-        console.warn(
-          `Environment variable warnings in ${filePath}:\n- ${envValidation.warnings.join("\n- ")}`,
-        );
-      }
-    }
-
     return {
       hooks: config.hooks || undefined,
       env: config.env || undefined,
@@ -951,40 +884,6 @@ export function loadWaveConfigFromFile(
   }
 }
 
-/**
- * Load Wave configuration from multiple file paths in priority order
- * Returns the first valid configuration found, or null if none exist
- */
-export function loadWaveConfigFromFiles(
-  filePaths: string[],
-): WaveConfiguration | null {
-  for (const filePath of filePaths) {
-    const config = loadWaveConfigFromFile(filePath);
-    if (config !== null) {
-      return config;
-    }
-  }
-  return null;
-}
-
-/**
- * Load user-specific Wave configuration
- * Checks .local.json first, then falls back to .json
- */
-export function loadUserWaveConfig(): WaveConfiguration | null {
-  return loadWaveConfigFromFiles(getUserConfigPaths());
-}
-
-/**
- * Load project-specific Wave configuration
- * Checks .local.json first, then falls back to .json
- */
-export function loadProjectWaveConfig(
-  workdir: string,
-): WaveConfiguration | null {
-  return loadWaveConfigFromFiles(getProjectConfigPaths(workdir));
-}
-
 /**
  * Load and merge Wave configuration from both user and project sources
  * Project configuration takes precedence over user configuration
@@ -993,16 +892,15 @@ export function loadProjectWaveConfig(
 export function loadMergedWaveConfig(
   workdir: string,
 ): WaveConfiguration | null {
-  const userPaths = getUserConfigPaths(); // [local, json]
+  const userPaths = getUserConfigPaths(); // [json]
   const projectPaths = getProjectConfigPaths(workdir); // [local, json]
 
   // Priority order (lowest to highest):
-  // user settings.json -> user settings.local.json -> project settings.json -> project settings.local.json
+  // user settings.json -> project settings.json -> local settings.local.json
   const pathsToLoad = [
-    userPaths[1], // user settings.json
-    userPaths[0], // user settings.local.json
+    userPaths[0], // user settings.json
     projectPaths[1], // project settings.json
-    projectPaths[0], // project settings.local.json
+    projectPaths[0], // local settings.local.json
   ];
 
   const configs: WaveConfiguration[] = [];

package/src/services/pluginLoader.ts

@@ -67,13 +67,7 @@ export class PluginLoader {
    */
   static loadCommands(pluginPath: string): CustomSlashCommand[] {
     const commandsPath = path.join(pluginPath, "commands");
-    const commands = scanCommandsDirectory(commandsPath);
-
-    // Attach plugin path to each command for WAVE_PLUGIN_ROOT support
-    return commands.map((command) => ({
-      ...command,
-      pluginPath,
-    }));
+    return scanCommandsDirectory(commandsPath);
   }
 
   /**

package/src/tools/exitPlanMode.ts

@@ -2,6 +2,7 @@ import { readFile } from "fs/promises";
 import { logger } from "../utils/globalLogger.js";
 import type { ToolPlugin, ToolResult, ToolContext } from "./types.js";
 import { EXIT_PLAN_MODE_TOOL_NAME } from "../constants/tools.js";
+import { OPERATION_CANCELLED_BY_USER } from "../types/permissions.js";
 
 /**
  * Exit Plan Mode Tool Plugin
@@ -91,6 +92,12 @@ Ensure your plan is complete and unambiguous:
         await context.permissionManager.checkPermission(permissionContext);
 
       if (permissionResult.behavior === "deny") {
+        if (permissionResult.message === OPERATION_CANCELLED_BY_USER) {
+          return {
+            success: false,
+            content: OPERATION_CANCELLED_BY_USER,
+          };
+        }
         return {
           success: false,
           content: `Please update your proposal based on the following user feedback: ${permissionResult.message || "Plan rejected by user"}`,

package/src/types/commands.ts

@@ -23,7 +23,4 @@ export interface CustomSlashCommand {
   filePath: string;
   content: string;
   config?: CustomSlashCommandConfig;
-
-  // Plugin support
-  pluginPath?: string; // Absolute path to the plugin root directory (only set for plugin commands)
 }

package/src/types/history.ts

@@ -2,5 +2,6 @@ export interface PromptEntry {
   prompt: string;
   timestamp: number;
   sessionId?: string;
+  workdir?: string;
   longTextMap?: Record<string, string>;
 }

package/src/types/marketplace.ts

@@ -46,6 +46,7 @@ export interface KnownMarketplace {
   name: string;
   source: MarketplaceSource;
   isBuiltin?: boolean;
+  autoUpdate?: boolean;
 }
 
 export interface KnownMarketplacesRegistry {

package/src/types/permissions.ts

@@ -70,4 +70,6 @@ export const RESTRICTED_TOOLS = [
 /** Type for restricted tool names */
 export type RestrictedTool = (typeof RESTRICTED_TOOLS)[number];
 
+export const OPERATION_CANCELLED_BY_USER = "Operation cancelled by user";
+
 export type { AskUserQuestion, AskUserQuestionInput, AskUserQuestionOption };

package/src/utils/bashParser.ts

@@ -470,6 +470,13 @@ export function getSmartPrefix(command: string): string | null {
     ];
 
     if (safeGitSubcommands.includes(subCommand)) {
+      if (subCommand === "branch") {
+        // Check for destructive flags
+        const destructiveFlags = ["-d", "-D", "--delete"];
+        if (tokens.some((t) => destructiveFlags.includes(t))) {
+          return null;
+        }
+      }
       prefixParts.push(subCommand);
       return prefixParts.join(" ");
     }

package/src/utils/configPaths.ts

@@ -2,11 +2,11 @@
  * Configuration Path Utilities
  *
  * Centralized utilities for resolving Wave configuration file paths.
- * Supports both regular settings.json and settings.local.json with proper priority.
+ * Supports both regular settings.json and local settings.local.json with proper priority.
  *
  * Priority system:
- * - User configs: ~/.wave/settings.local.json > ~/.wave/settings.json
- * - Project configs: {workdir}/.wave/settings.local.json > {workdir}/.wave/settings.json
+ * - User configs: ~/.wave/settings.json
+ * - Local configs: {workdir}/.wave/settings.local.json > {workdir}/.wave/settings.json
  * - Project configs override user configs (existing behavior)
  */
 
@@ -32,11 +32,11 @@ export function getProjectConfigPath(workdir: string): string {
 
 /**
  * Get the user-specific configuration file paths in priority order
- * Returns array with .local.json first, then .json
+ * Returns array with .json only
  */
 export function getUserConfigPaths(): string[] {
   const baseDir = join(homedir(), ".wave");
-  return [join(baseDir, "settings.local.json"), join(baseDir, "settings.json")];
+  return [join(baseDir, "settings.json")];
 }
 
 /**
@@ -47,7 +47,7 @@ export function getPluginsDir(): string {
 }
 
 /**
- * Get the project-specific configuration file paths in priority order
+ * Get the local configuration file paths in priority order
  * Returns array with .local.json first, then .json
  */
 export function getProjectConfigPaths(workdir: string): string[] {

package/src/utils/promptHistory.ts

@@ -26,6 +26,7 @@ export class PromptHistoryManager {
     prompt: string,
     sessionId?: string,
     longTextMap?: Record<string, string>,
+    workdir?: string,
   ): Promise<void> {
     try {
       if (!prompt.trim()) return;
@@ -36,6 +37,7 @@ export class PromptHistoryManager {
         timestamp: Date.now(),
         sessionId,
         longTextMap,
+        workdir,
       };
 
       const line = JSON.stringify(entry) + "\n";
@@ -77,7 +79,10 @@ export class PromptHistoryManager {
   /**
    * Get all history entries
    */
-  static async getHistory(sessionId?: string): Promise<PromptEntry[]> {
+  static async getHistory(options?: {
+    sessionId?: string | string[];
+    workdir?: string;
+  }): Promise<PromptEntry[]> {
     try {
       if (!fs.existsSync(PROMPT_HISTORY_FILE)) {
         return [];
@@ -98,9 +103,22 @@ export class PromptHistoryManager {
         .filter((entry): entry is PromptEntry => entry !== null);
 
       // Filter by sessionId if provided
-      const filteredEntries = sessionId
-        ? entries.filter((entry) => entry.sessionId === sessionId)
-        : entries;
+      let filteredEntries = entries;
+      if (options?.sessionId) {
+        const sessionIds = Array.isArray(options.sessionId)
+          ? options.sessionId
+          : [options.sessionId];
+        filteredEntries = filteredEntries.filter(
+          (entry) => entry.sessionId && sessionIds.includes(entry.sessionId),
+        );
+      }
+
+      // Filter by workdir if provided
+      if (options?.workdir) {
+        filteredEntries = filteredEntries.filter(
+          (entry) => entry.workdir === options.workdir,
+        );
+      }
 
       // Deduplicate by prompt, keeping the most recent one
       const uniqueEntries: PromptEntry[] = [];
@@ -127,10 +145,13 @@ export class PromptHistoryManager {
    */
   static async searchHistory(
     query: string,
-    sessionId?: string,
+    options?: {
+      sessionId?: string | string[];
+      workdir?: string;
+    },
   ): Promise<PromptEntry[]> {
     try {
-      const history = await this.getHistory(sessionId);
+      const history = await this.getHistory(options);
       if (!query.trim()) {
         return history;
       }