assistme 0.8.5 → 0.8.7

package/dist/{chunk-4E5QAYTQ.js → chunk-QBXD76HA.js}

@@ -2876,6 +2876,10 @@ var SkillManager = class {
   skills = /* @__PURE__ */ new Map();
   idfCache = /* @__PURE__ */ new Map();
   userId = null;
+  /** Tracks the in-flight loadFromDb() promise so callers can await it. */
+  loadPromise = null;
+  /** True once loadFromDb() completes without error (even with 0 skills). */
+  loaded = false;
   /** Bounded cache for findRelevant() — keyed by normalized prompt, invalidated on skill changes. */
   relevanceCache = new LRUCache(MAX_RELEVANCE_CACHE_ENTRIES);
   /** Bounded, TTL-aware cache for marketplace discover results. */
@@ -2885,6 +2889,42 @@ var SkillManager = class {
   }
   async loadFromDb() {
     if (!this.userId) return;
+    if (this.loadPromise) return this.loadPromise;
+    this.loadPromise = this._doLoadFromDb();
+    try {
+      await this.loadPromise;
+    } finally {
+      this.loadPromise = null;
+    }
+  }
+  /**
+   * Guarantee that loadFromDb() has completed at least once.
+   * Awaits any in-flight load; retries once if the initial load failed.
+   * Safe and cheap to call repeatedly — no-ops after the first success.
+   */
+  async ensureLoaded() {
+    if (this.loadPromise) await this.loadPromise;
+    if (!this.loaded && this.userId) {
+      await this.loadFromDb();
+    }
+  }
+  /**
+   * Get a skill by name, with a DB search fallback.
+   * Handles: race conditions, failed initial loads, and skills added externally
+   * after the initial load (e.g. created via UI while agent is running).
+   */
+  async getWithDbFallback(name) {
+    await this.ensureLoaded();
+    const skill = this.skills.get(name);
+    if (skill) return skill;
+    const dbResults = await searchSkillsInDb(name, 5);
+    const match = dbResults?.find((r) => r.name === name);
+    if (!match) return void 0;
+    this.loaded = false;
+    await this.loadFromDb();
+    return this.skills.get(name);
+  }
+  async _doLoadFromDb() {
     try {
       const data = await callMcpHandler("skill.load");
       this.skills.clear();
@@ -2894,6 +2934,7 @@ var SkillManager = class {
         this.skills.set(row.name, this.rowToSkill(row));
       }
       this.rebuildIdfCache();
+      this.loaded = true;
       if (this.skills.size > 0) {
         log.info(`Loaded ${this.skills.size} skill(s) from DB`);
       }

package/dist/index.js

@@ -27,7 +27,7 @@ import {
   setSessionBusy,
   toggleScheduledTask,
   updateHeartbeat
-} from "./chunk-4E5QAYTQ.js";
+} from "./chunk-QBXD76HA.js";
 import {
   HEARTBEAT_INTERVAL_MS,
   HEARTBEAT_LOG_MAX_ENTRIES,

package/dist/workers/entry.js

@@ -19,7 +19,7 @@ import {
   pollActionResponse,
   resetEventSequence,
   setActionRequest
-} from "../chunk-4E5QAYTQ.js";
+} from "../chunk-QBXD76HA.js";
 import {
   EDSGER_PRODUCT_SLUG,
   JobRunner,
@@ -1778,7 +1778,7 @@ function createAgentToolsServer(deps) {
           description: z2.string().optional().describe("Updated description (optional)")
         },
         async (args) => {
-          const existing = skillManager.get(args.name);
+          const existing = await skillManager.getWithDbFallback(args.name);
           if (!existing) {
             const available = skillManager.getAll().map((s) => s.name).join(", ");
             return {
@@ -1824,7 +1824,7 @@ function createAgentToolsServer(deps) {
           arguments: z2.string().optional().describe("Arguments to pass to the skill (replaces $ARGUMENTS placeholders)")
         },
         async (args) => {
-          let skill = skillManager.get(args.name);
+          let skill = await skillManager.getWithDbFallback(args.name);
           if (!skill) {
             const confirmResult = await confirmMarketplaceSkill(
               skillManager,
@@ -2138,7 +2138,7 @@ Use \`ask_user\` to request these from the user, or create them yourself (e.g. r
           author_name: z2.string().optional().describe("Your display name as the author")
         },
         async (args) => {
-          const skill = skillManager.get(args.name);
+          const skill = await skillManager.getWithDbFallback(args.name);
           if (!skill) {
             return {
               content: [
@@ -3321,6 +3321,7 @@ var TaskProcessor = class {
     let tokenUsage;
     try {
       await emitEvent(task.id, "status_change", { status: "running" });
+      await this.skillManager.ensureLoaded();
       const systemPrompt = await buildSystemPrompt(task, {
         memoryManager: this.memoryManager,
         skillManager: this.skillManager,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assistme",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "description": "AssistMe CLI Agent - AI-powered agentic assistant for code, browser, and automation",
   "type": "module",
   "main": "dist/index.js",

package/src/agent/processor.ts

@@ -181,6 +181,9 @@ export class TaskProcessor {
     try {
       await emitEvent(task.id, "status_change", { status: "running" });
 
+      // Guarantee skills are loaded before building prompt or running tools
+      await this.skillManager.ensureLoaded();
+
       // Build system prompt with memories + skills + history
       const systemPrompt = await buildSystemPrompt(task, {
         memoryManager: this.memoryManager,

package/src/agent/skills.ts

@@ -63,6 +63,11 @@ export class SkillManager {
   private idfCache: Map<string, number> = new Map();
   private userId: string | null = null;
 
+  /** Tracks the in-flight loadFromDb() promise so callers can await it. */
+  private loadPromise: Promise<void> | null = null;
+  /** True once loadFromDb() completes without error (even with 0 skills). */
+  private loaded = false;
+
   /** Bounded cache for findRelevant() — keyed by normalized prompt, invalidated on skill changes. */
   private relevanceCache = new LRUCache<
     string,
@@ -79,6 +84,52 @@ export class SkillManager {
   async loadFromDb(): Promise<void> {
     if (!this.userId) return;
 
+    // Deduplicate concurrent loads: reuse existing in-flight promise
+    if (this.loadPromise) return this.loadPromise;
+
+    this.loadPromise = this._doLoadFromDb();
+    try {
+      await this.loadPromise;
+    } finally {
+      this.loadPromise = null;
+    }
+  }
+
+  /**
+   * Guarantee that loadFromDb() has completed at least once.
+   * Awaits any in-flight load; retries once if the initial load failed.
+   * Safe and cheap to call repeatedly — no-ops after the first success.
+   */
+  async ensureLoaded(): Promise<void> {
+    if (this.loadPromise) await this.loadPromise;
+    if (!this.loaded && this.userId) {
+      await this.loadFromDb();
+    }
+  }
+
+  /**
+   * Get a skill by name, with a DB search fallback.
+   * Handles: race conditions, failed initial loads, and skills added externally
+   * after the initial load (e.g. created via UI while agent is running).
+   */
+  async getWithDbFallback(name: string): Promise<Skill | undefined> {
+    await this.ensureLoaded();
+
+    const skill = this.skills.get(name);
+    if (skill) return skill;
+
+    // In-memory miss: check if the skill exists in DB via search
+    const dbResults = await searchSkillsInDb(name, 5);
+    const match = dbResults?.find((r) => r.name === name);
+    if (!match) return undefined;
+
+    // Found in DB — reload all skills into memory and return
+    this.loaded = false; // force reload
+    await this.loadFromDb();
+    return this.skills.get(name);
+  }
+
+  private async _doLoadFromDb(): Promise<void> {
     try {
       const data = await callMcpHandler<unknown[]>("skill.load");
 
@@ -90,6 +141,7 @@ export class SkillManager {
       }
 
       this.rebuildIdfCache();
+      this.loaded = true;
 
       if (this.skills.size > 0) {
         log.info(`Loaded ${this.skills.size} skill(s) from DB`);

package/src/mcp/agent-tools-server.ts

@@ -173,7 +173,8 @@ export function createAgentToolsServer(deps: AgentToolsDeps): McpSdkServerConfig
           description: z.string().optional().describe("Updated description (optional)"),
         },
         async (args) => {
-          const existing = skillManager.get(args.name);
+          // Use DB fallback to handle race condition with async loadFromDb
+          const existing = await skillManager.getWithDbFallback(args.name);
           if (!existing) {
             const available = skillManager
               .getAll()
@@ -228,7 +229,8 @@ export function createAgentToolsServer(deps: AgentToolsDeps): McpSdkServerConfig
             .describe("Arguments to pass to the skill (replaces $ARGUMENTS placeholders)"),
         },
         async (args) => {
-          let skill = skillManager.get(args.name);
+          // Use DB fallback to handle race condition with async loadFromDb
+          let skill = await skillManager.getWithDbFallback(args.name);
 
           // If not in user's collection, try marketplace — requires user confirmation
           if (!skill) {
@@ -541,7 +543,7 @@ export function createAgentToolsServer(deps: AgentToolsDeps): McpSdkServerConfig
           author_name: z.string().optional().describe("Your display name as the author"),
         },
         async (args) => {
-          const skill = skillManager.get(args.name);
+          const skill = await skillManager.getWithDbFallback(args.name);
           if (!skill) {
             return {
               content: [