wave-agent-sdk 0.17.3 → 0.17.5

package/dist/managers/skillManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skillManager.d.ts","sourceRoot":"","sources":["../../src/managers/skillManager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,KAAK,EACV,mBAAmB,EACnB,aAAa,EACb,KAAK,EAGL,aAAa,EACb,sBAAsB,EACvB,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD;;GAEG;AACH,qBAAa,YAAa,SAAQ,YAAY;IAc1C,OAAO,CAAC,SAAS;IAbnB,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,aAAa,CAAoC;IACzD,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,mBAAmB,CAAoC;IAC/D,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAmC;IACtD,OAAO,CAAC,YAAY,CAAU;gBAGpB,SAAS,EAAE,SAAS,EAC5B,OAAO,GAAE,mBAAwB;IAUnC;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBjC;;OAEG;YACW,aAAa;IAqC3B;;OAEG;YACW,YAAY;IAkC1B;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAO9B;;OAEG;IACH,aAAa,IAAI,OAAO;IAIxB;;OAEG;IACH,kBAAkB,IAAI,aAAa,EAAE;IAQrC;;OAEG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAQzD;;;OAGG;IACG,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IAgBzD;;OAEG;YACW,cAAc;IA4B5B;;OAEG;YACW,uBAAuB;IAoFrC;;OAEG;YACW,oBAAoB;IA4BlC;;OAEG;IACG,YAAY,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC;QAC/C,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,sBAAsB,CAAC;QACjC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;KACzB,CAAC;IA8BF;;OAEG;IACG,YAAY,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAC5C;QACE,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,EAAE,KAAK,CAAC;KACd,GACD;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,SAAS,CAAA;KAAE,CACzC;IA6BD;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAwB3B;;OAEG;YACW,yBAAyB;IASvC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAc7B;;OAEG;IACH,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI;CA8BhE"}
+{"version":3,"file":"skillManager.d.ts","sourceRoot":"","sources":["../../src/managers/skillManager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,KAAK,EACV,mBAAmB,EACnB,aAAa,EACb,KAAK,EAGL,aAAa,EACb,sBAAsB,EACvB,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD;;GAEG;AACH,qBAAa,YAAa,SAAQ,YAAY;IAc1C,OAAO,CAAC,SAAS;IAbnB,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,aAAa,CAAoC;IACzD,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,mBAAmB,CAAoC;IAC/D,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAmC;IACtD,OAAO,CAAC,YAAY,CAAU;gBAGpB,SAAS,EAAE,SAAS,EAC5B,OAAO,GAAE,mBAAwB;IAUnC;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBjC;;OAEG;YACW,aAAa;IAqC3B;;OAEG;YACW,YAAY;IAkC1B;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAO9B;;OAEG;IACH,aAAa,IAAI,OAAO;IAIxB;;OAEG;IACH,kBAAkB,IAAI,aAAa,EAAE;IAQrC;;OAEG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAQzD;;;OAGG;IACG,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IAgBzD;;OAEG;YACW,cAAc;IA4B5B;;OAEG;YACW,uBAAuB;IAoFrC;;OAEG;YACW,oBAAoB;IA4BlC;;OAEG;IACG,YAAY,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC;QAC/C,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,sBAAsB,CAAC;QACjC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;KACzB,CAAC;IA8BF;;OAEG;IACG,YAAY,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAC5C;QACE,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,EAAE,KAAK,CAAC;KACd,GACD;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,SAAS,CAAA;KAAE,CACzC;IA6BD;;OAEG;IACH,OAAO,CAAC,mBAAmB;IA0B3B;;OAEG;YACW,yBAAyB;IASvC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAc7B;;OAEG;IACH,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI;CA8BhE"}

package/dist/managers/skillManager.js

@@ -343,7 +343,7 @@ export class SkillManager extends EventEmitter {
     prepareSkillContent(skill, argsString) {
         const skillPath = `Base directory for this skill: ${skill.skillPath}\n\n`;
         // Extract content after frontmatter
-        const contentMatch = skill.content.match(/^---\n[\s\S]*?\n---\n([\s\S]*)$/);
+        const contentMatch = skill.content.match(/^---\r?\n[\s\S]*?\r?\n---\r?\n([\s\S]*)$/);
         let mainContent = contentMatch ? contentMatch[1].trim() : skill.content;
         // 1. Substitute parameters ($1, $ARGUMENTS, etc.)
         mainContent = substituteCommandParameters(mainContent, argsString);

package/dist/services/MarketplaceService.d.ts

@@ -33,6 +33,15 @@ export declare class MarketplaceService {
      * to user-level settings if they aren't already declared there.
      */
     private runMigration;
+    /**
+     * Seeds the builtin marketplace on first startup.
+     * Adds it to user-scope settings and marks the cache as seeded.
+     */
+    private seedBuiltinMarketplace;
+    /**
+     * Sets the builtinSeeded flag in the cache registry, preserving all other fields.
+     */
+    private setBuiltinSeeded;
     /**
      * Check if a lock file is stale by reading its PID and checking if the process is alive.
      * Returns true if the lock is stale and safe to remove.
@@ -97,6 +106,12 @@ export declare class MarketplaceService {
      * Removes a marketplace by name from the specified scope
      */
     removeMarketplace(name: string, scope?: Scope): Promise<void>;
+    /**
+     * Uninstalls all plugins belonging to a given marketplace.
+     * Removes them from installed_plugins.json, deletes cache files,
+     * and cleans up enabledPlugins entries from all scopes.
+     */
+    private uninstallPluginsByMarketplace;
     /**
      * Updates a specific marketplace or all marketplaces
      */

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

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

package/dist/services/MarketplaceService.js

@@ -28,6 +28,9 @@ export class MarketplaceService {
         this.gitService = new GitService();
         this.ensureDirectoryStructure();
         this.runMigration();
+        // Stored dynamically to avoid widening keyof MarketplaceService
+        this._seedComplete =
+            this.seedBuiltinMarketplace();
     }
     /**
      * Ensures the required directory structure exists in ~/.wave/plugins
@@ -65,6 +68,46 @@ export class MarketplaceService {
             // Migration failure should not block startup
         }
     }
+    /**
+     * Seeds the builtin marketplace on first startup.
+     * Adds it to user-scope settings and marks the cache as seeded.
+     */
+    async seedBuiltinMarketplace() {
+        try {
+            const cache = await this.getCacheRegistry();
+            if (cache?.builtinSeeded)
+                return;
+            const builtin = MarketplaceService.BUILTIN_MARKETPLACE;
+            // Add to user-scope settings if not already in any scope
+            const scoped = this.configurationService.getMergedMarketplaces(this.workdir);
+            if (!scoped[builtin.name]) {
+                await this.configurationService.addMarketplaceToScope(this.workdir, "user", builtin.name, { source: builtin.source, autoUpdate: builtin.autoUpdate });
+            }
+            // Update cache: add entry + set builtinSeeded flag
+            await this.updateCacheMarketplace(builtin.name, {
+                source: builtin.source,
+                autoUpdate: builtin.autoUpdate,
+                isBuiltin: true,
+                declaredScope: "builtin",
+            });
+            await this.setBuiltinSeeded(true);
+        }
+        catch {
+            // Seeding failure should not block startup
+        }
+    }
+    /**
+     * Sets the builtinSeeded flag in the cache registry, preserving all other fields.
+     */
+    async setBuiltinSeeded(value) {
+        const registry = await this.getCacheRegistry();
+        const tmpPath = `${this.knownMarketplacesPath}.tmp`;
+        await fs.writeFile(tmpPath, JSON.stringify({
+            builtinSeeded: value,
+            marketplaces: registry?.marketplaces ?? [],
+        }, null, 2));
+        await fs.rename(tmpPath, this.knownMarketplacesPath);
+    }
     /**
      * Check if a lock file is stale by reading its PID and checking if the process is alive.
      * Returns true if the lock is stale and safe to remove.
@@ -192,7 +235,10 @@ export class MarketplaceService {
             });
         }
         const tmpPath = `${this.knownMarketplacesPath}.tmp`;
-        await fs.writeFile(tmpPath, JSON.stringify({ marketplaces }, null, 2));
+        await fs.writeFile(tmpPath, JSON.stringify({
+            builtinSeeded: registry?.builtinSeeded ?? false,
+            marketplaces,
+        }, null, 2));
         await fs.rename(tmpPath, this.knownMarketplacesPath);
     }
     /**
@@ -203,7 +249,10 @@ export class MarketplaceService {
         const marketplaces = registry?.marketplaces ?? [];
         const filtered = marketplaces.filter((m) => m.name !== name);
         const tmpPath = `${this.knownMarketplacesPath}.tmp`;
-        await fs.writeFile(tmpPath, JSON.stringify({ marketplaces: filtered }, null, 2));
+        await fs.writeFile(tmpPath, JSON.stringify({
+            builtinSeeded: registry?.builtinSeeded ?? false,
+            marketplaces: filtered,
+        }, null, 2));
         await fs.rename(tmpPath, this.knownMarketplacesPath);
     }
     /**
@@ -402,6 +451,8 @@ export class MarketplaceService {
     async removeMarketplace(name, scope) {
         return this.withLock(async () => {
             const targetScope = scope || this.getMarketplaceDeclaringSource(name) || "user";
+            // Uninstall all plugins from this marketplace
+            await this.uninstallPluginsByMarketplace(name);
             if (targetScope !== "builtin") {
                 await this.configurationService.removeMarketplaceFromScope(this.workdir, targetScope, name);
             }
@@ -409,6 +460,36 @@ export class MarketplaceService {
             await this.removeFromCache(name);
         });
     }
+    /**
+     * Uninstalls all plugins belonging to a given marketplace.
+     * Removes them from installed_plugins.json, deletes cache files,
+     * and cleans up enabledPlugins entries from all scopes.
+     */
+    async uninstallPluginsByMarketplace(marketplaceName) {
+        const installedRegistry = await this.getInstalledPlugins();
+        const pluginsFromMarketplace = installedRegistry.plugins.filter((p) => p.marketplace === marketplaceName);
+        if (pluginsFromMarketplace.length === 0)
+            return;
+        // Remove all plugins from this marketplace from the registry
+        installedRegistry.plugins = installedRegistry.plugins.filter((p) => p.marketplace !== marketplaceName);
+        await this.saveInstalledPlugins(installedRegistry);
+        // Delete cache files that are no longer referenced
+        const remainingCachePaths = new Set(installedRegistry.plugins.map((p) => p.cachePath));
+        for (const plugin of pluginsFromMarketplace) {
+            if (!remainingCachePaths.has(plugin.cachePath) &&
+                existsSync(plugin.cachePath)) {
+                await fs.rm(plugin.cachePath, { recursive: true, force: true });
+            }
+        }
+        // Remove enabledPlugins entries from all scopes
+        const scopes = ["user", "project", "local"];
+        for (const plugin of pluginsFromMarketplace) {
+            const pluginId = `${plugin.name}@${plugin.marketplace}`;
+            for (const s of scopes) {
+                await this.configurationService.removeEnabledPlugin(this.workdir, s, pluginId);
+            }
+        }
+    }
     /**
      * Updates a specific marketplace or all marketplaces
      */

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

@@ -1 +1 @@
-{"version":3,"file":"fileWatcher.d.ts","sourceRoot":"","sources":["../../src/services/fileWatcher.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;IAChD,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,OAAO,CAAC;IACzB,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAAC;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,cAAc,CAAC;CAC5B;AAaD,qBAAa,kBAAmB,SAAQ,YAAY;IAClD,OAAO,CAAC,QAAQ,CAA4C;IAC5D,OAAO,CAAC,aAAa,CAAmC;IACxD,OAAO,CAAC,aAAa,CAAoB;IACzC,OAAO,CAAC,MAAM,CAAC,CAAS;gBAEZ,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC;IAahE;;;OAGG;IACG,SAAS,CACb,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GACxC,OAAO,CAAC,IAAI,CAAC;IA+BhB;;;OAGG;IACG,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB9C;;;OAGG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI;IA0BxD;;;OAGG;IACH,qBAAqB,IAAI,iBAAiB,EAAE;IAM5C;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAahB,iBAAiB;IAqD/B,OAAO,CAAC,wBAAwB;IAoChC,OAAO,CAAC,eAAe;CAoCxB"}
+{"version":3,"file":"fileWatcher.d.ts","sourceRoot":"","sources":["../../src/services/fileWatcher.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;IAChD,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,OAAO,CAAC;IACzB,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAAC;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,cAAc,CAAC;CAC5B;AAaD,qBAAa,kBAAmB,SAAQ,YAAY;IAClD,OAAO,CAAC,QAAQ,CAA4C;IAC5D,OAAO,CAAC,aAAa,CAAmC;IACxD,OAAO,CAAC,aAAa,CAAoB;IACzC,OAAO,CAAC,MAAM,CAAC,CAAS;gBAEZ,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC;IAahE;;;OAGG;IACG,SAAS,CACb,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GACxC,OAAO,CAAC,IAAI,CAAC;IA+BhB;;;OAGG;IACG,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB9C;;;OAGG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI;IA0BxD;;;OAGG;IACH,qBAAqB,IAAI,iBAAiB,EAAE;IAM5C;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAahB,iBAAiB;IAqD/B,OAAO,CAAC,wBAAwB;IAoChC,OAAO,CAAC,eAAe;CAmCxB"}

package/dist/services/fileWatcher.js

@@ -198,11 +198,10 @@ export class FileWatcherService extends EventEmitter {
         };
         // Notify all watchers that match the path or are parents of the path
         for (const [watchedPath, entry] of this.watchers.entries()) {
-            if (filePath === watchedPath ||
-                filePath.startsWith(watchedPath + "/") ||
-                // Handle cases where the watched path might be a file and we get an event for it
-                // (already covered by filePath === watchedPath)
-                false) {
+            const normalizedFilePath = filePath.replace(/\\/g, "/");
+            const normalizedWatchedPath = watchedPath.replace(/\\/g, "/");
+            if (normalizedFilePath === normalizedWatchedPath ||
+                normalizedFilePath.startsWith(normalizedWatchedPath + "/")) {
                 entry.lastEvent = event.timestamp;
                 // Notify all callbacks for this watcher
                 for (const callback of entry.callbacks) {

package/dist/types/marketplace.d.ts

@@ -43,6 +43,7 @@ export interface KnownMarketplace {
     declaredScope?: "user" | "project" | "local" | "builtin";
 }
 export interface KnownMarketplacesRegistry {
+    builtinSeeded?: boolean;
     marketplaces: KnownMarketplace[];
 }
 export interface InstalledPlugin {

package/dist/types/marketplace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marketplace.d.ts","sourceRoot":"","sources":["../../src/types/marketplace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,uBAAwB,SAAQ,sBAAsB;IACrE,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,gBAAgB,CAAC;IACxB,OAAO,EAAE,sBAAsB,EAAE,CAAC;CACnC;AAED,MAAM,MAAM,iBAAiB,GACzB;IACE,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,GACD;IACE,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,GACD;IACE,MAAM,EAAE,KAAK,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEN,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,iBAAiB,CAAC;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uFAAuF;IACvF,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;CAC1D;AAED,MAAM,WAAW,yBAAyB;IACxC,YAAY,EAAE,gBAAgB,EAAE,CAAC;CAClC;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,eAAe,EAAE,CAAC;CAC5B"}
+{"version":3,"file":"marketplace.d.ts","sourceRoot":"","sources":["../../src/types/marketplace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,uBAAwB,SAAQ,sBAAsB;IACrE,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,gBAAgB,CAAC;IACxB,OAAO,EAAE,sBAAsB,EAAE,CAAC;CACnC;AAED,MAAM,MAAM,iBAAiB,GACzB;IACE,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,GACD;IACE,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,GACD;IACE,MAAM,EAAE,KAAK,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEN,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,iBAAiB,CAAC;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uFAAuF;IACvF,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;CAC1D;AAED,MAAM,WAAW,yBAAyB;IACxC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,EAAE,gBAAgB,EAAE,CAAC;CAClC;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,eAAe,EAAE,CAAC;CAC5B"}

package/dist/utils/commandPathResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commandPathResolver.d.ts","sourceRoot":"","sources":["../../src/utils/commandPathResolver.ts"],"names":[],"mappings":"AAEA;;;GAGG;AAEH;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CA4C3E;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAS5D"}
+{"version":3,"file":"commandPathResolver.d.ts","sourceRoot":"","sources":["../../src/utils/commandPathResolver.ts"],"names":[],"mappings":"AAEA;;;GAGG;AAEH;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CA8C3E;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAS5D"}

package/dist/utils/commandPathResolver.js

@@ -21,7 +21,9 @@ export function generateCommandId(filePath, rootDir) {
     if (!relativePath || relativePath === ".") {
         throw new Error("Command filename cannot be empty");
     }
-    const segments = relativePath.split("/").filter((segment) => segment !== "");
+    const segments = relativePath
+        .split(/[\\/]/)
+        .filter((segment) => segment !== "");
     // Remove .md extension from the last segment
     const lastSegment = segments[segments.length - 1];
     if (!lastSegment.endsWith(".md")) {

package/dist/utils/skillParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skillParser.d.ts","sourceRoot":"","sources":["../../src/utils/skillParser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EAEjB,aAAa,EACd,MAAM,mBAAmB,CAAC;AAE3B;;GAEG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,iBAAsB,GAC9B,eAAe,CA8FjB;AAyDD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,aAAa,GAAG,MAAM,EAAE,CAwCvE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAOtD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAa5E"}
+{"version":3,"file":"skillParser.d.ts","sourceRoot":"","sources":["../../src/utils/skillParser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EAEjB,aAAa,EACd,MAAM,mBAAmB,CAAC;AAE3B;;GAEG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,iBAAsB,GAC9B,eAAe,CAgGjB;AAyDD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,aAAa,GAAG,MAAM,EAAE,CAwCvE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAOtD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAa5E"}

package/dist/utils/skillParser.js

@@ -22,7 +22,7 @@ export function parseSkillFile(filePath, options = {}) {
         const content = readFileSync(filePath, "utf-8");
         result.content = content;
         // Parse YAML frontmatter
-        const frontmatterMatch = content.match(/^---\n([\s\S]*?)\n---/);
+        const frontmatterMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
         if (!frontmatterMatch) {
             result.validationErrors.push("Missing YAML frontmatter");
             return result;
@@ -35,7 +35,8 @@ export function parseSkillFile(filePath, options = {}) {
         }
         // Determine skill type and path
         const skillPath = basePath || dirname(filePath);
-        const skillType = skillPath.includes("/.wave/skills")
+        const skillType = skillPath.includes("/.wave/skills") ||
+            skillPath.includes("\\.wave\\skills")
             ? "project"
             : "personal";
         // Extract allowed tools

package/dist/utils/subagentParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagentParser.d.ts","sourceRoot":"","sources":["../../src/utils/subagentParser.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAkKD;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,QAAQ,EACf,UAAU,EAAE,MAAM,GACjB,qBAAqB,CAEvB;AAqCD;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAsBlC;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAGvC"}
+{"version":3,"file":"subagentParser.d.ts","sourceRoot":"","sources":["../../src/utils/subagentParser.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAmKD;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,QAAQ,EACf,UAAU,EAAE,MAAM,GACjB,qBAAqB,CAEvB;AAqCD;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAsBlC;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAGvC"}

package/dist/utils/subagentParser.js

@@ -6,7 +6,7 @@ import { getBuiltinSubagentsDir } from "./configPaths.js";
  * Parse YAML frontmatter from markdown file content
  */
 function parseFrontmatter(content) {
-    const frontmatterRegex = /^---\s*\n([\s\S]*?)\n---\s*\n([\s\S]*)$/;
+    const frontmatterRegex = /^---[ \t]*\r?\n([\s\S]*?)\r?\n---[ \t]*\r?\n([\s\S]*)$/;
     const match = content.match(frontmatterRegex);
     if (!match) {
         return { frontmatter: {}, body: content.trim() };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-agent-sdk",
-  "version": "0.17.3",
+  "version": "0.17.5",
   "description": "SDK for building AI-powered development tools and agents",
   "keywords": [
     "ai",

package/src/managers/skillManager.ts

@@ -442,7 +442,9 @@ export class SkillManager extends EventEmitter {
     const skillPath = `Base directory for this skill: ${skill.skillPath}\n\n`;
 
     // Extract content after frontmatter
-    const contentMatch = skill.content.match(/^---\n[\s\S]*?\n---\n([\s\S]*)$/);
+    const contentMatch = skill.content.match(
+      /^---\r?\n[\s\S]*?\r?\n---\r?\n([\s\S]*)$/,
+    );
     let mainContent = contentMatch ? contentMatch[1].trim() : skill.content;
 
     // 1. Substitute parameters ($1, $ARGUMENTS, etc.)

package/src/services/MarketplaceService.ts

@@ -68,6 +68,9 @@ export class MarketplaceService {
 
     this.ensureDirectoryStructure();
     this.runMigration();
+    // Stored dynamically to avoid widening keyof MarketplaceService
+    (this as Record<string, unknown>)._seedComplete =
+      this.seedBuiltinMarketplace();
   }
 
   /**
@@ -121,6 +124,63 @@ export class MarketplaceService {
     }
   }
 
+  /**
+   * Seeds the builtin marketplace on first startup.
+   * Adds it to user-scope settings and marks the cache as seeded.
+   */
+  private async seedBuiltinMarketplace(): Promise<void> {
+    try {
+      const cache = await this.getCacheRegistry();
+      if (cache?.builtinSeeded) return;
+
+      const builtin = MarketplaceService.BUILTIN_MARKETPLACE;
+
+      // Add to user-scope settings if not already in any scope
+      const scoped = this.configurationService.getMergedMarketplaces(
+        this.workdir,
+      );
+      if (!scoped[builtin.name]) {
+        await this.configurationService.addMarketplaceToScope(
+          this.workdir,
+          "user",
+          builtin.name,
+          { source: builtin.source, autoUpdate: builtin.autoUpdate },
+        );
+      }
+
+      // Update cache: add entry + set builtinSeeded flag
+      await this.updateCacheMarketplace(builtin.name, {
+        source: builtin.source,
+        autoUpdate: builtin.autoUpdate,
+        isBuiltin: true,
+        declaredScope: "builtin",
+      });
+      await this.setBuiltinSeeded(true);
+    } catch {
+      // Seeding failure should not block startup
+    }
+  }
+
+  /**
+   * Sets the builtinSeeded flag in the cache registry, preserving all other fields.
+   */
+  private async setBuiltinSeeded(value: boolean): Promise<void> {
+    const registry = await this.getCacheRegistry();
+    const tmpPath = `${this.knownMarketplacesPath}.tmp`;
+    await fs.writeFile(
+      tmpPath,
+      JSON.stringify(
+        {
+          builtinSeeded: value,
+          marketplaces: registry?.marketplaces ?? [],
+        },
+        null,
+        2,
+      ),
+    );
+    await fs.rename(tmpPath, this.knownMarketplacesPath);
+  }
+
   /**
    * Check if a lock file is stale by reading its PID and checking if the process is alive.
    * Returns true if the lock is stale and safe to remove.
@@ -258,7 +318,17 @@ export class MarketplaceService {
       });
     }
     const tmpPath = `${this.knownMarketplacesPath}.tmp`;
-    await fs.writeFile(tmpPath, JSON.stringify({ marketplaces }, null, 2));
+    await fs.writeFile(
+      tmpPath,
+      JSON.stringify(
+        {
+          builtinSeeded: registry?.builtinSeeded ?? false,
+          marketplaces,
+        },
+        null,
+        2,
+      ),
+    );
     await fs.rename(tmpPath, this.knownMarketplacesPath);
   }
 
@@ -272,7 +342,14 @@ export class MarketplaceService {
     const tmpPath = `${this.knownMarketplacesPath}.tmp`;
     await fs.writeFile(
       tmpPath,
-      JSON.stringify({ marketplaces: filtered }, null, 2),
+      JSON.stringify(
+        {
+          builtinSeeded: registry?.builtinSeeded ?? false,
+          marketplaces: filtered,
+        },
+        null,
+        2,
+      ),
     );
     await fs.rename(tmpPath, this.knownMarketplacesPath);
   }
@@ -536,6 +613,9 @@ export class MarketplaceService {
       const targetScope =
         scope || this.getMarketplaceDeclaringSource(name) || "user";
 
+      // Uninstall all plugins from this marketplace
+      await this.uninstallPluginsByMarketplace(name);
+
       if (targetScope !== "builtin") {
         await this.configurationService.removeMarketplaceFromScope(
           this.workdir,
@@ -549,6 +629,54 @@ export class MarketplaceService {
     });
   }
 
+  /**
+   * Uninstalls all plugins belonging to a given marketplace.
+   * Removes them from installed_plugins.json, deletes cache files,
+   * and cleans up enabledPlugins entries from all scopes.
+   */
+  private async uninstallPluginsByMarketplace(
+    marketplaceName: string,
+  ): Promise<void> {
+    const installedRegistry = await this.getInstalledPlugins();
+    const pluginsFromMarketplace = installedRegistry.plugins.filter(
+      (p) => p.marketplace === marketplaceName,
+    );
+
+    if (pluginsFromMarketplace.length === 0) return;
+
+    // Remove all plugins from this marketplace from the registry
+    installedRegistry.plugins = installedRegistry.plugins.filter(
+      (p) => p.marketplace !== marketplaceName,
+    );
+    await this.saveInstalledPlugins(installedRegistry);
+
+    // Delete cache files that are no longer referenced
+    const remainingCachePaths = new Set(
+      installedRegistry.plugins.map((p) => p.cachePath),
+    );
+    for (const plugin of pluginsFromMarketplace) {
+      if (
+        !remainingCachePaths.has(plugin.cachePath) &&
+        existsSync(plugin.cachePath)
+      ) {
+        await fs.rm(plugin.cachePath, { recursive: true, force: true });
+      }
+    }
+
+    // Remove enabledPlugins entries from all scopes
+    const scopes: Scope[] = ["user", "project", "local"];
+    for (const plugin of pluginsFromMarketplace) {
+      const pluginId = `${plugin.name}@${plugin.marketplace}`;
+      for (const s of scopes) {
+        await this.configurationService.removeEnabledPlugin(
+          this.workdir,
+          s,
+          pluginId,
+        );
+      }
+    }
+  }
+
   /**
    * Updates a specific marketplace or all marketplaces
    */

package/src/services/fileWatcher.ts

@@ -281,12 +281,11 @@ export class FileWatcherService extends EventEmitter {
 
     // Notify all watchers that match the path or are parents of the path
     for (const [watchedPath, entry] of this.watchers.entries()) {
+      const normalizedFilePath = filePath.replace(/\\/g, "/");
+      const normalizedWatchedPath = watchedPath.replace(/\\/g, "/");
       if (
-        filePath === watchedPath ||
-        filePath.startsWith(watchedPath + "/") ||
-        // Handle cases where the watched path might be a file and we get an event for it
-        // (already covered by filePath === watchedPath)
-        false
+        normalizedFilePath === normalizedWatchedPath ||
+        normalizedFilePath.startsWith(normalizedWatchedPath + "/")
       ) {
         entry.lastEvent = event.timestamp;
 

package/src/types/marketplace.ts

@@ -53,6 +53,7 @@ export interface KnownMarketplace {
 }
 
 export interface KnownMarketplacesRegistry {
+  builtinSeeded?: boolean;
   marketplaces: KnownMarketplace[];
 }
 

package/src/utils/commandPathResolver.ts

@@ -26,7 +26,9 @@ export function generateCommandId(filePath: string, rootDir: string): string {
     throw new Error("Command filename cannot be empty");
   }
 
-  const segments = relativePath.split("/").filter((segment) => segment !== "");
+  const segments = relativePath
+    .split(/[\\/]/)
+    .filter((segment) => segment !== "");
 
   // Remove .md extension from the last segment
   const lastSegment = segments[segments.length - 1];

package/src/utils/skillParser.ts

@@ -35,7 +35,7 @@ export function parseSkillFile(
     result.content = content;
 
     // Parse YAML frontmatter
-    const frontmatterMatch = content.match(/^---\n([\s\S]*?)\n---/);
+    const frontmatterMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
     if (!frontmatterMatch) {
       result.validationErrors.push("Missing YAML frontmatter");
       return result;
@@ -53,9 +53,11 @@ export function parseSkillFile(
 
     // Determine skill type and path
     const skillPath = basePath || dirname(filePath);
-    const skillType = skillPath.includes("/.wave/skills")
-      ? "project"
-      : "personal";
+    const skillType =
+      skillPath.includes("/.wave/skills") ||
+      skillPath.includes("\\.wave\\skills")
+        ? "project"
+        : "personal";
 
     // Extract allowed tools
     let allowedTools: string[] | undefined;

package/src/utils/subagentParser.ts

@@ -30,7 +30,8 @@ function parseFrontmatter(content: string): {
   frontmatter: SubagentFrontmatter;
   body: string;
 } {
-  const frontmatterRegex = /^---\s*\n([\s\S]*?)\n---\s*\n([\s\S]*)$/;
+  const frontmatterRegex =
+    /^---[ \t]*\r?\n([\s\S]*?)\r?\n---[ \t]*\r?\n([\s\S]*)$/;
   const match = content.match(frontmatterRegex);
 
   if (!match) {