@fdcn/sourcefed 0.3.2 → 0.3.4

package/dist/data/core/references/commands.md

@@ -14,7 +14,7 @@ sourcefed monitor start --id ID [--target-kind KIND] [--target-id ID]
 sourcefed monitor remove --id ID --yes [--target-kind KIND] [--target-id ID]
 sourcefed monitor events [--target-kind KIND] [--target-id ID]
 sourcefed monitor follow [--target-kind KIND] [--target-id ID]
-sourcefed monitor ack --event-id ID[,ID...] [--target-kind KIND] [--target-id ID]
+sourcefed monitor ack --event-id ID [--event-id ID...] [--target-kind KIND] [--target-id ID]
 sourcefed monitor sources
 sourcefed skills [list]                     List bundled skills
 sourcefed skills get <name> [--full]        Output skill content (--full adds references)

package/dist/mcp.js

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

package/dist/opencode.js

@@ -1,10 +1,13 @@
+import {
+  eventToText
+} from "./chunk-BNLZQKEB.js";
 import {
   SOURCE_TYPES,
   connectDaemonClient,
   daemonCommand,
   daemonEnvironment,
   spawnLocalDaemon
-} from "./chunk-QPDTUNFA.js";
+} from "./chunk-X3BZSHKZ.js";
 import "./chunk-MLKGABMK.js";
 
 // packages/sourcefed/src/server.ts
@@ -18,10 +21,41 @@ import { Plugin } from "@opencode/plugin";
 // adapters/opencode/bridge.ts
 import { existsSync } from "node:fs";
 import { fileURLToPath } from "node:url";
