@messenger-agent/messenger-agent 0.24.0-alpha.2 → 0.24.0-alpha.3

package/dist/app.js

@@ -1,17 +1 @@
-import { Hono } from "hono";
-import { logger as honoLogger } from "hono/logger";
-import { agentAuthMiddleware } from "@messenger-agent/shared/agent-auth";
-import { createAgentFileRoutes } from "@messenger-agent/shared/agent-files";
-import { logger } from "@messenger-agent/shared/logger";
-import { createAgentWorkspaceRoutes } from "@messenger-agent/shared/workspace-routes";
-import { appConfig } from "./config.js";
-export function createApp(config = appConfig) {
-    const app = new Hono();
-    app.use(honoLogger((message, ...rest) => logger.info(message, ...rest)));
-    app.get("/health", (c) => c.json({ status: "ok", role: "messenger-agent" }));
-    app.use("/*", agentAuthMiddleware(config.authTokens));
-    app.route("/v1/files", createAgentFileRoutes());
-    app.route("/v1/workspaces", createAgentWorkspaceRoutes({ config, textMaxBytes: config.textMaxBytes }));
-    return app;
-}
-export default createApp();
+import{Hono as s}from"hono";import{logger as a}from"hono/logger";import{agentAuthMiddleware as p}from"@messenger-agent/shared/agent-auth";import{createAgentFileRoutes as m}from"@messenger-agent/shared/agent-files";import{logger as n}from"@messenger-agent/shared/logger";import{createAgentWorkspaceRoutes as u}from"@messenger-agent/shared/workspace-routes";import{appConfig as g}from"./config.js";function i(t=g){const e=new s;return e.use(a((o,...r)=>n.info(o,...r))),e.get("/health",o=>o.json({status:"ok",role:"messenger-agent"})),e.use("/*",p(t.authTokens)),e.route("/v1/files",m()),e.route("/v1/workspaces",u({config:t,textMaxBytes:t.textMaxBytes})),e}var d=i();export{i as createApp,d as default};

package/dist/config.js

