@fdcn/sourcefed 0.2.9 → 0.3.1

package/README.md

@@ -32,13 +32,13 @@ import { createSourcefedMcp } from "@fdcn/sourcefed/mcp"
 OpenCode loads this package as both a server and a TUI plugin:
 
 ```json
-// opencode.json
-{ "plugin": ["@fdcn/sourcefed@0.2.9"] }
+// ~/.config/opencode/opencode.jsonc
+{ "plugins": ["@fdcn/sourcefed@0.3.1"] }
 ```
 
 ```json
-// tui.json
-{ "plugin": ["@fdcn/sourcefed@0.2.9"] }
+// ~/.config/opencode/cli.json
+{ "plugins": ["@fdcn/sourcefed@0.3.1"] }
 ```
 
 The package exposes `./server`, `./tui`, `./opencode`, `./opencode/tui`, and `./pi` entrypoints for hosts that load them directly.

package/dist/{chunk-QHT4DCW7.js → chunk-QPDTUNFA.js}

@@ -11605,6 +11605,7 @@ var SourcefedDaemon = class {
     if (!monitor) return { ok: false, error: `monitor ${id} was not found for this target` };
     const stopped = await this.service.stop(id);
     if ("error" in stopped) return { ok: false, error: stopped.error };
+    await this.purgeMonitorEvents(monitor.target, id);
     return { ok: true, monitor: monitorView(stopped) };
   }
   async startMonitor(target, id) {
@@ -11618,6 +11619,7 @@ var SourcefedDaemon = class {
     const monitor = await ownedMonitor(this.service, id, target);
     if (!monitor) return { ok: false, error: `monitor ${id} was not found for this target` };
     await this.service.remove(id);
+    await this.purgeMonitorEvents(monitor.target, id);
     return { ok: true, removed: true };
   }
   async readEvents(target) {
@@ -11691,6 +11693,8 @@ var SourcefedDaemon = class {
   async deliver(key, target, listeners) {
     const queued = await this.queue.read(target);
     if (queued.length === 0) return;
+    const enabled = new Set((await this.service.list()).filter((monitor) => monitor.enabled).map((monitor) => monitor.id));
+    await this.dropQueued(target, queued.filter((event) => !enabled.has(event.monitorID)).map((event) => event.id));
     let receivedByListener = this.received.get(key);
     if (!receivedByListener) {
       receivedByListener = /* @__PURE__ */ new Map();
@@ -11700,7 +11704,7 @@ var SourcefedDaemon = class {
     for (const received of receivedByListener.values()) {
       for (const id of received) claimed.add(id);
     }
-    const fresh = queued.filter((event) => !claimed.has(event.id));
+    const fresh = queued.filter((event) => enabled.has(event.monitorID) && !claimed.has(event.id));
     if (fresh.length === 0) return;
     for (const listener of [...listeners]) {
       let received = receivedByListener.get(listener);
@@ -11719,6 +11723,20 @@ var SourcefedDaemon = class {
       }
     }
   }
+  async dropQueued(target, eventIDs) {
+    if (eventIDs.length === 0) return;
+    await this.queue.acknowledge(target, eventIDs);
+    const receivedByListener = this.received.get(targetKey(target));
+    if (!receivedByListener) return;
+    const ids = new Set(eventIDs);
+    for (const received of receivedByListener.values()) {
+      for (const id of ids) received.delete(id);
+    }
+  }
+  async purgeMonitorEvents(target, monitorID) {
+    const queued = await this.queue.read(target);
+    await this.dropQueued(target, queued.filter((event) => event.monitorID === monitorID).map((event) => event.id));
+  }
 };
 function monitorView(monitor) {
   const definition = sourceDefinition(monitor.source);

package/dist/cli.js

@@ -11528,6 +11528,7 @@ var SourcefedDaemon = class {
     if (!monitor) return { ok: false, error: `monitor ${id} was not found for this target` };
     const stopped = await this.service.stop(id);
     if ("error" in stopped) return { ok: false, error: stopped.error };
+    await this.purgeMonitorEvents(monitor.target, id);
     return { ok: true, monitor: monitorView(stopped) };
   }
   async startMonitor(target, id) {
@@ -11541,6 +11542,7 @@ var SourcefedDaemon = class {
     const monitor = await ownedMonitor(this.service, id, target);
     if (!monitor) return { ok: false, error: `monitor ${id} was not found for this target` };
     await this.service.remove(id);
+    await this.purgeMonitorEvents(monitor.target, id);
     return { ok: true, removed: true };
   }
   async readEvents(target) {
@@ -11614,6 +11616,8 @@ var SourcefedDaemon = class {
   async deliver(key, target, listeners) {
     const queued = await this.queue.read(target);
     if (queued.length === 0) return;
+    const enabled = new Set((await this.service.list()).filter((monitor) => monitor.enabled).map((monitor) => monitor.id));
+    await this.dropQueued(target, queued.filter((event) => !enabled.has(event.monitorID)).map((event) => event.id));
     let receivedByListener = this.received.get(key);
     if (!receivedByListener) {
       receivedByListener = /* @__PURE__ */ new Map();
@@ -11623,7 +11627,7 @@ var SourcefedDaemon = class {
     for (const received of receivedByListener.values()) {
       for (const id of received) claimed.add(id);
     }
-    const fresh = queued.filter((event) => !claimed.has(event.id));
+    const fresh = queued.filter((event) => enabled.has(event.monitorID) && !claimed.has(event.id));
     if (fresh.length === 0) return;
     for (const listener of [...listeners]) {
       let received = receivedByListener.get(listener);
@@ -11642,6 +11646,20 @@ var SourcefedDaemon = class {
       }
     }
   }
+  async dropQueued(target, eventIDs) {
+    if (eventIDs.length === 0) return;
+    await this.queue.acknowledge(target, eventIDs);
+    const receivedByListener = this.received.get(targetKey(target));
+    if (!receivedByListener) return;
+    const ids = new Set(eventIDs);
+    for (const received of receivedByListener.values()) {
+      for (const id of ids) received.delete(id);
+    }
+  }
+  async purgeMonitorEvents(target, monitorID) {
+    const queued = await this.queue.read(target);
+    await this.dropQueued(target, queued.filter((event) => event.monitorID === monitorID).map((event) => event.id));
+  }
 };
 function monitorView(monitor) {
   const definition = sourceDefinition(monitor.source);
@@ -44166,7 +44184,9 @@ async function runMonitor(argv) {
 
 // packages/cli/src/utils/setup.ts
 import { execFile } from "node:child_process";
-import { readFileSync } from "node:fs";
+import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import os8 from "node:os";
+import path8 from "node:path";
 import { fileURLToPath } from "node:url";
 function setupSpec() {
   const manifest = JSON.parse(readFileSync(fileURLToPath(new URL("../package.json", import.meta.url)), "utf8"));
@@ -44178,23 +44198,64 @@ async function setupHost(name, args, spec) {
   try {
     await execFile(name, args);
     console.error(`[sourcefed] ${name} configured \u2014 restart ${name} to load the plugin`);
+    return true;
   } catch (error2) {
     const code = error2 && typeof error2 === "object" && "code" in error2 ? String(error2.code) : "";
     if (code === "ENOENT") {
       console.error(`[sourcefed] ${name} is not on PATH \u2014 install it manually:`);
-      console.error(name === "opencode" ? `  add "${spec}" to the plugin array in ~/.config/opencode/opencode.jsonc and tui.json` : `  run: pi install ${spec}`);
-      return;
+      console.error(name === "opencode" ? `  add "${spec}" to the plugins array in ~/.config/opencode/opencode.jsonc and cli.json` : `  run: pi install ${spec}`);
+      return false;
+    }
+    throw error2;
+  }
+}
+function configureOpenCodeCliPlugin(spec) {
+  const file = openCodeCliConfigPath();
+  const config2 = readOpenCodeCliConfig(file);
+  const plugins = config2.plugins;
+  if (plugins === void 0) {
+    config2.plugins = [spec];
+  } else if (!Array.isArray(plugins)) {
+    throw new Error(`OpenCode CLI config has a non-array plugins setting: ${file}`);
+  } else if (!plugins.some((plugin) => isPluginEntry(plugin, spec))) {
+    config2.plugins = [...plugins, spec];
+  } else {
+    return;
+  }
+  mkdirSync(path8.dirname(file), { recursive: true });
+  writeFileSync(file, `${JSON.stringify(config2, null, 2)}
+`);
+}
+function openCodeCliConfigPath() {
+  const configHome = process.env.XDG_CONFIG_HOME ?? path8.join(os8.homedir(), ".config");
+  return path8.join(configHome, "opencode", "cli.json");
+}
+function readOpenCodeCliConfig(file) {
+  try {
+    const value = JSON.parse(readFileSync(file, "utf8"));
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+      throw new Error(`OpenCode CLI config must contain a JSON object: ${file}`);
     }
+    return value;
+  } catch (error2) {
+    if (error2 instanceof Error && "code" in error2 && error2.code === "ENOENT") return {};
+    if (error2 instanceof SyntaxError) throw new Error(`OpenCode CLI config is not valid JSON: ${file}`);
     throw error2;
   }
 }
+function isPluginEntry(value, spec) {
+  if (value === spec) return true;
+  if (!value || typeof value !== "object" || Array.isArray(value)) return false;
+  return "package" in value && value.package === spec;
+}
 
 // packages/cli/src/commands/setup.ts
 async function runSetup(args) {
   const spec = setupSpec();
   const requested = args[0] ?? "all";
   if (requested === "opencode" || requested === "all") {
-    await setupHost("opencode", ["plugin", spec, "--global"], spec);
+    const installed = await setupHost("opencode", ["plugin", "add", spec], spec);
+    if (installed) configureOpenCodeCliPlugin(spec);
   }
   if (requested === "pi" || requested === "all") {
     await setupHost("pi", ["install", `npm:${spec}`], `npm:${spec}`);
@@ -44203,12 +44264,12 @@ async function runSetup(args) {
 
 // packages/cli/src/skills/command.ts
 import { readFile as readFile7, readdir as readdir2, stat as stat2 } from "node:fs/promises";
-import path9 from "node:path";
+import path10 from "node:path";
 
 // packages/cli/src/skills/discovery.ts
 import { statSync } from "node:fs";
 import { readdir, readFile as readFile6, stat } from "node:fs/promises";
-import path8 from "node:path";
+import path9 from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // packages/cli/src/skills/frontmatter.ts
@@ -44256,7 +44317,7 @@ async function skillsDirs() {
   }
   const directories = [];
   for (const name of SKILL_DIRS) {
-    const candidate = path8.join(skillRoot(), name);
+    const candidate = path9.join(skillRoot(), name);
     try {
       if ((await stat(candidate)).isDirectory()) directories.push(candidate);
     } catch {
@@ -44268,7 +44329,7 @@ async function discoverSkills() {
   const skills = [];
   for (const dir of await skillsDirs()) {
     for (const entry of await readdir(dir)) {
-      const skillDir = path8.join(dir, entry);
+      const skillDir = path9.join(dir, entry);
       let entryStat;
       try {
         entryStat = await stat(skillDir);
@@ -44276,7 +44337,7 @@ async function discoverSkills() {
         continue;
       }
       if (!entryStat.isDirectory()) continue;
-      const skillFile = path8.join(skillDir, "SKILL.md");
+      const skillFile = path9.join(skillDir, "SKILL.md");
       try {
         const content = await readFile6(skillFile, "utf8");
         const parsed = parseFrontmatter(content);
@@ -44289,15 +44350,15 @@ async function discoverSkills() {
   return skills;
 }
 function skillRoot() {
-  let dir = path8.dirname(fileURLToPath2(import.meta.url));
+  let dir = path9.dirname(fileURLToPath2(import.meta.url));
   for (let depth = 0; depth < 6; depth++) {
-    const marker = path8.join(dir, "data");
+    const marker = path9.join(dir, "data");
     if (statSync(marker, { throwIfNoEntry: false })?.isDirectory()) return dir;
-    const parent = path8.dirname(dir);
+    const parent = path9.dirname(dir);
     if (parent === dir) break;
     dir = parent;
   }
-  return path8.dirname(fileURLToPath2(import.meta.url));
+  return path9.dirname(fileURLToPath2(import.meta.url));
 }
 
 // packages/cli/src/skills/command.ts
@@ -44344,7 +44405,7 @@ async function runGet(args) {
     output += `# ${skill.name}
 
 `;
-    output += await readFile7(path9.join(skill.dir, "SKILL.md"), "utf8");
+    output += await readFile7(path10.join(skill.dir, "SKILL.md"), "utf8");
     output += "\n";
     if (full) output += await supplementaryFiles(skill.dir);
   }
@@ -44367,7 +44428,7 @@ async function runPath(name) {
 async function supplementaryFiles(skillDir) {
   let output = "";
   for (const subdirName of ["references", "templates"]) {
-    const subdir = path9.join(skillDir, subdirName);
+    const subdir = path10.join(skillDir, subdirName);
     try {
       if (!(await stat2(subdir)).isDirectory()) continue;
     } catch {
@@ -44375,7 +44436,7 @@ async function supplementaryFiles(skillDir) {
     }
     const entries = (await readdir2(subdir)).sort();
     for (const entry of entries) {
-      const filePath = path9.join(subdir, entry);
+      const filePath = path10.join(subdir, entry);
       try {
         if (!(await stat2(filePath)).isFile()) continue;
       } catch {

package/dist/daemon.js

@@ -11630,6 +11630,7 @@ var SourcefedDaemon = class {
     if (!monitor) return { ok: false, error: `monitor ${id} was not found for this target` };
     const stopped = await this.service.stop(id);
     if ("error" in stopped) return { ok: false, error: stopped.error };
+    await this.purgeMonitorEvents(monitor.target, id);
     return { ok: true, monitor: monitorView(stopped) };
   }
   async startMonitor(target, id) {
@@ -11643,6 +11644,7 @@ var SourcefedDaemon = class {
     const monitor = await ownedMonitor(this.service, id, target);
     if (!monitor) return { ok: false, error: `monitor ${id} was not found for this target` };
     await this.service.remove(id);
+    await this.purgeMonitorEvents(monitor.target, id);
     return { ok: true, removed: true };
   }
   async readEvents(target) {
@@ -11716,6 +11718,8 @@ var SourcefedDaemon = class {
   async deliver(key, target, listeners) {
     const queued = await this.queue.read(target);
     if (queued.length === 0) return;
+    const enabled = new Set((await this.service.list()).filter((monitor) => monitor.enabled).map((monitor) => monitor.id));
+    await this.dropQueued(target, queued.filter((event) => !enabled.has(event.monitorID)).map((event) => event.id));
     let receivedByListener = this.received.get(key);
     if (!receivedByListener) {
       receivedByListener = /* @__PURE__ */ new Map();
@@ -11725,7 +11729,7 @@ var SourcefedDaemon = class {
     for (const received of receivedByListener.values()) {
       for (const id of received) claimed.add(id);
     }
-    const fresh = queued.filter((event) => !claimed.has(event.id));
+    const fresh = queued.filter((event) => enabled.has(event.monitorID) && !claimed.has(event.id));
     if (fresh.length === 0) return;
     for (const listener of [...listeners]) {
       let received = receivedByListener.get(listener);
@@ -11744,6 +11748,20 @@ var SourcefedDaemon = class {
       }
     }
   }
+  async dropQueued(target, eventIDs) {
+    if (eventIDs.length === 0) return;
+    await this.queue.acknowledge(target, eventIDs);
+    const receivedByListener = this.received.get(targetKey(target));
+    if (!receivedByListener) return;
+    const ids = new Set(eventIDs);
+    for (const received of receivedByListener.values()) {
+      for (const id of ids) received.delete(id);
+    }
+  }
+  async purgeMonitorEvents(target, monitorID) {
+    const queued = await this.queue.read(target);
+    await this.dropQueued(target, queued.filter((event) => event.monitorID === monitorID).map((event) => event.id));
+  }
 };
 function monitorView(monitor) {
   const definition = sourceDefinition(monitor.source);

package/dist/mcp.js

@@ -1,7 +1,7 @@
 import {
   decodeTarget,
   encodeTarget
-} from "./chunk-QHT4DCW7.js";
+} from "./chunk-QPDTUNFA.js";
 import {
   __export
 } from "./chunk-MLKGABMK.js";