+import { Rpc } from "@opencode/plugin";
+var TARGET_KIND = "opencode-session";
+var GATE_TIMEOUT_MS = 3e3;
+var ChauffeurGate = Rpc.define({
+  id: "chauffeur",
+  methods: {
+    gate: {
+      input: {
+        type: "object",
+        properties: {
+          sessionID: { type: "string" },
+          // The monitor that produced the event, so the gate knows what it watches.
+          monitorID: { type: "string" },
+          source: { type: "string" },
+          kind: { type: "string" },
+          summary: { type: "string" },
+          body: { type: "string" },
+          actionable: { type: "boolean" }
+        },
+        required: ["sessionID", "source", "kind", "summary", "actionable"]
+      },
+      output: {
+        type: "object",
+        properties: { deliver: { type: "boolean" } },
+        required: ["deliver"]
+      }
+    }
+  },
+  events: {}
+});
 var activeBridge;
 var OpenCodeBridge = class {
-  constructor(session) {
+  constructor(session, rpc) {
     this.session = session;
+    this.rpc = rpc;
   }
   daemon;
   listeners = /* @__PURE__ */ new Map();
@@ -32,12 +66,21 @@ var OpenCodeBridge = class {
   }
   async ensureTarget(sessionID) {
     await this.ensureDaemon();
-    if (this.listeners.has(sessionID)) return;
-    const target = this.target(sessionID);
-    const listener = await this.daemon.subscribe(target, async (events) => {
+    const existing = this.listeners.get(sessionID);
+    if (existing) {
+      await existing;
+      return;
+    }
+    const pending = this.daemon.subscribe(this.target(sessionID), async (events) => {
       await this.routeEvents(events);
     });
-    this.listeners.set(sessionID, listener);
+    this.listeners.set(sessionID, pending);
+    try {
+      await pending;
+    } catch (error) {
+      this.listeners.delete(sessionID);
+      throw error;
+    }
   }
   async callTool(name, arguments_, sessionID) {
     await this.ensureDaemon();
@@ -48,7 +91,7 @@ var OpenCodeBridge = class {
     return this.daemon.request(name.replace(/_/g, "."), { ...arguments_, target: this.target(sessionID) });
   }
   async close() {
-    for (const listener of this.listeners.values()) await listener.close();
+    for (const pending of this.listeners.values()) await pending.then((listener) => listener.close(), () => void 0);
     this.listeners.clear();
     await this.daemon?.close();
     this.daemon = void 0;
@@ -58,42 +101,92 @@ var OpenCodeBridge = class {
     if (Date.now() - this.lastAttemptAt < 15e3) return;
     this.lastAttemptAt = Date.now();
     try {
-      const url = process.env.SOURCEFED_DAEMON_URL;
-      if (url) {
-        this.daemon = await connectDaemonClient({ name: "sourcefed-opencode", url });
-        return;
-      }
-      const local = daemonCommand(cliEntry());
-      const spawned = await spawnLocalDaemon({
-        command: local.command,
-        args: local.args,
-        env: daemonEnvironment()
-      });
-      this.daemon = await connectDaemonClient({ name: "sourcefed-opencode", url: spawned.url });
+      this.daemon = await connectDaemon();
+      void this.resubscribe();
     } catch (error) {
       this.lastError = error instanceof Error ? error.message : String(error);
       console.error(`[sourcefed] daemon unavailable: ${this.lastError}`);
     }
   }
-  // V2 `session.prompt` has no model field — the model is a session property and
-  // prompting does not reset it, so no model-reuse dance is needed. Actionable
-  // events prompt the agent; non-actionable ones inject a synthetic message that
-  // lands in the transcript without triggering a reply.
+  /**
+   * Monitors outlive this process, so after a restart nothing listens for their
+   * sessions until something subscribes. Subscribe every session that has an
+   * enabled monitor and still exists here; a deleted session is skipped, since
+   * delivering to it would fail and retry forever.
+   */
+  async resubscribe() {
+    try {
+      const { targets } = await this.daemon.request("monitor.targets", { kind: TARGET_KIND });
+      await Promise.all(targets.map((target) => this.resubscribeTarget(target.id)));
+    } catch (error) {
+      console.error(`[sourcefed] resubscribe failed: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }
+  async resubscribeTarget(sessionID) {
+    const exists = await this.session.get({ sessionID }).then(() => true, () => false);
+    if (!exists) return;
+    await this.ensureTarget(sessionID).catch((error) => {
+      console.error(`[sourcefed] subscribe ${sessionID} failed: ${error instanceof Error ? error.message : String(error)}`);
+    });
+  }
+  // Every event arrives as a synthetic message, never as a user prompt, so it is
+  // not mistaken for the user's own words. Actionable events resume an idle
+  // agent; the rest wait in the transcript for the next turn.
   async routeEvents(events) {
     for (const queued of events) {
       const sessionID = queued.target.id;
-      const text = eventText(queued.event);
-      if (queued.event.actionable) {
-        await this.session.prompt({ sessionID, text });
-      } else {
-        await this.session.synthetic({ sessionID, text });
-      }
+      if (!await this.admitted(sessionID, queued)) continue;
+      await this.session.synthetic({
+        sessionID,
+        text: eventToText(queued.event),
+        description: `sourcefed ${queued.event.kind}`,
+        metadata: { sourcefed: { eventID: queued.id, monitorID: queued.monitorID, kind: queued.event.kind } },
+        resume: queued.event.actionable
+      });
+    }
+  }
+  /**
+   * Ask Chauffeur's gate, when it runs in this process. Only an explicit
+   * `deliver: false` withholds the event; no gate, an error, or a slow answer
+   * delivers.
+   */
+  async admitted(sessionID, queued) {
+    if (!this.rpc) return true;
+    const { event } = queued;
+    try {
+      const source = event.source?.type;
+      const reply = await this.rpc(ChauffeurGate).gate(
+        {
+          sessionID,
+          monitorID: queued.monitorID,
+          source: typeof source === "string" ? source : "unknown",
+          kind: event.kind,
+          summary: event.summary,
+          body: event.body ?? "",
+          actionable: event.actionable
+        },
+        { signal: AbortSignal.timeout(GATE_TIMEOUT_MS) }
+      );
+      return reply.deliver !== false;
+    } catch {
+      return true;
     }
   }
   target(sessionID) {
-    return { kind: "opencode-session", id: sessionID };
+    return { kind: TARGET_KIND, id: sessionID };
   }
 };
+async function connectDaemon() {
+  const url = process.env.SOURCEFED_DAEMON_URL;
+  if (url) return connectDaemonClient({ name: "sourcefed-opencode", url });
+  const local = daemonCommand(cliEntry());
+  const spawned = await spawnLocalDaemon({
+    command: local.command,
+    args: local.args,
+    env: daemonEnvironment()
+  });
+  return connectDaemonClient({ name: "sourcefed-opencode", url: spawned.url });
+}
 function cliEntry() {
   const bundled = fileURLToPath(new URL("./cli.js", import.meta.url));
   if (existsSync(bundled)) return bundled;
@@ -106,12 +199,6 @@ function getOpenCodeBridge() {
   if (!activeBridge) throw new Error("Sourcefed OpenCode bridge is not initialized");
   return activeBridge;
 }
-function eventText(event) {
-  const header = `[sourcefed monitor] ${event.summary}`;
-  return event.body ? `${header}
-
-${event.body}` : header;
-}
 
 // adapters/opencode/tool-result.ts
 async function callMonitorTool(name, arguments_, sessionID) {
@@ -219,7 +306,7 @@ var monitor_stop_default = definition5;
 
 // adapters/opencode/index.ts
 async function setupSourcefed(ctx) {
-  const bridge = new OpenCodeBridge(ctx.session);
+  const bridge = new OpenCodeBridge(ctx.session, ctx.rpc);
   setOpenCodeBridge(bridge);
   await bridge.start();
   await ctx.tool.transform((editor) => {

package/dist/pi.js

@@ -1,9 +1,12 @@
+import {
+  eventToText
+} from "./chunk-BNLZQKEB.js";
 import {
   connectDaemonClient,
   daemonCommand,
   daemonEnvironment,
   spawnLocalDaemon
-} from "./chunk-QPDTUNFA.js";
+} from "./chunk-X3BZSHKZ.js";
 import "./chunk-MLKGABMK.js";
 
 // adapters/pi/src/index.ts
@@ -248,9 +251,7 @@ async function routeEvents(pi, events) {
   for (const queued of events) {
     await pi.sendMessage({
       customType: "sourcefed-monitor",
-      content: `[sourcefed monitor] ${queued.event.summary}${queued.event.body ? `
-
-${queued.event.body}` : ""}`,
+      content: eventToText(queued.event),
       display: true,
       details: { actionable: queued.event.actionable, eventID: queued.id }
     }, { triggerTurn: queued.event.actionable, deliverAs: "steer" });

package/dist.dts/adapters/opencode/bridge.d.ts

@@ -1,18 +1,34 @@
-import type { Plugin } from "@opencode/plugin";
+import { type Plugin } from "@opencode/plugin";
 type SessionDomain = Plugin.Context["session"];
+type RpcDomain = Plugin.Context["rpc"];
 export declare class OpenCodeBridge {
     private readonly session;
+    private readonly rpc?;
     private daemon?;
     private readonly listeners;
     private lastAttemptAt;
     private lastError;
-    constructor(session: SessionDomain);
+    constructor(session: SessionDomain, rpc?: RpcDomain | undefined);
     start(): Promise<void>;
     ensureTarget(sessionID: string): Promise<void>;
     callTool(name: string, arguments_: Record<string, unknown>, sessionID: string): Promise<unknown>;
     close(): Promise<void>;
     private ensureDaemon;
+    /**
+     * Monitors outlive this process, so after a restart nothing listens for their
+     * sessions until something subscribes. Subscribe every session that has an
+     * enabled monitor and still exists here; a deleted session is skipped, since
+     * delivering to it would fail and retry forever.
+     */
+    private resubscribe;
+    private resubscribeTarget;
     private routeEvents;
+    /**
+     * Ask Chauffeur's gate, when it runs in this process. Only an explicit
+     * `deliver: false` withholds the event; no gate, an error, or a slow answer
+     * delivers.
+     */
+    private admitted;
     private target;
 }
 export declare function setOpenCodeBridge(bridge: OpenCodeBridge): void;

package/dist.dts/adapters/opencode/bridge.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist.dts/packages/cli/src/utils/flags.d.ts

@@ -1 +1,3 @@
 export declare function flag(args: string[], name: string): string | undefined;
+/** Every value of a repeatable flag, in order: `--name a --name b` gives `["a", "b"]`. */
+export declare function flags(args: string[], name: string): string[];

package/dist.dts/packages/cli/src/utils/flags.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist.dts/packages/daemon/src/daemon.d.ts

@@ -19,6 +19,11 @@ export declare class SourcefedDaemon {
     webhook(request: Request): Promise<Response>;
     createMonitor(target: MonitorTarget, input: DaemonCreateInput): Promise<DaemonResult>;
     listMonitors(target: MonitorTarget): Promise<DaemonResult>;
+    /**
+     * Every target of `kind` with an enabled monitor, so a host that restarts can
+     * resubscribe the sessions whose monitors outlived it.
+     */
+    listTargets(kind: string): Promise<MonitorTarget[]>;
     getMonitor(target: MonitorTarget, id: string): Promise<DaemonResult>;
     stopMonitor(target: MonitorTarget, id: string): Promise<DaemonResult>;
     startMonitor(target: MonitorTarget, id: string): Promise<DaemonResult>;

package/dist.dts/packages/daemon/src/forward.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist.dts/packages/daemon/src/gate.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist.dts/packages/daemon/src/utils/forward.d.ts

@@ -0,0 +1,32 @@
+import type { MonitorEvent, MonitorEventSink, MonitorRecord } from "@fdcn/sourcefed/core";
+export type ForwardOptions = {
+    url: string;
+    token?: string;
+    fetch?: typeof fetch;
+};
+/** The JSON body POSTed for each delivered event. */
+export type ForwardedEvent = {
+    target: MonitorRecord["target"];
+    monitorID: string;
+    source: MonitorRecord["source"];
+    event: MonitorEvent;
+};
+/** `SOURCEFED_FORWARD_URL` (and optional `SOURCEFED_FORWARD_TOKEN`), when set. */
+export declare function forwardFromEnv(): ForwardOptions | undefined;
+/**
+ * Delivers to `inner`, then POSTs a copy of each delivered event to another
+ * local consumer. Forwarding never blocks or fails delivery.
+ */
+export declare class ForwardingEventSink implements MonitorEventSink {
+    private readonly inner;
+    private readonly options;
+    constructor(inner: MonitorEventSink, options: ForwardOptions);
+    deliver(input: {
+        monitor: MonitorRecord;
+        event: MonitorEvent;
+    }): Promise<{
+        ok: boolean;
+        error?: string;
+    }>;
+    private forward;
+}

package/dist.dts/packages/daemon/src/utils/gate.d.ts

@@ -0,0 +1,33 @@
+import type { MonitorEvent, MonitorEventSink, MonitorRecord } from "@fdcn/sourcefed/core";
+export type GateOptions = {
+    url: string;
+    token?: string;
+    fetch?: typeof fetch;
+};
+/** The JSON body POSTed for each event; the gate replies `{ "deliver": boolean }`. */
+export type GatedEvent = {
+    target: MonitorRecord["target"];
+    monitorID: string;
+    source: MonitorRecord["source"];
+    event: MonitorEvent;
+};
+/** `SOURCEFED_GATE_URL` (and optional `SOURCEFED_GATE_TOKEN`), when set. */
+export declare function gateFromEnv(): GateOptions | undefined;
+/**
+ * Asks another local consumer whether each event should reach the session.
+ * Only an explicit `{ "deliver": false }` withholds it; a failed, slow, or
+ * unclear answer delivers, so the gate can never lose an event.
+ */
+export declare class GatedEventSink implements MonitorEventSink {
+    private readonly inner;
+    private readonly options;
+    constructor(inner: MonitorEventSink, options: GateOptions);
+    deliver(input: {
+        monitor: MonitorRecord;
+        event: MonitorEvent;
+    }): Promise<{
+        ok: boolean;
+        error?: string;
+    }>;
+    private withheld;
+}

package/dist.dts/providers/slack/src/poll/utils/slack-api.d.ts

@@ -1,8 +1,16 @@
+type SlackUser = {
+    id: string;
+    name: string;
+    real_name: string;
+};
 export declare function fetchSlackThread(channelId: string, threadTs: string): Promise<{
     messages: any[];
-    users: any[];
-} | undefined>;
+    users: SlackUser[];
+}>;
 export declare function fetchSlackDm(channelId: string): Promise<{
     messages: any[];
-    users: any[];
-} | undefined>;
+    users: SlackUser[];
+}>;
+/** Forget the cached user list, so a test starts from an empty cache. */
+export declare function resetSlackUsers(): void;
+export {};

package/dist.dts/providers/slack/src/poll/utils/slack-api.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fdcn/sourcefed",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Live Jira, GitHub, and Slack monitoring for agent hosts: CLI, daemon, MCP server, and host plugins.",
   "license": "MIT",
   "type": "module",