@@ -1,78 +1 @@
-import { existsSync, readFileSync } from "node:fs";
-import { parse } from "yaml";
-import { z } from "zod";
-import { normalizeOptional, parseAgentAuthConfig, parseAgentWorkspacesConfig, } from "@messenger-agent/shared/agent-config";
-import { DEFAULT_TEXT_MAX_BYTES } from "@messenger-agent/shared/workspace-files";
-import { logger, normalizeLogLevel, setLogFile, setLogLevel } from "@messenger-agent/shared/logger";
-const DEFAULT_TUNNEL_SERVER_URL = "wss://m.elevo.vip/agent-bridge/tunnel";
-const RawConfigSchema = z
-    .object({
-    log_level: z.string().optional(),
-    log_file: z.string().optional(),
-    port: z.coerce.number().int().positive().optional(),
-    messenger: z
-        .object({
-        port: z.coerce.number().int().positive().optional(),
-        log_file: z.string().optional(),
-    })
-        .optional(),
-    auth_tokens: z.record(z.string(), z.string()).optional(),
-    workspaces: z
-        .array(z.object({ id: z.string().optional(), name: z.string().optional(), path: z.string().optional() }))
-        .optional(),
-    workspace_file_text_max_bytes: z.coerce.number().int().positive().optional(),
-    tunnel: z
-        .object({
-        enabled: z.boolean().optional(),
-        server_url: z.string().optional(),
-        tunnel_id: z.string().optional(),
-        token: z.string().optional(),
-        reconnect_initial_ms: z.number().int().positive().optional(),
-        reconnect_max_ms: z.number().int().positive().optional(),
-        heartbeat_interval_ms: z.number().int().positive().optional(),
-    })
-        .optional(),
-})
-    .loose();
-export function loadMessengerAgentConfig(configPath = process.env.MESSENGER_AGENT_CONFIG_PATH ?? process.env.AGENT_CONFIG_PATH ?? "./agent-config.yaml") {
-    let parsedYaml = {};
-    if (existsSync(configPath)) {
-        try {
-            parsedYaml = parse(readFileSync(configPath, "utf8"));
-        }
-        catch (err) {
-            logger.error(`Failed to parse messenger-agent config at ${configPath}:`, err);
-        }
-    }
-    else {
-        logger.warn(`Messenger-agent config file not found at ${configPath}`);
-    }
-    const parsed = RawConfigSchema.safeParse(parsedYaml ?? {});
-    if (!parsed.success)
-        logger.error(`Invalid messenger-agent config at ${configPath}:`, parsed.error.issues);
-    const data = parsed.success ? parsed.data : {};
-    const logLevel = normalizeLogLevel(data.log_level);
-    const logFile = normalizeOptional(data.messenger?.log_file) ?? normalizeOptional(data.log_file);
-    const enabled = data.tunnel?.enabled ?? false;
-    setLogLevel(logLevel);
-    setLogFile(logFile);
-    return {
-        configPath,
-        logLevel,
-        logFile,
-        port: data.messenger?.port ?? data.port ?? 8301,
-        textMaxBytes: data.workspace_file_text_max_bytes ?? DEFAULT_TEXT_MAX_BYTES,
-        tunnel: {
-            enabled,
-            serverUrl: normalizeOptional(data.tunnel?.server_url) ?? (enabled ? DEFAULT_TUNNEL_SERVER_URL : undefined),
-            tunnelId: normalizeOptional(data.tunnel?.tunnel_id),
-            token: normalizeOptional(data.tunnel?.token),
-            reconnectInitialMs: data.tunnel?.reconnect_initial_ms ?? 1000,
-            reconnectMaxMs: data.tunnel?.reconnect_max_ms ?? 30000,
-            heartbeatIntervalMs: data.tunnel?.heartbeat_interval_ms ?? 30000,
-        },
-        ...parseAgentAuthConfig(data),
-        ...parseAgentWorkspacesConfig(data),
-    };
-}
-export const appConfig = loadMessengerAgentConfig();
+import{existsSync as g,readFileSync as _}from"node:fs";import{parse as m}from"yaml";import{z as e}from"zod";import{normalizeOptional as o,parseAgentAuthConfig as u,parseAgentWorkspacesConfig as f}from"@messenger-agent/shared/agent-config";import{DEFAULT_TEXT_MAX_BYTES as v}from"@messenger-agent/shared/workspace-files";import{logger as i,normalizeLogLevel as b,setLogFile as d,setLogLevel as x}from"@messenger-agent/shared/logger";const E="wss://m.elevo.vip/agent-bridge/tunnel",A=e.object({log_level:e.string().optional(),log_file:e.string().optional(),port:e.coerce.number().int().positive().optional(),messenger:e.object({port:e.coerce.number().int().positive().optional(),log_file:e.string().optional()}).optional(),auth_tokens:e.record(e.string(),e.string()).optional(),workspaces:e.array(e.object({id:e.string().optional(),name:e.string().optional(),path:e.string().optional()})).optional(),workspace_file_text_max_bytes:e.coerce.number().int().positive().optional(),tunnel:e.object({enabled:e.boolean().optional(),server_url:e.string().optional(),tunnel_id:e.string().optional(),token:e.string().optional(),reconnect_initial_ms:e.number().int().positive().optional(),reconnect_max_ms:e.number().int().positive().optional(),heartbeat_interval_ms:e.number().int().positive().optional()}).optional()}).loose();function L(t=process.env.MESSENGER_AGENT_CONFIG_PATH??process.env.AGENT_CONFIG_PATH??"./agent-config.yaml"){let s={};if(g(t))try{s=m(_(t,"utf8"))}catch(c){i.error(`Failed to parse messenger-agent config at ${t}:`,c)}else i.warn(`Messenger-agent config file not found at ${t}`);const r=A.safeParse(s??{});r.success||i.error(`Invalid messenger-agent config at ${t}:`,r.error.issues);const n=r.success?r.data:{},l=b(n.log_level),a=o(n.messenger?.log_file)??o(n.log_file),p=n.tunnel?.enabled??!1;return x(l),d(a),{configPath:t,logLevel:l,logFile:a,port:n.messenger?.port??n.port??8301,textMaxBytes:n.workspace_file_text_max_bytes??v,tunnel:{enabled:p,serverUrl:o(n.tunnel?.server_url)??(p?E:void 0),tunnelId:o(n.tunnel?.tunnel_id),token:o(n.tunnel?.token),reconnectInitialMs:n.tunnel?.reconnect_initial_ms??1e3,reconnectMaxMs:n.tunnel?.reconnect_max_ms??3e4,heartbeatIntervalMs:n.tunnel?.heartbeat_interval_ms??3e4},...u(n),...f(n)}}const N=L();export{N as appConfig,L as loadMessengerAgentConfig};

