wave-agent-sdk 0.18.7 → 0.19.1

package/src/managers/skillManager.ts

@@ -30,6 +30,7 @@ import { logger } from "../utils/globalLogger.js";
 export class SkillManager extends EventEmitter {
   private personalSkillsPath: string;
   private personalClaudeSkillsPath: string;
+  private personalAgentsSkillsPath: string;
   private scanTimeout: number;
   private workdir: string;
 
@@ -50,6 +51,8 @@ export class SkillManager extends EventEmitter {
       options.personalSkillsPath || join(homedir(), ".wave", "skills");
     this.personalClaudeSkillsPath =
       options.personalClaudeSkillsPath || join(homedir(), ".claude", "skills");
+    this.personalAgentsSkillsPath =
+      options.personalAgentsSkillsPath || join(homedir(), ".agents", "skills");
     this.scanTimeout = options.scanTimeout || 5000;
     this.workdir = options.workdir || process.cwd();
     this.watchEnabled = options.watch ?? false;
@@ -131,8 +134,10 @@ export class SkillManager extends EventEmitter {
     const pathsToWatch = [
       this.personalSkillsPath,
       this.personalClaudeSkillsPath,
+      this.personalAgentsSkillsPath,
       join(this.workdir, ".wave", "skills"),
       join(this.workdir, ".claude", "skills"),
+      join(this.workdir, ".agents", "skills"),
     ];
 
     logger?.debug(`Setting up skill watcher for: ${pathsToWatch.join(", ")}`);
@@ -225,6 +230,11 @@ export class SkillManager extends EventEmitter {
       "builtin",
     );
 
+    const personalAgentsCollection = await this.discoverSkillCollection(
+      this.personalAgentsSkillsPath,
+      "personal",
+    );
+
     const personalClaudeCollection = await this.discoverSkillCollection(
       this.personalClaudeSkillsPath,
       "personal",
@@ -243,12 +253,14 @@ export class SkillManager extends EventEmitter {
     return {
       builtinSkills: builtinCollection.skills,
       personalSkills: new Map([
-        ...personalClaudeCollection.skills,
+        ...personalAgentsCollection.skills, // lowest priority
+        ...personalClaudeCollection.skills, // overrides .agents
         ...personalCollection.skills, // .wave overrides .claude
       ]),
       projectSkills: projectCollection.skills,
       errors: [
         ...builtinCollection.errors,
+        ...personalAgentsCollection.errors,
         ...personalClaudeCollection.errors,
         ...personalCollection.errors,
         ...projectCollection.errors,
@@ -271,9 +283,11 @@ export class SkillManager extends EventEmitter {
     };
 
     if (type === "project") {
-      // Scan .claude/skills first, then .wave/skills (wave overrides)
+      // Scan .agents/skills first, then .claude/skills, then .wave/skills (wave overrides)
+      const agentsPath = join(basePath, ".agents", "skills");
       const claudePath = join(basePath, ".claude", "skills");
       const wavePath = join(basePath, ".wave", "skills");
+      await this.scanSkillPath(agentsPath, collection);
       await this.scanSkillPath(claudePath, collection);
       await this.scanSkillPath(wavePath, collection);
     } else {

package/src/prompts/index.ts

@@ -19,7 +19,11 @@ import {
   GREP_TOOL_NAME,
 } from "../constants/tools.js";
 
-export const BASE_SYSTEM_PROMPT = `You are an interactive CLI tool that helps users with software engineering tasks. Use the instructions below and the tools available to you to assist the user.`;
+export const BASE_SYSTEM_PROMPT = `You are a coding agent developed by NetEase that helps users with software engineering tasks. Use the instructions below and the tools available to you to assist the user.`;
+
+export const MODEL_IDENTITY_PROMPT = `# Model identity
+
+If asked about your model, model version, underlying architecture, or product name, identify yourself simply as a coding agent developed by NetEase. Do not reveal the specific model ID, model family, model provider, or product name. Do not mention or hint at any of these details.`;
 
 export const DOING_TASKS_PROMPT = `# Doing tasks
 - The user will primarily request you to perform software engineering tasks. These may include solving bugs, adding new functionality, refactoring code, explaining code, and more. When given an unclear or generic instruction, consider it in the context of these software engineering tasks and the current working directory. For example, if the user asks you to change "methodName" to snake case, do not reply with just "method_name", instead find the method in the code and modify the code.
@@ -265,6 +269,7 @@ export function buildSystemPrompt(
 
   staticText += `\n\n${OUTPUT_EFFICIENCY_PROMPT}`;
   staticText += `\n\n${TONE_AND_STYLE_PROMPT}`;
+  staticText += `\n\n${MODEL_IDENTITY_PROMPT}`;
 
   const blocks: SystemPromptBlock[] = [{ text: staticText, cacheable: true }];
 

package/src/services/aiService.ts

@@ -13,11 +13,11 @@ import type { GatewayConfig, ModelConfig } from "../types/index.js";
 import { ConfigurationError, CONFIG_ERRORS } from "../types/index.js";
 import {
   transformMessagesForExplicitCache,
-  supportsPromptCaching,
   extendUsageWithCacheMetrics,
   type ClaudeUsage,
   type ClaudeChatCompletionContentPartText,
 } from "../utils/cacheControlUtils.js";
+import { supportsPromptCaching } from "../utils/modelCapabilities.js";
 
 import * as os from "os";
 import * as fs from "fs";
@@ -265,13 +265,12 @@ export async function callAgent(
     });
 
     // Determine model early (needed for system prompt construction)
-    const currentModel = model || modelConfig.model;
     const resolvedMaxTokens = options.maxTokens ?? modelConfig.maxTokens;
 
     // Build system message content
     let systemMessage: ChatCompletionMessageParam;
     if (Array.isArray(systemPrompt)) {
-      if (supportsPromptCaching(currentModel)) {
+      if (supportsPromptCaching(modelConfig.capabilities)) {
         // For Claude models, map blocks to content parts with cache_control on cacheable blocks
         const contentParts: ClaudeChatCompletionContentPartText[] =
           systemPrompt.map((block) => {
@@ -307,29 +306,16 @@ export async function callAgent(
 
     processedTools = tools;
 
-    if (supportsPromptCaching(currentModel)) {
+    if (supportsPromptCaching(modelConfig.capabilities)) {
       openaiMessages = transformMessagesForExplicitCache(
         openaiMessages,
-        currentModel,
+        modelConfig.capabilities,
       );
     }
 
-    // Get model configuration - use injected modelConfig with optional override
-    const {
-      model: _model,
-      fastModel: _fastModel,
-      maxTokens: _maxTokens,
-      permissionMode: _permissionMode,
-      ...extraParams
-    } = modelConfig;
-    void _model;
-    void _fastModel;
-    void _maxTokens;
-    void _permissionMode;
-
     const openaiModelConfig = getModelConfig(model || modelConfig.model, {
       max_tokens: resolvedMaxTokens,
-      ...extraParams,
+      ...(modelConfig.options || {}),
     });
 
     // Determine if streaming is needed
@@ -860,25 +846,11 @@ export async function compactMessages(
     fetch: gatewayConfig.fetch,
   });
 
-  // Get model configuration - use injected agent model
-  const {
-    model: _model,
-    fastModel: _fastModel,
-    maxTokens: _maxTokens,
-    permissionMode: _permissionMode,
-    fastModelConfig: _fastModelConfig,
-    ...extraParams
-  } = modelConfig;
-  void _model;
-  void _fastModel;
-  void _maxTokens;
-  void _permissionMode;
-
-  // When a fast model override is provided, use the fast model's hyperparams
-  // (if configured); otherwise fall back to the agent model's extraParams.
+  // When a fast model override is provided, use the fast model's options
+  // (if configured); otherwise fall back to the agent model's options.
   const activeExtraParams = options.model
-    ? _fastModelConfig || {}
-    : extraParams;
+    ? modelConfig.fastModelOptions || {}
+    : modelConfig.options || {};
 
   const openaiModelConfig = getModelConfig(options.model || modelConfig.model, {
     temperature: 0.1,
@@ -983,25 +955,11 @@ export async function processWebContent(
     fetch: gatewayConfig.fetch,
   });
 
-  // Get model configuration - use injected agent model
-  const {
-    model: _model,
-    fastModel: _fastModel,
-    maxTokens: _maxTokens,
-    permissionMode: _permissionMode,
-    fastModelConfig: _fastModelConfig,
-    ...extraParams
-  } = modelConfig;
-  void _model;
-  void _fastModel;
-  void _maxTokens;
-  void _permissionMode;
-
-  // When a fast model override is provided, use the fast model's hyperparams
-  // (if configured); otherwise fall back to the agent model's extraParams.
+  // When a fast model override is provided, use the fast model's options
+  // (if configured); otherwise fall back to the agent model's options.
   const activeExtraParams = options.model
-    ? _fastModelConfig || {}
-    : extraParams;
+    ? modelConfig.fastModelOptions || {}
+    : modelConfig.options || {};
 
   const openaiModelConfig = getModelConfig(options.model || modelConfig.model, {
     temperature: 0.1,
@@ -1100,23 +1058,10 @@ export async function btw(options: BtwOptions): Promise<BtwResult> {
     fetch: gatewayConfig.fetch,
   });
 
-  // Get model configuration - use injected agent model
-  const {
-    model: _model,
-    fastModel: _fastModel,
-    maxTokens: _maxTokens,
-    permissionMode: _permissionMode,
-    ...extraParams
-  } = modelConfig;
-  void _model;
-  void _fastModel;
-  void _maxTokens;
-  void _permissionMode;
-
   const openaiModelConfig = getModelConfig(options.model || modelConfig.model, {
     temperature: 0.1,
     max_tokens: 4096,
-    ...extraParams,
+    ...(modelConfig.options || {}),
   });
 
   try {
@@ -1207,25 +1152,10 @@ export async function evaluateGoal(
     fetch: gatewayConfig.fetch,
   });
 
-  const {
-    model: _model,
-    fastModel: _fastModel,
-    maxTokens: _maxTokens,
-    permissionMode: _permissionMode,
-    fastModelConfig: _fastModelConfig,
-  } = modelConfig;
-  void _model;
-  void _fastModel;
-  void _maxTokens;
-  void _permissionMode;
-
-  // evaluateGoal always uses the fast model; use its hyperparams if configured.
-  const activeExtraParams = _fastModelConfig || {};
-
   const openaiModelConfig = getModelConfig(model, {
     temperature: 0,
     max_tokens: 200,
-    ...activeExtraParams,
+    ...(modelConfig.fastModelOptions || {}),
   });
 
   // Strip images from messages to reduce token usage (same as compact)

package/src/services/configurationService.ts

@@ -48,6 +48,7 @@ import {
 } from "./remoteSettingsService.js";
 import { createAuthAwareFetch } from "./authService.js";
 import { ensureWaveRuntimeFilesExcluded } from "../utils/gitUtils.js";
+import { atomicWriteFile } from "../utils/atomicWrite.js";
 
 /**
  * Default ConfigurationService implementation
@@ -533,25 +534,13 @@ export class ConfigurationService {
       permissionMode: permissionMode ?? this.options.permissionMode,
     };
 
-    // Resolve fast model hyperparams from models[fastModel], stripping
-    // structural fields so only hyperparameters remain. Set on baseConfig
-    // before the modelSpecificConfig spread so it isn't overwritten.
-    const fastModelConfigSource =
+    // Resolve fast model generation params from models[fastModel].options.
+    // Set on baseConfig before the modelSpecificConfig spread so it isn't overwritten.
+    const fastModelSource =
       resolvedFastModel &&
       this.currentConfiguration?.models?.[resolvedFastModel];
-    if (fastModelConfigSource) {
-      const {
-        model: _fm,
-        fastModel: _ffm,
-        maxTokens: _fmt,
-        permissionMode: _fpm,
-        ...fastHyperparams
-      } = fastModelConfigSource;
-      void _fm;
-      void _ffm;
-      void _fmt;
-      void _fpm;
-      baseConfig.fastModelConfig = fastHyperparams;
+    if (fastModelSource && fastModelSource.options) {
+      baseConfig.fastModelOptions = fastModelSource.options;
     }
 
     // Merge model-specific settings from configuration
@@ -729,7 +718,7 @@ export class ConfigurationService {
     }
 
     config.model = model;
-    await fs.writeFile(configPath, JSON.stringify(config, null, 2), "utf-8");
+    await atomicWriteFile(configPath, JSON.stringify(config, null, 2));
   }
 
   /**
@@ -816,11 +805,7 @@ export class ConfigurationService {
 
     if (!config.permissions.allow.includes(rule)) {
       config.permissions.allow.push(rule);
-      await fs.writeFile(
-        localConfigPath,
-        JSON.stringify(config, null, 2),
-        "utf-8",
-      );
+      await atomicWriteFile(localConfigPath, JSON.stringify(config, null, 2));
     }
   }
 
@@ -868,7 +853,7 @@ export class ConfigurationService {
 
     config.enabledPlugins[pluginId] = enabled;
 
-    await fs.writeFile(configPath, JSON.stringify(config, null, 2), "utf-8");
+    await atomicWriteFile(configPath, JSON.stringify(config, null, 2));
   }
 
   /**
@@ -940,11 +925,7 @@ export class ConfigurationService {
     }
     fileConfig.marketplaces[name] = config;
 
-    await fs.writeFile(
-      configPath,
-      JSON.stringify(fileConfig, null, 2),
-      "utf-8",
-    );
+    await atomicWriteFile(configPath, JSON.stringify(fileConfig, null, 2));
   }
 
   /**
@@ -978,11 +959,7 @@ export class ConfigurationService {
 
       if (fileConfig.marketplaces && name in fileConfig.marketplaces) {
         delete fileConfig.marketplaces[name];
-        await fs.writeFile(
-          configPath,
-          JSON.stringify(fileConfig, null, 2),
-          "utf-8",
-        );
+        await atomicWriteFile(configPath, JSON.stringify(fileConfig, null, 2));
       }
     } catch {
       // Ignore errors for corrupted or non-existent files
@@ -1020,11 +997,7 @@ export class ConfigurationService {
 
       if (config.enabledPlugins && pluginId in config.enabledPlugins) {
         delete config.enabledPlugins[pluginId];
-        await fs.writeFile(
-          configPath,
-          JSON.stringify(config, null, 2),
-          "utf-8",
-        );
+        await atomicWriteFile(configPath, JSON.stringify(config, null, 2));
       }
     } catch {
       // Ignore errors for corrupted or non-existent files
@@ -1171,6 +1144,15 @@ export function loadWaveConfigFromFile(
 
   try {
     const content = readFileSync(filePath, "utf-8");
+
+    // Tolerate empty/whitespace-only files: a concurrent writer may have the
+    // file truncated mid-write. Returning null lets callers skip this source
+    // instead of crashing (consistent with the "file not found" path).
+    if (content.trim() === "") {
+      logger.warn(`Empty configuration file (likely mid-write): ${filePath}`);
+      return null;
+    }
+
     const config = JSON.parse(content) as WaveConfiguration;
 
     return {
@@ -1189,10 +1171,14 @@ export function loadWaveConfigFromFile(
     };
   } catch (error) {
     if (error instanceof SyntaxError) {
-      throw new Error(`Invalid JSON syntax in ${filePath}: ${error.message}`);
+      // Tolerate corrupt JSON: a concurrent writer may leave the file in a
+      // partially-written state. Warn and return null so callers skip this
+      // source instead of crashing.
+      logger.warn(`Invalid JSON syntax in ${filePath}: ${error.message}`);
+      return null;
     }
 
-    // Re-throw validation errors and other errors as-is
+    // Re-throw other errors as-is
     throw error;
   }
 }

package/src/services/hook.ts

@@ -89,6 +89,13 @@ async function buildHookJsonInput(
     }
   }
 
+  // Add worktree_path field for WorktreeRemove events
+  if (context.event === "WorktreeRemove") {
+    if (context.worktreePath !== undefined) {
+      jsonInput.worktree_path = context.worktreePath;
+    }
+  }
+
   // Add SessionStart-specific fields
   if (context.event === "SessionStart") {
     if (context.source !== undefined) {

package/src/services/initializationService.ts

@@ -326,9 +326,7 @@ export class InitializationService {
         messageManager.initializeFromSession(sessionToRestore);
 
         // Update task manager with the root session ID to ensure continuity across compactions
-        taskManager.setTaskListId(
-          sessionToRestore.rootSessionId || sessionToRestore.id,
-        );
+        taskManager.setTaskListId(sessionToRestore.id);
 
         // After session is initialized, load tasks for the session
         const tasks = await taskManager.listTasks();

package/src/services/interactionService.ts

@@ -166,7 +166,7 @@ export class InteractionService {
     messageManager.initializeFromSession(sessionData);
 
     // Update task manager with the root session ID to ensure continuity across compactions
-    taskManager.setTaskListId(sessionData.rootSessionId || sessionData.id);
+    taskManager.setTaskListId(sessionData.id);
 
     // 7. Load tasks for the restored session
     const tasks = await taskManager.listTasks();

package/src/services/reversionService.ts

@@ -1,5 +1,5 @@
-import { readFile, writeFile, mkdir, rm } from "fs/promises";
-import { join } from "path";
+import { readFile, writeFile, mkdir, rm, readdir, stat } from "fs/promises";
+import { join, dirname } from "path";
 import { homedir } from "os";
 import { createHash } from "crypto";
 import { FileSnapshot } from "../types/reversion.js";
@@ -9,50 +9,49 @@ export class ReversionService {
   private rootSessionId: string;
 
   constructor(rootSessionId: string) {
-    this.rootSessionId = rootSessionId;
+    this.rootSessionId = rootSessionId || "default";
     this.historyBaseDir = join(
       homedir(),
       ".wave",
       "file-history",
-      rootSessionId || "default",
+      this.rootSessionId,
     );
   }
 
   private getFilePathHash(filePath: string): string {
-    return createHash("md5").update(filePath).digest("hex");
+    return createHash("sha256").update(filePath).digest("hex").slice(0, 16);
   }
 
-  private async getNextVersion(fileHashDir: string): Promise<number> {
+  private async getNextVersion(filePath: string): Promise<number> {
+    const hash = this.getFilePathHash(filePath);
+    const prefix = `${hash}@v`;
     try {
-      const files = await readFile(join(fileHashDir, "versions"), "utf-8");
-      const versions = files
-        .split("\n")
-        .map((v) => parseInt(v, 10))
-        .filter((v) => !isNaN(v));
-      return versions.length > 0 ? Math.max(...versions) + 1 : 1;
+      const files = await readdir(this.historyBaseDir);
+      let maxVersion = 0;
+      for (const file of files) {
+        if (file.startsWith(prefix)) {
+          const v = parseInt(file.slice(prefix.length), 10);
+          if (!isNaN(v) && v > maxVersion) {
+            maxVersion = v;
+          }
+        }
+      }
+      return maxVersion + 1;
     } catch {
       return 1;
     }
   }
 
-  private async updateVersionsFile(
-    fileHashDir: string,
-    version: number,
-  ): Promise<void> {
-    await appendFile(join(fileHashDir, "versions"), `${version}\n`, "utf-8");
-  }
-
   /**
    * Saves a single snapshot to the file history directory.
    * Returns the snapshot path.
    */
   async saveSnapshot(snapshot: FileSnapshot): Promise<string> {
     const fileHash = this.getFilePathHash(snapshot.filePath);
-    const fileHashDir = join(this.historyBaseDir, fileHash);
-    await this.ensureDirectory(fileHashDir);
+    await this.ensureDirectory(this.historyBaseDir);
 
-    const version = await this.getNextVersion(fileHashDir);
-    const snapshotPath = join(fileHashDir, `v${version}`);
+    const version = await this.getNextVersion(snapshot.filePath);
+    const snapshotPath = join(this.historyBaseDir, `${fileHash}@v${version}`);
 
     const snapshotWithContent = snapshot as FileSnapshot & {
       content: string | null;
@@ -65,7 +64,6 @@ export class ReversionService {
       return ""; // Return empty string to indicate no snapshot file
     }
 
-    await this.updateVersionsFile(fileHashDir, version);
     return snapshotPath;
   }
 
@@ -90,10 +88,35 @@ export class ReversionService {
     await rm(this.historyBaseDir, { recursive: true, force: true });
   }
 
+  /**
+   * Cleans up session directories older than the given number of days.
+   * Skips the current session.
+   */
+  async cleanupOldSessions(days: number = 30): Promise<void> {
+    const threshold = Date.now() - days * 24 * 60 * 60 * 1000;
+    const parentDir = dirname(this.historyBaseDir);
+    try {
+      const entries = await readdir(parentDir);
+      await Promise.all(
+        entries.map(async (entry) => {
+          if (entry === this.rootSessionId) return;
+          const dirPath = join(parentDir, entry);
+          try {
+            const stats = await stat(dirPath);
+            if (stats.isDirectory() && stats.mtimeMs < threshold) {
+              await rm(dirPath, { recursive: true, force: true });
+            }
+          } catch {
+            // ENOENT — concurrently deleted, skip
+          }
+        }),
+      );
+    } catch {
+      // parent dir doesn't exist — nothing to clean
+    }
+  }
+
   private async ensureDirectory(dirPath: string): Promise<void> {
     await mkdir(dirPath, { recursive: true });
   }
 }
-
-// Helper to avoid appendFile import error if not imported
-import { appendFile } from "fs/promises";