@cydm/happy-elves 0.1.0-beta.306 → 0.1.0-beta.308

package/apps/cli/dist/commands/gateway.js

@@ -118,6 +118,25 @@ export async function handleGateway({ domain, action, positional, flags }) {
         ok("gateway.test", result);
         return true;
     }
+    if (action === "notify") {
+        const config = await readConfig(flags);
+        const client = new ControllerClient(config);
+        const machineId = await resolveGatewayMachineId(client, flags);
+        const channelId = gatewayChannelId(flags, positional[0], "lark");
+        const externalConversationId = requireString(flags, "conversation");
+        const externalMessageId = typeof flags["message-id"] === "string" ? flags["message-id"] : `notify_${Date.now()}`;
+        const text = requireString(flags, "text");
+        const result = await client.gateway({
+            machineId,
+            action: "notify",
+            channelId,
+            externalConversationId,
+            externalMessageId,
+            text,
+        });
+        ok("gateway.notify", result);
+        return true;
+    }
     if (action === "serve") {
         const config = await readConfig(flags);
         const port = Number(typeof flags.port === "string" ? flags.port : "8789");

package/apps/cli/dist/commands/lib/usage.js

@@ -119,6 +119,7 @@ session stars, recent sessions, pinned workspaces, and current project defaults.
   happy-elves gateway disable [<channelId>] [--machine <machineId>] --json
   happy-elves gateway status [--machine <machineId>] [--include-debug] [--json]
   happy-elves gateway test [<channelId>] [--machine <machineId>] --conversation <externalConversationId> --message-id <externalMessageId> --text <prompt> --json
+  happy-elves gateway notify [<channelId>] [--machine <machineId>] --conversation <externalConversationId> [--message-id <id>] --text <message> --json
   happy-elves gateway serve [--host 127.0.0.1] [--port 8789] --json  # debug only
 
 Gateway v1 official Feishu/Lark path is daemon-backed SDK long connection.
@@ -253,6 +254,7 @@ Core commands:
   gateway status --json
   gateway enable --channel fake --machine <machineId> --cwd <cwd> --json  # debug only
   gateway test --conversation <id> --message-id <id> --text <prompt> --json
+  gateway notify --conversation <id> --text <message> --json
 
   memory save --project <key> --text <fact> --json
   memory search --project <key> --query <prompt> --json

package/apps/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cydm/happy-elves-cli",
-  "version": "0.1.0-beta.306",
+  "version": "0.1.0-beta.308",
   "private": true,
   "type": "module"
 }

package/apps/daemon/dist/gateway/handler.js

@@ -1,6 +1,6 @@
 import { decryptJson } from "../../../../packages/shared/dist/index.js";
 import { claimCommandRequest, sendCommandResponse } from "../relay/send.js";
-import { deliverGatewayMessage, publicChannelsForStore, setGatewayLastError, syncGatewayRuntime } from "./runtime.js";
+import { deliverGatewayMessage, notifyGatewayConversation, publicChannelsForStore, setGatewayLastError, syncGatewayRuntime } from "./runtime.js";
 import { readGatewayStore, updateGatewayStore, upsertGatewayChannel } from "./store.js";
 export async function handleGatewayCommand(ws, config, command) {
     if (!claimCommandRequest(ws, command.requestId))
@@ -86,6 +86,32 @@ async function executeGatewayCommand(config, command) {
             throw error;
         }
     }
+    if (command.action === "notify") {
+        const store = await readGatewayStore();
+        const channel = requireChannel(store, command.channelId);
+        if (!channel.enabled)
+            throw new Error("Gateway channel is disabled");
+        if (!command.externalConversationId || !command.externalMessageId || !command.text) {
+            throw new Error("gateway notify requires externalConversationId, externalMessageId, and text");
+        }
+        try {
+            const delivery = await notifyGatewayConversation(channel, {
+                externalConversationId: command.externalConversationId,
+                externalMessageId: command.externalMessageId,
+                text: command.text,
+            });
+            const nextStore = await readGatewayStore();
+            return {
+                action: "notify",
+                channel: publicChannelsForStore(nextStore).find((item) => item.id === channel.id),
+                delivery,
+            };
+        }
+        catch (error) {
+            await setGatewayLastError(channel.id, error);
+            throw error;
+        }
+    }
     throw new Error(`Unsupported gateway action: ${command.action}`);
 }
 async function decryptGatewayChannelInput(config, input) {

package/apps/daemon/dist/gateway/runtime.d.ts

@@ -22,6 +22,11 @@ export declare function startGatewayRuntime(config: DaemonConfig): Promise<void>
 export declare function stopGatewayRuntime(): Promise<void>;
 export declare function syncGatewayRuntime(config?: DaemonConfig | undefined): Promise<void>;
 export declare function deliverGatewayMessage(config: DaemonConfig, channel: GatewayChannelConfig, message: GatewayInboundMessage): Promise<GatewayDeliveryResult>;
+export declare function notifyGatewayConversation(channel: GatewayChannelConfig, input: {
+    externalConversationId: string;
+    externalMessageId: string;
+    text: string;
+}): Promise<GatewayDeliveryResult>;
 export declare function handleGatewayTurnTerminal(config: DaemonConfig, input: GatewayTerminalInput): Promise<void>;
 export declare function setGatewayLastError(channelId: string, error: unknown): Promise<void>;
 export declare function publicChannelsForStore(store: GatewayStore): import("../../../../packages/shared/dist/index.js").GatewayChannelPublic[];

package/apps/daemon/dist/gateway/runtime.js

@@ -229,6 +229,58 @@ export async function deliverGatewayMessage(config, channel, message) {
         senderDisplayName: message.senderDisplayName,
     });
 }