package/dist/index.js

@@ -1,18 +1,2 @@
 #!/usr/bin/env node
-import { serve } from "@hono/node-server";
-import app from "./app.js";
-import { appConfig } from "./config.js";
-import { WorkspaceTunnelClient } from "./tunnel-client.js";
-import { logger } from "@messenger-agent/shared/logger";
-const tunnelClient = appConfig.tunnel.enabled ? new WorkspaceTunnelClient(appConfig) : undefined;
-if (tunnelClient) {
-    tunnelClient.start().catch((err) => logger.error("[WorkspaceTunnel] stopped unexpectedly:", err));
-}
-else {
-    serve({ fetch: app.fetch, port: appConfig.port }, () => {
-        logger.info(`messenger-agent listening on http://0.0.0.0:${appConfig.port}`);
-    });
-}
-const stop = () => tunnelClient?.stop();
-process.once("SIGINT", stop);
-process.once("SIGTERM", stop);
+import{serve as p}from"@hono/node-server";import s from"./app.js";import{appConfig as e}from"./config.js";import{WorkspaceTunnelClient as i}from"./tunnel-client.js";import{logger as n}from"@messenger-agent/shared/logger";const o=e.tunnel.enabled?new i(e):void 0;o?o.start().catch(r=>n.error("[WorkspaceTunnel] stopped unexpectedly:",r)):p({fetch:s.fetch,port:e.port},()=>{n.info(`messenger-agent listening on http://0.0.0.0:${e.port}`)});const t=()=>o?.stop();process.once("SIGINT",t),process.once("SIGTERM",t);

package/dist/tunnel-client.js

