@nettee/beacon 0.2.9 → 0.3.1

package/dist/service.js

@@ -1,8 +1,13 @@
+import { join } from "node:path";
+import { loadEventCredentials } from "./config/event-credentials.js";
 import { loadGlobalConfig } from "./config/global.js";
 import { loadProfileRegistry } from "./config/registry.js";
 import { loadRuntimeEnvironment } from "./config/runtime-environment.js";
 import { loadFeishuCredentials } from "./config/secrets.js";
 import { startDashboard } from "./dashboard/server.js";
+import { EventPipeline } from "./events/pipeline.js";
+import { startEventServer } from "./events/server.js";
+import { EventStore } from "./events/store.js";
 import { createFeishuGateway } from "./feishu/gateway.js";
 import { createFeishuMessagePipeline } from "./feishu/message-pipeline.js";
 import { startOutcomeServer } from "./outcome/server.js";
@@ -34,6 +39,9 @@ export async function runBeacon(configPath) {
     const runtimeEnvironment = await loadRuntimeEnvironment(global.runtimeEnvironmentPath);
     const profiles = await loadProfileRegistry(global.profilesDirectory);
     const credentials = await Promise.all(profiles.map((profile) => loadFeishuCredentials(profile.id, global.secretsPath)));
+    const eventProducers = global.events
+        ? await loadEventCredentials(global.events.credentialsPath)
+        : [];
     const outcomes = await startOutcomeServer();
     const queue = new RunQueue(global.runs.maxConcurrent, global.runs.maxQueued);
     let dashboard;
@@ -54,10 +62,16 @@ export async function runBeacon(configPath) {
         console.error(`[beacon] dashboard failed to listen http://${global.dashboard.listen}:${String(global.dashboard.port)}: ${message}; continuing without dashboard`);
     }
     const shutdown = shutdownController();
+    let firstFatal;
     let rejectFatal;
-    const fatal = new Promise((_resolve, reject) => {
-        rejectFatal = reject;
+    const fatal = new Promise((resolve) => {
+        rejectFatal = (error) => {
+            firstFatal ??= error;
+            resolve(error);
+        };
     });
+    let eventServer;
+    let eventPipeline;
     const messagePipelines = [];
     const loops = [];
     const contexts = profiles.map((profile, index) => {
@@ -89,33 +103,73 @@ export async function runBeacon(configPath) {
         });
         const loop = new ScheduleLoop(profile, reconciler, rejectFatal);
         loops.push(loop);
-        return { profile, messagePipeline, orchestrator, reconciler };
-    });
-    await Promise.all(contexts.map((context) => context.orchestrator.recover()));
-    const reconciliationTime = new Date();
-    await Promise.all(contexts.map((context) => context.reconciler.reconcile(reconciliationTime)));
-    for (const loop of loops)
-        loop.start(reconciliationTime);
-    const gateways = contexts.map(({ profile, messagePipeline }) => {
-        console.log(`[beacon] starting Profile id=${profile.id} runtime=${profile.runtime} provider=${profile.model.provider} model=${profile.model.id}`);
-        return messagePipeline.run(shutdown.promise);
+        return { profile, store, messagePipeline, orchestrator, reconciler };
     });
+    let gateways = [];
+    const failures = [];
     try {
-        await Promise.race([shutdown.promise, fatal, ...gateways]);
+        await Promise.all(contexts.map((context) => context.orchestrator.recover()));
+        const reconciliationTime = new Date();
+        await Promise.all(contexts.map((context) => context.reconciler.reconcile(reconciliationTime)));
+        if (global.events) {
+            const store = new EventStore(join(global.homeDirectory, "state", "events"));
+            eventPipeline = new EventPipeline({
+                store,
+                contexts,
+                maxPending: global.events.maxPending,
+                onFatal: rejectFatal,
+            });
+            eventServer = await startEventServer({
+                ...global.events,
+                producers: eventProducers,
+                pipeline: eventPipeline,
+                store,
+                onFatal: rejectFatal,
+            });
+            eventPipeline.wake();
+            console.log(`[beacon] events listening http://${global.events.listen}:${eventServer.port} (authenticated)`);
+        }
+        for (const loop of loops)
+            loop.start(reconciliationTime);
+        gateways = contexts.map(({ profile, messagePipeline }) => {
+            console.log(`[beacon] starting Profile id=${profile.id} runtime=${profile.runtime} provider=${profile.model.provider} model=${profile.model.id}`);
+            return messagePipeline.run(shutdown.promise);
+        });
+        const result = await Promise.race([shutdown.promise, fatal, ...gateways]);
+        if (result instanceof Error)
+            throw result;
+    }
+    catch (error) {
+        failures.push(error);
     }
     finally {
         shutdown.resolve();
         for (const loop of loops)
             loop.stop();
+        // Stop HTTP intake, finish current event execution, leave the rest durable.
+        const stoppedEvents = await Promise.allSettled([
+            eventServer?.close() ?? Promise.resolve(),
+            eventPipeline?.close() ?? Promise.resolve(),
+        ]);
         await Promise.allSettled(gateways);
-        await Promise.allSettled([
+        const drained = await Promise.allSettled([
             ...messagePipelines.map((pipeline) => pipeline.drain()),
             ...loops.map((loop) => loop.drain()),
         ]);
         shutdown.close();
-        await Promise.allSettled([
+        const closed = await Promise.allSettled([
             dashboard?.close() ?? Promise.resolve(),
             outcomes.close(),
         ]);
+        for (const result of [...stoppedEvents, ...drained, ...closed]) {
+            if (result.status === "rejected" && !failures.includes(result.reason))
+                failures.push(result.reason);
+        }
     }
+    if (firstFatal && !failures.includes(firstFatal))
+        failures.push(firstFatal);
+    if (failures.length === 1)
+        throw failures[0];
+    if (failures.length > 1)
+        throw new AggregateError(failures, "Beacon service failed");
 }

package/dist/state/trigger-store.js

@@ -1,8 +1,9 @@
 import { createHash, randomUUID } from "node:crypto";
-import { chmod, mkdir, open, readdir, readFile, rename, } from "node:fs/promises";
+import { chmod, mkdir, open, readdir, readFile, rename, rm, } from "node:fs/promises";
 import { basename, dirname, isAbsolute, join } from "node:path";
 import { z } from "zod";
 import { failureCodes, } from "../domain/types.js";
+import { cloudEventSchema } from "../events/cloudevent.js";
 import { feedbackRecordSchema, finalOutcomeContentSchema, parseFinalOutcomeContent, } from "../outcome/content.js";
 const timestamp = z.string().datetime({ offset: true });
 const failureSchema = z
@@ -23,6 +24,7 @@ const messageSchema = z
 })
     .strict();
 const inputSchema = z.discriminatedUnion("kind", [
+    z.object({ kind: z.literal("event"), event: cloudEventSchema }).strict(),
     z
         .object({
         kind: z.literal("feishu_message"),
@@ -137,10 +139,9 @@ function validateRecord(value) {
         throw new Error("Run record must contain both Pi sessionId and sessionPath or neither");
     }
     if (record.run?.sessionId &&
-        (record.run.sessionId !== record.run.runId ||
-            basename(record.run.sessionPath) !== record.run.runId ||
+        (basename(record.run.sessionPath) !== record.run.sessionId ||
             basename(dirname(record.run.sessionPath)) !== record.profileId)) {
-        throw new Error("Run Pi session identity must map to its Profile ID and Run ID");
+        throw new Error("Run Pi session path must map to its Profile ID and session ID");
     }
     if (record.delivery && !record.finalOutcome) {
         throw new Error("Trigger record with Delivery must contain a Final Outcome");
@@ -202,21 +203,14 @@ export class TriggerStore {
             });
         }
     }
-    async readConcurrentClaim(triggerKey) {
-        for (let attempt = 0; attempt < 100; attempt += 1) {
-            try {
-                return await this.read(triggerKey);
-            }
-            catch (error) {
-                const cause = error instanceof Error
-                    ? error.cause
-                    : undefined;
-                if (cause?.code !== "ENOENT")
-                    throw error;
-                await new Promise((resolve) => setTimeout(resolve, 5));
-            }
+    async syncDirectory(directory) {
+        const handle = await open(directory, "r");
+        try {
+            await handle.sync();
+        }
+        finally {
+            await handle.close();
         }
-        return this.read(triggerKey);
     }
     async write(triggerKey, record) {
         const validated = validateRecord(record);
@@ -231,13 +225,7 @@ export class TriggerStore {
             await handle.close();
         }
         await rename(temporary, this.recordPath(triggerKey));
-        const directoryHandle = await open(directory, "r");
-        try {
-            await directoryHandle.sync();
-        }
-        finally {
-            await directoryHandle.close();
-        }
+        await this.syncDirectory(directory);
     }
     async claim(request) {
         if (request.sourceKey.length < 2 ||
@@ -247,18 +235,6 @@ export class TriggerStore {
         await this.prepare();
         const triggerKey = keyFor(this.profileId, request.sourceKey);
         const directory = join(this.root, triggerKey);
-        try {
-            await mkdir(directory, { mode: 0o700 });
-        }
-        catch (error) {
-            if (error.code === "EEXIST") {
-                return {
-                    created: false,
-                    record: await this.readConcurrentClaim(triggerKey),
-                };
-            }
-            throw new Error(`Cannot claim Trigger ${triggerKey}`, { cause: error });
-        }
         const record = {
             version: 1,
             triggerKey,
@@ -268,10 +244,37 @@ export class TriggerStore {
             acceptedAt: (request.acceptedAt ?? new Date()).toISOString(),
             target: request.target,
             ...(request.notifyTarget ? { notifyTarget: request.notifyTarget } : {}),
+            ...(request.input ? { input: request.input } : {}),
             ...(request.ingress ? { ingress: request.ingress } : {}),
         };
-        await this.write(triggerKey, record);
-        return { created: true, record };
+        const temporaryKey = `.claim-${randomUUID()}`;
+        const temporaryDirectory = join(this.root, temporaryKey);
+        await mkdir(temporaryDirectory, { mode: 0o700 });
+        try {
+            // Publish only after the complete record and its directory are durable.
+            // POSIX rename may replace a legacy empty claim directory, but cannot
+            // replace a populated winner from another concurrent claimant.
+            await this.write(temporaryKey, record);
+            try {
+                await rename(temporaryDirectory, directory);
+            }
+            catch (error) {
+                const code = error.code;
+                if (code !== "EEXIST" && code !== "ENOTEMPTY") {
+                    throw new Error(`Cannot publish Trigger ${triggerKey}`, {
+                        cause: error,
+                    });
+                }
+                const existing = await this.read(triggerKey);
+                await this.syncDirectory(this.root);
+                return { created: false, record: existing };
+            }
+            await this.syncDirectory(this.root);
+            return { created: true, record };
+        }
+        finally {
+            await rm(temporaryDirectory, { recursive: true, force: true });
+        }
     }
     async update(triggerKey, transform) {
         const current = await this.read(triggerKey);
@@ -286,9 +289,30 @@ export class TriggerStore {
         await this.prepare();
         const entries = await readdir(this.root, { withFileTypes: true });
         const records = await Promise.all(entries
-            .filter((entry) => entry.isDirectory())
+            .filter((entry) => entry.isDirectory() && !/^\.claim-[0-9a-f-]{36}$/.test(entry.name))
             .map((entry) => this.read(entry.name)));
         return records.sort((left, right) => left.acceptedAt.localeCompare(right.acceptedAt) ||
             left.triggerId.localeCompare(right.triggerId));
     }
+    /**
+     * Locate the Trigger whose reply or notify Delivery produced this Feishu
+     * outbound `message_id`. Newest accepted Trigger wins on collision.
+     */
+    async findByDeliveredMessageId(messageId) {
+        const trimmed = messageId.trim();
+        if (!trimmed)
+            return undefined;
+        const records = await this.list();
+        for (let index = records.length - 1; index >= 0; index -= 1) {
+            const record = records[index];
+            for (const field of ["delivery", "notifyDelivery"]) {
+                const delivery = record[field];
+                if (delivery?.state === "delivered" &&
+                    delivery.providerRequestId === trimmed) {
+                    return record;
+                }
+            }
+        }
+        return undefined;
+    }
 }

package/examples/config.yaml

@@ -15,3 +15,11 @@ dashboard:
   enabled: true
   listen: 0.0.0.0
   port: 46183
+# Opt in after creating a private event-credentials.json; see README.
+events:
+  enabled: false
+  listen: 127.0.0.1
+  port: 46184
+  max_body_bytes: 262144
+  max_pending: 1000
+  credentials_file: event-credentials.json

package/examples/event-credentials.json.example

@@ -0,0 +1,10 @@
+{
+  "version": 1,
+  "producers": [
+    {
+      "id": "deployment-system",
+      "token": "REPLACE_WITH_A_UNIQUE_RANDOM_TOKEN_AT_LEAST_32_CHARACTERS",
+      "sources": ["https://deploy.example.com/production"]
+    }
+  ]
+}

package/examples/profiles/example/profile.yaml

@@ -12,3 +12,11 @@ schedules:
     input: Prepare the weekday brief.
     notify:
       chat_id: REPLACE_WITH_GROUP_CHAT_ID
+# Optional external event subscription. Both lists use exact matches.
+# listener:
+#   sources:
+#     - https://deploy.example.com/production
+#   types:
+#     - com.example.deployment.completed.v1
+#   notify:
+#     chat_id: REPLACE_WITH_GROUP_CHAT_ID

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nettee/beacon",
-  "version": "0.2.9",
+  "version": "0.3.1",
   "description": "A single-host bridge from messaging and schedules to isolated agent runs",
   "license": "Apache-2.0",
   "repository": {