+export async function notifyGatewayConversation(channel, input) {
+    if (!channel.enabled)
+        throw gatewayError("Gateway channel is disabled", "GATEWAY_DISABLED", 400);
+    const adapter = gatewayAdapters.get(channel.id)?.adapter;
+    if (!adapter)
+        throw gatewayError("Gateway adapter is not listening", "GATEWAY_NOT_LISTENING", 503);
+    const destination = destinationFromGatewayConversationId(input.externalConversationId);
+    const deliveryId = stableGatewayId("gw_notify", channel.id, input.externalConversationId, input.externalMessageId);
+    const result = await adapter.send({
+        deliveryId,
+        destination,
+        payload: {
+            type: "notice",
+            title: "Happy Elves",
+            text: input.text,
+            severity: "info",
+        },
+    });
+    const repliedAt = new Date().toISOString();
+    const lastReplied = {
+        externalConversationId: input.externalConversationId,
+        externalMessageId: input.externalMessageId,
+        deliveryId,
+        platformMessageId: result.platformMessageId,
+        at: repliedAt,
+    };
+    await updateGatewayStore((current) => ({
+        ...current,
+        channels: current.channels.map((item) => item.id === channel.id
+            ? { ...item, lastError: undefined, lastReplied, updatedAt: repliedAt }
+            : item),
+        replyHistory: [
+            {
+                channelId: channel.id,
+                externalConversationId: input.externalConversationId,
+                externalMessageId: input.externalMessageId,
+                deliveryId,
+                platformMessageId: result.platformMessageId,
+                repliedAt,
+            },
+            ...current.replyHistory.filter((item) => !(item.channelId === channel.id && item.deliveryId === deliveryId)),
+        ].slice(0, gatewayReplyHistoryLimit),
+    }));
+    return {
+        channelId: channel.id,
+        externalConversationId: input.externalConversationId,
+        externalMessageId: input.externalMessageId,
+        deliveryId,
+        platformMessageId: result.platformMessageId,
+        dispatch: "delivered",
+    };
+}
 export async function handleGatewayTurnTerminal(config, input) {
     await deliverPendingGatewayReply(config, input);
     await drainGatewayQueue(config, input.sessionId);
@@ -240,16 +292,17 @@ async function admitGatewayPromptWithMappingRecovery(config, channel, mapping, i
     catch (error) {
         if (!canRecoverGatewayMapping(channel, error))
             throw error;
-        const recovered = await recoverGatewayMapping(config, channel, mapping, input.externalConversationId);
+        const recovered = await recoverGatewayMapping(config, channel, mapping, input.externalConversationId, input.requestId);
         return await admitGatewayPromptNow(config, channel, {
             ...input,
             sessionId: recovered.sessionId,
         });
     }
 }
-async function recoverGatewayMapping(config, channel, staleMapping, externalConversationId) {
-    const createRequestId = stableGatewayId("gw_create", channel.id, externalConversationId);
-    const mapping = await createGatewayMapping(config, channel, externalConversationId, createRequestId);
+async function recoverGatewayMapping(config, channel, staleMapping, externalConversationId, recoverySeed) {
+    const createRequestId = stableGatewayId("gw_create", channel.id, externalConversationId, "recover", recoverySeed);
+    const sessionId = stableGatewayId("ses_gw", channel.id, externalConversationId, "recover", recoverySeed);
+    const mapping = await createGatewayMapping(config, channel, externalConversationId, createRequestId, sessionId);
     if (mapping.sessionId === staleMapping.sessionId)
         return mapping;
     const now = new Date().toISOString();
@@ -266,9 +319,9 @@ function canRecoverGatewayMapping(channel, error) {
         return false;
     if (!channel.targetCwd)
         return false;
-    return errorCode(error) === "SESSION_NOT_FOUND";
+    return errorCode(error) === "SESSION_NOT_FOUND" || errorCode(error) === "SESSION_CLOSED";
 }
-async function createGatewayMapping(config, channel, externalConversationId, createRequestId) {
+async function createGatewayMapping(config, channel, externalConversationId, createRequestId, recoveredSessionId) {
     if (channel.targetSessionId) {
         const now = new Date().toISOString();
         const mapping = {
@@ -287,7 +340,7 @@ async function createGatewayMapping(config, channel, externalConversationId, cre
     }
     if (!channel.targetCwd)
         throw gatewayError("Gateway channel needs target cwd or target session", "GATEWAY_TARGET_MISSING", 400);
-    const sessionId = stableGatewayId("ses_gw", channel.id, externalConversationId);
+    const sessionId = recoveredSessionId ?? stableGatewayId("ses_gw", channel.id, externalConversationId);
     const create = await admitMachineCreateSession(config, {
         requestId: createRequestId,
         sessionId,
@@ -629,6 +682,16 @@ function gatewayConversationId(destination) {
         return `${destination.platformChatId}:thread:${destination.contextKey}`;
     return `${destination.platformChatId}:main`;
 }
+function destinationFromGatewayConversationId(externalConversationId) {
+    const threadMatch = /^(.+):thread:(.+)$/.exec(externalConversationId);
+    if (threadMatch) {
+        return { platformChatId: threadMatch[1], contextKind: "thread", contextKey: threadMatch[2] };
+    }
+    const mainMatch = /^(.+):main$/.exec(externalConversationId);
+    if (mainMatch)
+        return { platformChatId: mainMatch[1], contextKind: "main" };
+    throw gatewayError("Gateway notify requires a conversation id like <chatId>:main or <chatId>:thread:<threadId>", "GATEWAY_CONVERSATION_INVALID", 400);
+}
 function gatewayAdapterKey(channel) {
     return JSON.stringify({
         type: channel.type,

package/apps/daemon/dist/gateway/store.d.ts

@@ -70,9 +70,9 @@ type GatewayReplyHistory = {
     channelId: string;
     externalConversationId: string;
     externalMessageId: string;
-    sessionId: string;
-    requestId: string;
-    turnId: string;
+    sessionId?: string;
+    requestId?: string;
+    turnId?: string;
     deliveryId: string;
     platformMessageId?: string;
     repliedAt: string;

package/apps/daemon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cydm/happy-elves-daemon",
-  "version": "0.1.0-beta.306",
+  "version": "0.1.0-beta.308",
   "private": true,
   "type": "module"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cydm/happy-elves",
-  "version": "0.1.0-beta.306",
+  "version": "0.1.0-beta.308",
   "description": "Remote controller for local coding agents with hosted or self-hosted relay support.",
   "type": "module",
   "bin": {

package/packages/client/dist/types.d.ts

@@ -297,7 +297,7 @@ export type MachineDevExecInput = {
 };
 export type GatewayCommandInput = {
     machineId: string;
-    action: "list" | "get" | "upsert" | "enable" | "disable" | "test";
+    action: "list" | "get" | "upsert" | "enable" | "disable" | "test" | "notify";
     channelId?: string;
     channel?: GatewayChannelInput;
     externalConversationId?: string;

package/packages/shared/dist/protocol-schemas.d.ts

@@ -552,9 +552,11 @@ export declare const gatewayDeliveryResultSchema: z.ZodObject<{
     channelId: z.ZodString;
     externalConversationId: z.ZodString;
     externalMessageId: z.ZodString;
-    sessionId: z.ZodString;
-    requestId: z.ZodString;
-    turnId: z.ZodString;
+    sessionId: z.ZodOptional<z.ZodString>;
+    requestId: z.ZodOptional<z.ZodString>;
+    turnId: z.ZodOptional<z.ZodString>;
+    deliveryId: z.ZodOptional<z.ZodString>;
+    platformMessageId: z.ZodOptional<z.ZodString>;
     admission: z.ZodOptional<z.ZodEnum<{
         accepted: "accepted";
         replayed: "replayed";
@@ -574,6 +576,7 @@ export declare const gatewayCommandResultSchema: z.ZodObject<{
         enable: "enable";
         disable: "disable";
         test: "test";
+        notify: "notify";
     }>;
     channels: z.ZodOptional<z.ZodArray<z.ZodObject<{
         id: z.ZodString;
@@ -727,9 +730,11 @@ export declare const gatewayCommandResultSchema: z.ZodObject<{
         channelId: z.ZodString;
         externalConversationId: z.ZodString;
         externalMessageId: z.ZodString;
-        sessionId: z.ZodString;
-        requestId: z.ZodString;
-        turnId: z.ZodString;
+        sessionId: z.ZodOptional<z.ZodString>;
+        requestId: z.ZodOptional<z.ZodString>;
+        turnId: z.ZodOptional<z.ZodString>;
+        deliveryId: z.ZodOptional<z.ZodString>;
+        platformMessageId: z.ZodOptional<z.ZodString>;
         admission: z.ZodOptional<z.ZodEnum<{
             accepted: "accepted";
             replayed: "replayed";

package/packages/shared/dist/protocol-schemas.js

@@ -281,16 +281,18 @@ export const gatewayDeliveryResultSchema = z.object({
     channelId: z.string().min(1),
     externalConversationId: z.string().min(1),
     externalMessageId: z.string().min(1),
-    sessionId: z.string().min(1),
-    requestId: z.string().min(1),
-    turnId: z.string().min(1),
+    sessionId: z.string().min(1).optional(),
+    requestId: z.string().min(1).optional(),
+    turnId: z.string().min(1).optional(),
+    deliveryId: z.string().min(1).optional(),
+    platformMessageId: z.string().min(1).optional(),
     admission: z.enum(["accepted", "replayed"]).optional(),
     dispatch: z.enum(["queued", "delivered"]).optional(),
     queued: z.boolean().optional(),
     duplicate: z.boolean().optional(),
 });
 export const gatewayCommandResultSchema = z.object({
-    action: z.enum(["list", "get", "upsert", "enable", "disable", "test"]),
+    action: z.enum(["list", "get", "upsert", "enable", "disable", "test", "notify"]),
     channels: z.array(gatewayChannelPublicSchema).optional(),
     channel: gatewayChannelPublicSchema.optional(),
     delivery: gatewayDeliveryResultSchema.optional(),

package/packages/shared/dist/protocol-types.d.ts

@@ -295,16 +295,18 @@ export type GatewayDeliveryResult = {
     channelId: string;
     externalConversationId: string;
     externalMessageId: string;
-    sessionId: string;
-    requestId: string;
-    turnId: string;
+    sessionId?: string;
+    requestId?: string;
+    turnId?: string;
+    deliveryId?: string;
+    platformMessageId?: string;
     admission?: "accepted" | "replayed";
     dispatch?: "queued" | "delivered";
     queued?: boolean;
     duplicate?: boolean;
 };
 export type GatewayCommandResult = {
-    action: "list" | "get" | "upsert" | "enable" | "disable" | "test";
+    action: "list" | "get" | "upsert" | "enable" | "disable" | "test" | "notify";
     channels?: GatewayChannelPublic[];
     channel?: GatewayChannelPublic;
     delivery?: GatewayDeliveryResult;

package/packages/shared/dist/protocol.d.ts

@@ -85,7 +85,7 @@ export type ControllerClientMessage = {
     type: "controller:gateway";
     requestId: string;
     machineId: string;
-    action: "list" | "get" | "upsert" | "enable" | "disable" | "test";
+    action: "list" | "get" | "upsert" | "enable" | "disable" | "test" | "notify";
     channelId?: string;
     channel?: GatewayChannelInput;
     externalConversationId?: string;
@@ -398,7 +398,7 @@ export type MachineCommand = {
     type: "machine:gateway";
     requestId: string;
     machineId: string;
-    action: "list" | "get" | "upsert" | "enable" | "disable" | "test";
+    action: "list" | "get" | "upsert" | "enable" | "disable" | "test" | "notify";
     channelId?: string;
     channel?: GatewayChannelInput;
     externalConversationId?: string;

package/packages/shared/dist/protocol.js

@@ -97,7 +97,7 @@ const controllerMessageSchema = z.discriminatedUnion("type", [
         type: z.literal("controller:gateway"),
         requestId: z.string().min(1),
         machineId: z.string().min(1),
-        action: z.enum(["list", "get", "upsert", "enable", "disable", "test"]),
+        action: z.enum(["list", "get", "upsert", "enable", "disable", "test", "notify"]),
         channelId: z.string().min(1).optional(),
         channel: gatewayChannelInputSchema.optional(),
         externalConversationId: z.string().min(1).optional(),
@@ -473,7 +473,7 @@ const machineCommandSchema = z.discriminatedUnion("type", [
         type: z.literal("machine:gateway"),
         requestId: z.string().min(1),
         machineId: z.string().min(1),
-        action: z.enum(["list", "get", "upsert", "enable", "disable", "test"]),
+        action: z.enum(["list", "get", "upsert", "enable", "disable", "test", "notify"]),
         channelId: z.string().min(1).optional(),
         channel: gatewayChannelInputSchema.optional(),
         externalConversationId: z.string().min(1).optional(),