@@ -1,159 +1 @@
-import { createRequire } from "node:module";
-import WebSocket from "ws";
-import { logger } from "@messenger-agent/shared/logger";
-import { createAgentFileRoutes } from "@messenger-agent/shared/agent-files";
-import { createPrefixedRouteRequest, createWorkspaceRouteRequest, isAgentFileHttpTunnelRequest, isWorkspaceHttpTunnelRequest, sendHttpTunnelResponse, } from "@messenger-agent/shared/tunnel-http";
-import { CODING_AGENT_TUNNEL_DUPLICATE_CLOSE_CODE, CODING_AGENT_TUNNEL_PROTOCOL_VERSION, } from "@messenger-agent/shared/tunnel-protocol";
-import { createAgentWorkspaceRoutes } from "@messenger-agent/shared/workspace-routes";
-import { appConfig } from "./config.js";
-const clientVersion = createRequire(import.meta.url)("../package.json").version;
-const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-function parseServerMessage(raw) {
-    try {
-        const value = JSON.parse(raw.toString());
-        return value && typeof value === "object" && "type" in value ? value : undefined;
-    }
-    catch {
-        return undefined;
-    }
-}
-export class WorkspaceTunnelClient {
-    config;
-    stopped = false;
-    socket;
-    running = new Map();
-    workspaceRoutes;
-    fileRoutes = createAgentFileRoutes();
-    constructor(config = appConfig) {
-        this.config = config;
-        this.workspaceRoutes = createAgentWorkspaceRoutes({ config, textMaxBytes: config.textMaxBytes });
-    }
-    async start() {
-        if (!this.config.tunnel.enabled)
-            return;
-        if (!this.config.tunnel.serverUrl || !this.config.tunnel.tunnelId || !this.config.tunnel.token) {
-            throw new Error("Workspace tunnel requires server_url, tunnel_id, and token when enabled");
-        }
-        let backoffMs = this.config.tunnel.reconnectInitialMs;
-        while (!this.stopped) {
-            try {
-                await this.connectOnce();
-                backoffMs = this.config.tunnel.reconnectInitialMs;
-            }
-            catch (err) {
-                if (!this.stopped)
-                    logger.warn("[WorkspaceTunnel] connection failed:", err);
-            }
-            if (!this.stopped) {
-                await delay(backoffMs);
-                backoffMs = Math.min(backoffMs * 2, this.config.tunnel.reconnectMaxMs);
-            }
-        }
-    }
-    stop() {
-        this.stopped = true;
-        for (const controller of this.running.values())
-            controller.abort();
-        this.running.clear();
-        this.socket?.close();
-    }
-    connectOnce() {
-        return new Promise((resolve, reject) => {
-            const ws = new WebSocket(this.config.tunnel.serverUrl, {
-                headers: { Authorization: `Bearer ${this.config.tunnel.token}` },
-            });
-            this.socket = ws;
-            let heartbeatTimer;
-            let settled = false;
-            const cleanup = () => {
-                if (heartbeatTimer)
-                    clearInterval(heartbeatTimer);
-                if (this.socket === ws)
-                    this.socket = undefined;
-                for (const controller of this.running.values())
-                    controller.abort(new Error("Workspace tunnel closed"));
-                this.running.clear();
-            };
-            ws.on("open", () => {
-                this.send({
-                    type: "hello",
-                    protocolVersion: CODING_AGENT_TUNNEL_PROTOCOL_VERSION,
-                    tunnelId: this.config.tunnel.tunnelId,
-                    agentType: "workspace",
-                    capabilities: ["workspace.files", "workspace.git", "workspace.tasks"],
-                    clientVersion,
-                    workspaces: [...this.config.workspaces.values()]
-                        .map(({ id, name }) => ({ id, name }))
-                        .sort((left, right) => left.id.localeCompare(right.id)),
-                });
-                heartbeatTimer = setInterval(() => this.send({ type: "heartbeat" }), this.config.tunnel.heartbeatIntervalMs);
-                logger.info(`[WorkspaceTunnel] connected to ${this.config.tunnel.serverUrl} as ${this.config.tunnel.tunnelId}`);
-            });
-            ws.on("message", (raw) => {
-                const message = parseServerMessage(raw);
-                if (!message || message.type === "heartbeat")
-                    return;
-                if (message.type === "cancel") {
-                    this.running.get(message.id)?.abort();
-                }
-                else if (message.type === "request") {
-                    void this.handleRequest(message);
-                }
-            });
-            ws.once("error", (err) => {
-                if (!settled) {
-                    settled = true;
-                    cleanup();
-                    reject(err);
-                }
-            });
-            ws.once("close", (code, reason) => {
-                cleanup();
-                if (code === CODING_AGENT_TUNNEL_DUPLICATE_CLOSE_CODE || code === 1008) {
-                    this.stopped = true;
-                    logger.warn(`[WorkspaceTunnel] connection rejected with code ${code}; reconnect disabled until service restart: ${reason.toString()}`);
-                }
-                if (!settled) {
-                    settled = true;
-                    resolve();
-                }
-            });
-        });
-    }
-    send(message) {
-        if (this.socket?.readyState === WebSocket.OPEN)
-            this.socket.send(JSON.stringify(message));
-    }
-    async handleRequest(message) {
-        const isFileRequest = isAgentFileHttpTunnelRequest(message);
-        if (!isFileRequest && !isWorkspaceHttpTunnelRequest(message)) {
-            this.send({
-                type: "response.error",
-                id: message.id,
-                code: "unsupported_request",
-                errorText: `Unsupported workspace tunnel request: ${message.method} ${message.path}`,
-            });
-            return;
-        }
-        const controller = new AbortController();
-        this.running.set(message.id, controller);
-        try {
-            const request = isFileRequest
-                ? createPrefixedRouteRequest(message, "/v1/files", controller.signal)
-                : createWorkspaceRouteRequest(message, controller.signal);
-            const response = await (isFileRequest ? this.fileRoutes : this.workspaceRoutes).fetch(request);
-            await sendHttpTunnelResponse(message.id, response, (responseMessage) => this.send(responseMessage));
-        }
-        catch (err) {
-            this.send({
-                type: "response.error",
-                id: message.id,
-                code: "request_failed",
-                errorText: err instanceof Error ? err.message : "Workspace tunnel request failed",
-            });
-        }
-        finally {
-            this.running.delete(message.id);
-        }
-    }
-}
+import{createRequire as p}from"node:module";import u from"ws";import{logger as l}from"@messenger-agent/shared/logger";import{createAgentFileRoutes as f}from"@messenger-agent/shared/agent-files";import{createPrefixedRouteRequest as h,createWorkspaceRouteRequest as d,isAgentFileHttpTunnelRequest as k,isWorkspaceHttpTunnelRequest as g,sendHttpTunnelResponse as w}from"@messenger-agent/shared/tunnel-http";import{CODING_AGENT_TUNNEL_DUPLICATE_CLOSE_CODE as y,CODING_AGENT_TUNNEL_PROTOCOL_VERSION as R}from"@messenger-agent/shared/tunnel-protocol";import{createAgentWorkspaceRoutes as m}from"@messenger-agent/shared/workspace-routes";import{appConfig as T}from"./config.js";const v=p(import.meta.url)("../package.json").version,b=c=>new Promise(e=>setTimeout(e,c));function q(c){try{const e=JSON.parse(c.toString());return e&&typeof e=="object"&&"type"in e?e:void 0}catch{return}}class x{config;stopped=!1;socket;running=new Map;workspaceRoutes;fileRoutes=f();constructor(e=T){this.config=e,this.workspaceRoutes=m({config:e,textMaxBytes:e.textMaxBytes})}async start(){if(!this.config.tunnel.enabled)return;if(!this.config.tunnel.serverUrl||!this.config.tunnel.tunnelId||!this.config.tunnel.token)throw new Error("Workspace tunnel requires server_url, tunnel_id, and token when enabled");let e=this.config.tunnel.reconnectInitialMs;for(;!this.stopped;){try{await this.connectOnce(),e=this.config.tunnel.reconnectInitialMs}catch(o){this.stopped||l.warn("[WorkspaceTunnel] connection failed:",o)}this.stopped||(await b(e),e=Math.min(e*2,this.config.tunnel.reconnectMaxMs))}}stop(){this.stopped=!0;for(const e of this.running.values())e.abort();this.running.clear(),this.socket?.close()}connectOnce(){return new Promise((e,o)=>{const r=new u(this.config.tunnel.serverUrl,{headers:{Authorization:`Bearer ${this.config.tunnel.token}`}});this.socket=r;let s,i=!1;const a=()=>{s&&clearInterval(s),this.socket===r&&(this.socket=void 0);for(const t of this.running.values())t.abort(new Error("Workspace tunnel closed"));this.running.clear()};r.on("open",()=>{this.send({type:"hello",protocolVersion:R,tunnelId:this.config.tunnel.tunnelId,agentType:"workspace",capabilities:["workspace.files","workspace.git","workspace.tasks"],clientVersion:v,workspaces:[...this.config.workspaces.values()].map(({id:t,name:n})=>({id:t,name:n})).sort((t,n)=>t.id.localeCompare(n.id))}),s=setInterval(()=>this.send({type:"heartbeat"}),this.config.tunnel.heartbeatIntervalMs),l.info(`[WorkspaceTunnel] connected to ${this.config.tunnel.serverUrl} as ${this.config.tunnel.tunnelId}`)}),r.on("message",t=>{const n=q(t);!n||n.type==="heartbeat"||(n.type==="cancel"?this.running.get(n.id)?.abort():n.type==="request"&&this.handleRequest(n))}),r.once("error",t=>{i||(i=!0,a(),o(t))}),r.once("close",(t,n)=>{a(),(t===y||t===1008)&&(this.stopped=!0,l.warn(`[WorkspaceTunnel] connection rejected with code ${t}; reconnect disabled until service restart: ${n.toString()}`)),i||(i=!0,e())})})}send(e){this.socket?.readyState===u.OPEN&&this.socket.send(JSON.stringify(e))}async handleRequest(e){const o=k(e);if(!o&&!g(e)){this.send({type:"response.error",id:e.id,code:"unsupported_request",errorText:`Unsupported workspace tunnel request: ${e.method} ${e.path}`});return}const r=new AbortController;this.running.set(e.id,r);try{const s=o?h(e,"/v1/files",r.signal):d(e,r.signal),i=await(o?this.fileRoutes:this.workspaceRoutes).fetch(s);await w(e.id,i,a=>this.send(a))}catch(s){this.send({type:"response.error",id:e.id,code:"request_failed",errorText:s instanceof Error?s.message:"Workspace tunnel request failed"})}finally{this.running.delete(e.id)}}}export{x as WorkspaceTunnelClient};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@messenger-agent/messenger-agent",
-  "version": "0.24.0-alpha.2",
+  "version": "0.24.0-alpha.3",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,7 +20,7 @@
     "ws": "^8.18.3",
     "yaml": "^2.9.0",
     "zod": "^4.4.3",
-    "@messenger-agent/shared": "0.24.0-alpha.2"
+    "@messenger-agent/shared": "0.24.0-alpha.3"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"