agents-bridge 0.1.0 → 0.1.1

package/dist/cli/cmd-start.js

@@ -1,13 +1,17 @@
 import { loadConfig } from '../config/config.js';
-import { ensureDataDirs } from '../config/agent-dirs.js';
+import { ensureDataDirs, ensureAgentStateDirs } from '../config/agent-dirs.js';
 import { createLogger } from '../logger.js';
 import { getAllChannels } from '../channels/registry.js';
 import { SessionManager } from '../channels/session.js';
-import { buildModelsConfig } from '../agents/models-config.js';
 import { LocalCliTurnExecutor } from '../agents/cli-runner.js';
-import { CliSessionStore } from '../agents/cli-session-store.js';
+import { CliSessionStore, makeAgentSessionKey } from '../agents/cli-session-store.js';
+import { resolveAgentConfigs } from '../agents/agent-resolver.js';
+import { resolveAgent } from '../agents/agent-router.js';
 import { cleanupPidFile, ensureNoRunningInstance, writePidFile } from './pid-file.js';
+import { normalizeBotlinkChannelConfigs, } from '../config/zod-schema.js';
 import { TypingLifecycle } from '../channels/typing-lifecycle.js';
+import { agentSessionStorePath } from '../config/paths.js';
+import { extractProvider, extractModel, isCliBackend } from '../agents/cli-backends.js';
 export async function cmdStart(args) {
     ensureNoRunningInstance();
     if (args.daemon) {
@@ -29,39 +33,56 @@ export async function cmdStart(args) {
     writePidFile(process.pid);
     try {
         const sessionManager = new SessionManager(logger);
-        const modelsConfig = buildModelsConfig(config.agents.defaults);
-        const cliExecutor = new LocalCliTurnExecutor({
-            config,
-            logger,
-            sessionStore: new CliSessionStore(),
-        });
+        // Resolve multi-agent configs
+        const { agents: resolvedAgents, defaultAgentId } = resolveAgentConfigs(config, logger);
+        ensureAgentStateDirs([...resolvedAgents.keys()], defaultAgentId);
+        logger.info({ agentCount: resolvedAgents.size, defaultAgentId, agents: [...resolvedAgents.keys()] }, 'Agents resolved');
+        // Per-agent session stores and executors
+        const sessionStores = new Map();
+        const cliExecutors = new Map();
+        for (const [agentId, agent] of resolvedAgents) {
+            const store = new CliSessionStore(agentSessionStorePath(agentId));
+            sessionStores.set(agentId, store);
+            cliExecutors.set(agentId, new LocalCliTurnExecutor({
+                config,
+                logger,
+                sessionStore: store,
+            }));
+        }
         const ctx = {
             logger,
             async dispatch(envelope) {
-                logger.info({ sessionId: envelope.sessionId, chatType: envelope.source.chatType }, 'Dispatching message');
+                const botlinkConfig = resolveBotlinkAccountConfig(config.channels.botlink, envelope);
+                // Route to agent
+                const agent = resolveAgent(envelope, config.bindings ?? [], resolvedAgents, defaultAgentId);
+                const agentSessionKey = makeAgentSessionKey(agent.id, envelope.sessionId);
+                logger.info({ sessionId: envelope.sessionId, agentId: agent.id, chatType: envelope.source.chatType }, 'Dispatching message');
                 sessionManager.getOrCreate(envelope);
-                const primaryModel = modelsConfig.chain[0];
-                if (!primaryModel) {
-                    logger.warn({ sessionId: envelope.sessionId }, 'No primary model configured');
-                    return;
-                }
-                if (primaryModel.mode !== 'cli') {
-                    logger.warn({ sessionId: envelope.sessionId, model: primaryModel.ref }, 'Primary API model runtime is not implemented yet');
-                    await sendBotlinkTextReply(config.channels.botlink, envelope, '当前仅支持 CLI 模式模型。');
+                const primaryModelRef = agent.model.primary;
+                const provider = extractProvider(primaryModelRef);
+                const model = extractModel(primaryModelRef);
+                if (!isCliBackend(primaryModelRef, agent.cliBackends)) {
+                    logger.warn({ sessionId: envelope.sessionId, agentId: agent.id, model: primaryModelRef }, 'Primary API model runtime is not implemented yet');
+                    await sendBotlinkTextReply(botlinkConfig, envelope, '当前仅支持 CLI 模式模型。');
                     return;
                 }
+                const cliExecutor = cliExecutors.get(agent.id);
                 let typing = null;
                 try {
-                    typing = new TypingLifecycle(() => sendBotlinkChatAction(config.channels.botlink, envelope, 'typing'), 4000, logger);
+                    typing = new TypingLifecycle(() => sendBotlinkChatAction(botlinkConfig, envelope, 'typing'), 4000, logger);
                     const result = await cliExecutor.run({
-                        envelope,
-                        provider: primaryModel.provider,
-                        model: primaryModel.model,
-                        workspaceDir: process.cwd(),
+                        envelope: { ...envelope, sessionId: agentSessionKey },
+                        provider,
+                        model: model || primaryModelRef,
+                        workspaceDir: agent.workspace,
                         timeoutMs: 15 * 60 * 1_000,
+                        systemPrompt: agent.systemPrompt,
+                        agentEnv: agent.env,
+                        agentClearEnv: agent.clearEnv,
+                        cliBackends: agent.cliBackends,
                         callbacks: {
                             onProcessing() {
-                                logger.info({ sessionId: envelope.sessionId, provider: primaryModel.provider }, 'CLI turn entered processing state');
+                                logger.info({ sessionId: envelope.sessionId, agentId: agent.id, provider }, 'CLI turn entered processing state');
                                 typing?.start();
                             },
                         },
@@ -69,6 +90,7 @@ export async function cmdStart(args) {
                     typing?.stop();
                     logger.info({
                         sessionId: envelope.sessionId,
+                        agentId: agent.id,
                         provider: result.provider,
                         model: result.model,
                         cliSessionId: result.cliSessionId,
@@ -77,16 +99,17 @@ export async function cmdStart(args) {
                     }, 'CLI turn completed');
                     logger.debug({ sessionId: envelope.sessionId, text: result.text }, 'CLI turn output');
                     const replyText = result.text.trim() || 'CLI 已执行完成，但没有返回可显示的文本内容。';
-                    await sendBotlinkTextReply(config.channels.botlink, envelope, replyText);
+                    await sendBotlinkTextReply(botlinkConfig, envelope, replyText);
                 }
                 catch (error) {
                     typing?.stop();
                     logger.error({
                         sessionId: envelope.sessionId,
-                        provider: primaryModel.provider,
+                        agentId: agent.id,
+                        provider,
                         err: error instanceof Error ? error.message : String(error),
                     }, 'CLI turn failed');
-                    await sendBotlinkTextReply(config.channels.botlink, envelope, `执行失败：${error instanceof Error ? error.message : String(error)}`);
+                    await sendBotlinkTextReply(botlinkConfig, envelope, `执行失败：${error instanceof Error ? error.message : String(error)}`);
                 }
                 finally {
                     typing?.stop();
@@ -152,4 +175,16 @@ async function postBotlinkMethod(botlink, method, payload) {
         throw new Error(`botlink ${method} failed: ${result.description ?? 'unknown error'}`);
     }
 }
+function resolveBotlinkAccountConfig(botlink, envelope) {
+    const accounts = normalizeBotlinkChannelConfigs(botlink);
+    const matched = accounts.find((entry) => entry.accountId === envelope.source.accountId);
+    if (matched) {
+        return matched.config;
+    }
+    const fallback = accounts.find((entry) => entry.accountId === 'default') ?? accounts[0];
+    if (!fallback) {
+        throw new Error('No botlink account config found for reply');
+    }
+    return fallback.config;
+}
 //# sourceMappingURL=cmd-start.js.map

package/dist/cli/cmd-start.js.map

@@ -1 +1 @@
-{"version":3,"file":"cmd-start.js","sourceRoot":"","sources":["../../src/cli/cmd-start.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cmd-start.js","sourceRoot":"","sources":["../../src/cli/cmd-start.ts"],"names":[],"mappings":"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"}

package/dist/config/agent-dirs.d.ts

@@ -6,7 +6,19 @@
  * │   ├── sessions/
  * │   ├── files/
  * │   └── logs/
+ * ├── agents/
+ * │   ├── {agentId}/
+ * │   │   └── cli-sessions.json
+ * │   └── ...
  * └── skills/
  */
 export declare function ensureDataDirs(tempDir?: string): void;
+/**
+ * Ensure per-agent state directories exist.
+ * Validates that no two agents share the same state directory.
+ *
+ * On first run, migrates the legacy
+ * ~/.agent-bridge/data/sessions/cli-sessions.json → agents/{defaultAgentId}/cli-sessions.json
+ */
+export declare function ensureAgentStateDirs(agentIds: string[], defaultAgentId: string): void;
 //# sourceMappingURL=agent-dirs.d.ts.map

package/dist/config/agent-dirs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-dirs.d.ts","sourceRoot":"","sources":["../../src/config/agent-dirs.ts"],"names":[],"mappings":"AAUA;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAgBrD"}
+{"version":3,"file":"agent-dirs.d.ts","sourceRoot":"","sources":["../../src/config/agent-dirs.ts"],"names":[],"mappings":"AAaA;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAgBrD;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,CAoBrF"}

package/dist/config/agent-dirs.js

@@ -1,6 +1,6 @@
-import { mkdirSync, existsSync } from 'node:fs';
+import { mkdirSync, existsSync, copyFileSync } from 'node:fs';
 import { resolve } from 'node:path';
-import { DATA_DIR, DATA_SESSIONS_DIR, DATA_FILES_DIR, DATA_LOGS_DIR, DATA_SKILLS_DIR, } from './paths.js';
+import { DATA_DIR, DATA_SESSIONS_DIR, DATA_CLI_SESSION_STORE_PATH, DATA_FILES_DIR, DATA_LOGS_DIR, DATA_SKILLS_DIR, agentStatePath, agentSessionStorePath, } from './paths.js';
 /**
  * Ensure data directories exist.
  *
@@ -9,6 +9,10 @@ import { DATA_DIR, DATA_SESSIONS_DIR, DATA_FILES_DIR, DATA_LOGS_DIR, DATA_SKILLS
  * │   ├── sessions/
  * │   ├── files/
  * │   └── logs/
+ * ├── agents/
+ * │   ├── {agentId}/
+ * │   │   └── cli-sessions.json
+ * │   └── ...
  * └── skills/
  */
 export function ensureDataDirs(tempDir) {
@@ -27,4 +31,41 @@ export function ensureDataDirs(tempDir) {
         }
     }
 }
+/**
+ * Ensure per-agent state directories exist.
+ * Validates that no two agents share the same state directory.
+ *
+ * On first run, migrates the legacy
+ * ~/.agent-bridge/data/sessions/cli-sessions.json → agents/{defaultAgentId}/cli-sessions.json
+ */
+export function ensureAgentStateDirs(agentIds, defaultAgentId) {
+    const seen = new Map();
+    for (const agentId of agentIds) {
+        const dir = resolve(agentStatePath(agentId));
+        const existing = seen.get(dir);
+        if (existing) {
+            throw new Error(`Agent state directory conflict: agents "${existing}" and "${agentId}" resolve to the same path: ${dir}`);
+        }
+        seen.set(dir, agentId);
+        if (!existsSync(dir)) {
+            mkdirSync(dir, { recursive: true });
+        }
+    }
+    // Migrate legacy session store to the default agent's directory
+    migrateLegacySessionStore(defaultAgentId);
+}
+/**
+ * If the legacy cli-sessions.json exists and the default agent's store doesn't,
+ * copy the legacy file into the default agent's state directory.
+ */
+function migrateLegacySessionStore(defaultAgentId) {
+    const legacyPath = resolve(DATA_CLI_SESSION_STORE_PATH);
+    if (!existsSync(legacyPath))
+        return;
+    const targetPath = resolve(agentSessionStorePath(defaultAgentId));
+    if (existsSync(targetPath))
+        return;
+    // Copy (not move) — keep legacy file as backup until confirmed working
+    copyFileSync(legacyPath, targetPath);
+}
 //# sourceMappingURL=agent-dirs.js.map

package/dist/config/agent-dirs.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-dirs.js","sourceRoot":"","sources":["../../src/config/agent-dirs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,eAAe,GAChB,MAAM,YAAY,CAAA;AAEnB;;;;;;;;;GASG;AACH,MAAM,UAAU,cAAc,CAAC,OAAgB;IAC7C,MAAM,IAAI,GAAG;QACX,QAAQ;QACR,iBAAiB;QACjB,cAAc;QACd,aAAa;QACb,eAAe;QACf,OAAO;KACR,CAAC,MAAM,CAAC,OAAO,CAAa,CAAA;IAE7B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;QAC7B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1B,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAC1C,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"agent-dirs.js","sourceRoot":"","sources":["../../src/config/agent-dirs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAc,YAAY,EAAE,MAAM,SAAS,CAAA;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,2BAA2B,EAC3B,cAAc,EACd,aAAa,EACb,eAAe,EACf,cAAc,EACd,qBAAqB,GACtB,MAAM,YAAY,CAAA;AAEnB;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,cAAc,CAAC,OAAgB;IAC7C,MAAM,IAAI,GAAG;QACX,QAAQ;QACR,iBAAiB;QACjB,cAAc;QACd,aAAa;QACb,eAAe;QACf,OAAO;KACR,CAAC,MAAM,CAAC,OAAO,CAAa,CAAA;IAE7B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;QAC7B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1B,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAC1C,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAC,QAAkB,EAAE,cAAsB;IAC7E,MAAM,IAAI,GAAG,IAAI,GAAG,EAAkB,CAAA;IAEtC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAA;QAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC9B,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CACb,2CAA2C,QAAQ,UAAU,OAAO,+BAA+B,GAAG,EAAE,CACzG,CAAA;QACH,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QAEtB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACrB,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QACrC,CAAC;IACH,CAAC;IAED,gEAAgE;IAChE,yBAAyB,CAAC,cAAc,CAAC,CAAA;AAC3C,CAAC;AAED;;;GAGG;AACH,SAAS,yBAAyB,CAAC,cAAsB;IACvD,MAAM,UAAU,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAA;IACvD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QAAE,OAAM;IAEnC,MAAM,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAC,CAAA;IACjE,IAAI,UAAU,CAAC,UAAU,CAAC;QAAE,OAAM;IAElC,uEAAuE;IACvE,YAAY,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;AACtC,CAAC"}

package/dist/config/config.js

@@ -14,8 +14,8 @@ export function loadConfig(configPath) {
     const paths = [
         configPath,
         env.configPath,
-        DATA_CONFIG_PATH,
         './config.json',
+        DATA_CONFIG_PATH,
     ].filter(Boolean);
     let rawConfig = {};
     for (const p of paths) {

package/dist/config/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,eAAe,EAAkB,MAAM,iBAAiB,CAAA;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE7C,MAAM,UAAU,UAAU,CAAC,UAAmB;IAC5C,MAAM,GAAG,GAAG,gBAAgB,EAAE,CAAA;IAE9B,YAAY;IACZ,mCAAmC;IACnC,gCAAgC;IAChC,2CAA2C;IAC3C,6BAA6B;IAC7B,MAAM,KAAK,GAAG;QACZ,UAAU;QACV,GAAG,CAAC,UAAU;QACd,gBAAgB;QAChB,eAAe;KAChB,CAAC,MAAM,CAAC,OAAO,CAAa,CAAA;IAE7B,IAAI,SAAS,GAA4B,EAAE,CAAA;IAE3C,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;QAC3B,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzB,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;YAC/C,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAA4B,CAAA;YAC1D,MAAK;QACP,CAAC;IACH,CAAC;IAED,uCAAuC;IACvC,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;IAE3C,MAAM,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAChD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM;aAC/B,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;aAC/C,IAAI,CAAC,IAAI,CAAC,CAAA;QACb,MAAM,IAAI,KAAK,CAAC,yBAAyB,MAAM,EAAE,CAAC,CAAA;IACpD,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,CAAA;AACpB,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,eAAe,EAAkB,MAAM,iBAAiB,CAAA;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE7C,MAAM,UAAU,UAAU,CAAC,UAAmB;IAC5C,MAAM,GAAG,GAAG,gBAAgB,EAAE,CAAA;IAE9B,YAAY;IACZ,mCAAmC;IACnC,gCAAgC;IAChC,2CAA2C;IAC3C,6BAA6B;IAC7B,MAAM,KAAK,GAAG;QACZ,UAAU;QACV,GAAG,CAAC,UAAU;QACd,eAAe;QACf,gBAAgB;KACjB,CAAC,MAAM,CAAC,OAAO,CAAa,CAAA;IAE7B,IAAI,SAAS,GAA4B,EAAE,CAAA;IAE3C,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;QAC3B,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzB,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;YAC/C,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAA4B,CAAA;YAC1D,MAAK;QACP,CAAC;IACH,CAAC;IAED,uCAAuC;IACvC,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;IAE3C,MAAM,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAChD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM;aAC/B,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;aAC/C,IAAI,CAAC,IAAI,CAAC,CAAA;QACb,MAAM,IAAI,KAAK,CAAC,yBAAyB,MAAM,EAAE,CAAC,CAAA;IACpD,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,CAAA;AACpB,CAAC"}

package/dist/config/merge-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-config.d.ts","sourceRoot":"","sources":["../../src/config/merge-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAEjD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA4BrG"}
+{"version":3,"file":"merge-config.d.ts","sourceRoot":"","sources":["../../src/config/merge-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAEjD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAqCrG"}

package/dist/config/merge-config.js

@@ -8,10 +8,22 @@ export function mergeWithEnv(raw, env) {
     if (env.gatewayUrl || env.botToken) {
         const channels = (merged.channels ?? {});
         const botlink = (channels.botlink ?? {});
-        if (env.gatewayUrl)
-            botlink.gateway_url = env.gatewayUrl;
-        if (env.botToken)
-            botlink.bot_token = env.botToken;
+        const botlinkAccounts = botlink.accounts;
+        if (botlinkAccounts && Object.keys(botlinkAccounts).length > 0) {
+            const defaultAccount = (botlinkAccounts.default ?? {});
+            if (env.gatewayUrl)
+                defaultAccount.gateway_url = env.gatewayUrl;
+            if (env.botToken)
+                defaultAccount.bot_token = env.botToken;
+            botlinkAccounts.default = defaultAccount;
+            botlink.accounts = botlinkAccounts;
+        }
+        else {
+            if (env.gatewayUrl)
+                botlink.gateway_url = env.gatewayUrl;
+            if (env.botToken)
+                botlink.bot_token = env.botToken;
+        }
         channels.botlink = botlink;
         merged.channels = channels;
     }

package/dist/config/merge-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-config.js","sourceRoot":"","sources":["../../src/config/merge-config.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,GAA4B,EAAE,GAAiB;IAC1E,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,CAAA;IAEnC,6BAA6B;IAC7B,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAA4B,CAAA;QACnE,MAAM,OAAO,GAAG,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,CAA4B,CAAA;QACnE,IAAI,GAAG,CAAC,UAAU;YAAE,OAAO,CAAC,WAAW,GAAG,GAAG,CAAC,UAAU,CAAA;QACxD,IAAI,GAAG,CAAC,QAAQ;YAAE,OAAO,CAAC,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAA;QAClD,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAA;QAC1B,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5B,CAAC;IAED,yBAAyB;IACzB,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;QACjB,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAA4B,CAAA;QACjE,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAA;QAC5B,MAAM,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAED,0BAA0B;IAC1B,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAA4B,CAAA;QAC7D,KAAK,CAAC,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAA;QAC5B,MAAM,CAAC,KAAK,GAAG,KAAK,CAAA;IACtB,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}
+{"version":3,"file":"merge-config.js","sourceRoot":"","sources":["../../src/config/merge-config.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,GAA4B,EAAE,GAAiB;IAC1E,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,CAAA;IAEnC,6BAA6B;IAC7B,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAA4B,CAAA;QACnE,MAAM,OAAO,GAAG,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,CAA4B,CAAA;QACnE,MAAM,eAAe,GAAG,OAAO,CAAC,QAA+D,CAAA;QAC/F,IAAI,eAAe,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/D,MAAM,cAAc,GAAG,CAAC,eAAe,CAAC,OAAO,IAAI,EAAE,CAA4B,CAAA;YACjF,IAAI,GAAG,CAAC,UAAU;gBAAE,cAAc,CAAC,WAAW,GAAG,GAAG,CAAC,UAAU,CAAA;YAC/D,IAAI,GAAG,CAAC,QAAQ;gBAAE,cAAc,CAAC,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAA;YACzD,eAAe,CAAC,OAAO,GAAG,cAAc,CAAA;YACxC,OAAO,CAAC,QAAQ,GAAG,eAAe,CAAA;QACpC,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,CAAC,UAAU;gBAAE,OAAO,CAAC,WAAW,GAAG,GAAG,CAAC,UAAU,CAAA;YACxD,IAAI,GAAG,CAAC,QAAQ;gBAAE,OAAO,CAAC,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAA;QACpD,CAAC;QACD,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAA;QAC1B,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5B,CAAC;IAED,yBAAyB;IACzB,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;QACjB,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAA4B,CAAA;QACjE,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAA;QAC5B,MAAM,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAED,0BAA0B;IAC1B,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAA4B,CAAA;QAC7D,KAAK,CAAC,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAA;QAC5B,MAAM,CAAC,KAAK,GAAG,KAAK,CAAA;IACtB,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}