@hzttt/multimodal-rag 0.2.2 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzttt/multimodal-rag",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "OpenClaw plugin for multimodal RAG - semantic indexing and time-aware search for images and audio using local AI models",
   "type": "module",
   "repository": {

package/src/notifier.ts

@@ -125,17 +125,86 @@ export class IndexNotifier implements IndexEventCallbacks {
   }
 
   /**
-   * 触发 agent: enqueueSystemEvent + requestHeartbeatNow
+   * 触发 agent: 使用 CLI 注入系统事件并立即唤醒 heartbeat
+   *
+   * 兼容说明：当前 runtime.system 不提供 requestHeartbeatNow/resolveMainSessionKey。
    */
   private triggerAgent(text: string): void {
+    const argv = this.buildSystemEventCommand(text);
+
+    void this.runtime.system
+      .runCommandWithTimeout(argv, { timeoutMs: 15000 })
+      .then((result) => {
+        if (result.code === 0) {
+          this.logger.info?.(`Notification triggered: ${text.slice(0, 80)}...`);
+          return;
+        }
+
+        const detail = (result.stderr || result.stdout || "no output").trim();
+        this.logger.warn?.(
+          `Notification wake command failed (code=${String(result.code)}): ${detail}`,
+        );
+        this.enqueueWithoutWake(text);
+      })
+      .catch((err) => {
+        this.logger.warn?.(`Notification wake command error: ${String(err)}`);
+        this.enqueueWithoutWake(text);
+      });
+  }
+
+  /**
+   * 构建 system event CLI 命令，优先复用当前 openclaw 进程入口
+   */
+  private buildSystemEventCommand(text: string): string[] {
+    const nodeExec = process.execPath;
+    const cliEntry = process.argv[1];
+
+    if (typeof cliEntry === "string" && cliEntry.trim().length > 0) {
+      return [
+        nodeExec,
+        cliEntry,
+        "system",
+        "event",
+        "--text",
+        text,
+        "--mode",
+        "now",
+      ];
+    }
+
+    return ["openclaw", "system", "event", "--text", text, "--mode", "now"];
+  }
+
+  /**
+   * 降级路径：至少把事件放入队列，避免消息完全丢失
+   */
+  private enqueueWithoutWake(text: string): void {
     try {
-      const sessionKey = this.runtime.system.resolveMainSessionKey(this.openclawConfig);
+      const sessionKey = this.resolveMainSessionKey();
       this.runtime.system.enqueueSystemEvent(text, { sessionKey });
-      this.runtime.system.requestHeartbeatNow({ reason: "multimodal-rag:notification" });
-      this.logger.info?.(`Notification triggered: ${text.slice(0, 80)}...`);
+      this.logger.warn?.("Notification queued without immediate wake (fallback)");
     } catch (err) {
-      this.logger.warn?.(`Failed to trigger agent notification: ${String(err)}`);
+      this.logger.warn?.(`Failed to enqueue fallback notification: ${String(err)}`);
+    }
+  }
+
+  /**
+   * 兼容版 main session key 解析
+   */
+  private resolveMainSessionKey(): string {
+    const configuredMainKey = this.openclawConfig.session?.mainKey?.trim();
+    if (configuredMainKey) {
+      return configuredMainKey;
     }
+
+    const agents = this.openclawConfig.agents?.list ?? [];
+    const defaultAgentId =
+      agents.find((agent) => agent.default && typeof agent.id === "string" && agent.id.trim())
+        ?.id?.trim() ??
+      agents.find((agent) => typeof agent.id === "string" && agent.id.trim())?.id?.trim() ??
+      "main";
+
+    return `agent:${defaultAgentId}:main`;
   }
 
   /**

package/src/watcher.ts

@@ -237,6 +237,7 @@ export class MediaWatcher {
           this.logger.warn?.(
             `Failed to index ${fileName} after 3 attempts: Ollama unavailable`,
           );
+          this.callbacks?.onFileFailed(filePath, "Ollama service unavailable");
         }
         return false;
       }
@@ -250,8 +251,9 @@ export class MediaWatcher {
       const existing = await this.storage.findByHash(fileHash);
       if (existing) {
         this.logger.info?.(`Skipping duplicate: ${fileName}`);
-        // 索引成功（已存在），清除失败记录
+        // 索引成功（已存在），清除失败记录并通知回调
         this.failedFiles.delete(filePath);
+        this.callbacks?.onFileIndexed(filePath, fileType);
         return true;
       }