pi-courier 0.1.32 → 0.1.34

package/README.md

@@ -96,6 +96,7 @@ Matrix homeserver URL (如 https://matrix.example.com):   ← 输入,如 https:/
 pi 工作目录 [默认 /home/you/Projects]:                   ← Enter 或输入其他目录
 实例名/机器名 [默认 debian]:                             ← distinguish multiple deployments; shown in the management room name
 启用多工程模式? [y/N]:                                   ← default N = single-project (one bot ↔ one pi); y = multi-project (management + project rooms)
+启用空间组织? [Y/n]:                                     ← only asked with multi-project; fresh configs default Y — all bot-created rooms are grouped into one Element space (see below)
 
 ✅ 配置已写入 ~/.pi/pi-courier.json
    账号: @test3:...
@@ -190,7 +191,8 @@ You are now a trusted user (the first trusted user also becomes admin). Any user
 
 One bot account can serve multiple projects — each project gets its own private room (named after the project), its own pi process, working directory and conversation history.
 
-- **Management room = the first accepted private room**: the first room where the bot **successfully accepts (authorizes) a message** — a non-project, ≤2-person room — becomes the management room. This works for both challenge-code pairing and config-driven trusted users. It's auto-renamed to `项目管理(<instance>)`, a guide is sent, and its room ID is persisted to `config.managementRooms`; afterwards purely **room-ID driven** (single, stable). The management room is the admin console — `/pmctl` works only there. If you have several private rooms, only the first one becomes it.
+- **Management room**: with the **space feature enabled** (fresh multi-project setups default to it), the bot **creates the management room itself at startup**, inside a private Element space `pi-courier · <instance>`, and invites all trusted users — no first DM needed. With the space off (or if its creation fails), the classic behavior applies: the first room where the bot **successfully accepts (authorizes) a message** — a non-project, ≤2-person room — becomes the management room (renamed to `项目管理(<instance>)`, guide sent, room ID persisted to `config.managementRooms`). Either way the room is the admin console — `/pmctl` works only there — and its ID is stable afterwards.
+- **Space organization (Element)**: a purely cosmetic grouping — a private space `pi-courier · <instanceName>` collects every room the bot creates (the management room and all `/pmctl new` project rooms) so they don't scatter across your room list. It never affects trust or permissions; `/pmctl rm` also removes the room from the space. Toggle it in `setup` (`启用空间组织?`, fresh configs default on, existing configs keep their current state); creation is lazy at the next start, and any failure just falls back to the unspace'd behavior with a warning and a retry on the next start. Users who pass the challenge later are invited into the space automatically (one invite per person, ever).
 - **Create a project** (in the management room):
   ```
   /pmctl new <name> [path]
@@ -205,7 +207,7 @@ One bot account can serve multiple projects — each project gets its own privat
   /pmctl rename <name> <new>  Rename (also renames the room)
   ```
   Legacy aliases still work: `/newproject`, `/projects`.
-- Manual setup is also possible: edit `pi-courier.json` and add a `projects` map:
+- Manual setup is also possible: edit `pi-courier.json` and add a `projects` map (config is loaded once at startup — restart the service after manual edits):
   ```json
   "projects": {
     "!roomid:server": { "workdir": "/home/you/Projects/myapp" }
@@ -293,6 +295,8 @@ A: The wizard-generated config. Example:
   "matrix": { "homeserverUrl": "https://matrix.example.com", "accessToken": "syt_...", "encryption": true },
   "auth": { "trustedUsers": ["matrix:@you:matrix.example.com"], "adminUserId": "matrix:@you:matrix.example.com" },
   "workdir": "/home/you/Projects",
+  "multiProject": true,
+  "space": { "enabled": true },
   "autoConnect": true,
   "debug": true
 }

package/README.zh-CN.md

@@ -96,6 +96,7 @@ Matrix homeserver URL (如 https://matrix.example.com):   ← 输入,如 https:/
 pi 工作目录 [默认 /home/你/Projects]:                    ← 回车或输入其他目录
 实例名/机器名 [默认 debian]:                             ← 多台部署用来区分;将显示在管理房间名
 启用多工程模式? [y/N]:                                   ← 默认 N=单工程(一个 bot 对应一个 pi);y=多工程(管理房间+项目房间)
+启用空间组织? [Y/n]:                                     ← 仅多工程时询问;全新配置默认 Y —— bot 创建的房间统一收纳进一个 Element 空间(见下文)
 
 ✅ 配置已写入 ~/.pi/pi-courier.json
    账号: @test3:...
@@ -124,7 +125,8 @@ pi 工作目录 [默认 /home/你/Projects]:                    ← 回车或输
 
 同一个 bot 账号可以服务多个项目 —— 每个项目一个私有房间(房间名=项目名),有独立的 pi 进程、工作目录和会话历史。
 
-- **管理房间 = 第一个被受理的私有房间**:bot **第一次成功受理(授权通过)的、非项目的私有/2 人房间**会固化为管理房间—— 无论是验证码配对还是配置预信任都适用。房间自动改名为 `项目管理(<实例名>)` 并发送使用说明,房间 ID 写入 `config.managementRooms`,之后完全由**房间 ID 驱动**(一个、稳定)。管理房间即"管理台":`/pmctl` 仅在此可用。若有多个私有房间,只有第一个能成为它。
+- **管理房间**:开启**空间组织**时(全新多工程配置默认开启),bot 在启动时**自行创建**管理房间 —— 位于私有空间 `pi-courier · <实例名>` 内,并邀请全部信任用户,无需先给 bot 发 DM。空间关闭(或创建失败)时沿用经典行为:bot **第一次成功受理(授权通过)的、非项目的私有/2 人房间**固化为管理房间(自动改名 `项目管理(<实例名>)` 并发送使用说明,房间 ID 写入 `config.managementRooms`)。两种路径下管理房间都是"管理台"(`/pmctl` 仅在此可用),且房间 ID 之后保持稳定。
+- **空间组织(Element)**:纯展示层收纳 —— 私有空间 `pi-courier · <实例名>` 收集 bot 创建的所有房间(管理房间 + `/pmctl new` 的项目房间),不再散落在房间列表里。**不影响信任模型与房间权限**;`/pmctl rm` 删除项目时同步把房间移出空间。开关在 `setup`(`启用空间组织?`,全新配置默认开、已有配置保持现状);空间在下次启动时懒创建,失败仅警告并回退无空间行为、下次启动自动重试。后续通过验证码成为信任用户的用户会被自动邀请进空间(每人只邀请一次)。
 - **创建项目**(在管理房间发):
   ```
   /pmctl new <项目名> [路径]
@@ -139,7 +141,7 @@ pi 工作目录 [默认 /home/你/Projects]:                    ← 回车或输
   /pmctl rename <名称> <新名>  重命名(同步改房间名)
   ```
   旧命令别名仍可用:`/newproject`、`/projects`。
-- **手动配置**也可以:直接编辑 `pi-courier.json` 加 `projects` 映射:
+- **手动配置**也可以:直接编辑 `pi-courier.json` 加 `projects` 映射(配置在启动时装载一次 —— 手动编辑后需重启服务生效):
   ```json
   "projects": {
     "!房间ID:服务器": { "workdir": "/home/你/Projects/myapp" }
@@ -290,6 +292,8 @@ A: 向导生成的配置,示例:
   "matrix": { "homeserverUrl": "https://matrix.example.com", "accessToken": "syt_...", "encryption": true },
   "auth": { "trustedUsers": ["matrix:@你:matrix.example.com"], "adminUserId": "matrix:@你:matrix.example.com" },
   "workdir": "/home/你/Projects",
+  "multiProject": true,
+  "space": { "enabled": true },
   "autoConnect": true,
   "debug": true
 }

package/dist/auth/admin-commands.d.ts

@@ -0,0 +1,52 @@
+/**
+ * Admin command handling for the auth engine (/trusted /revoke /channels
+ * /enable /disable /toggletools + challenge-code entry).
+ *
+ * Pure input → output: text + identity in, handled / replies /
+ * notifications / effects out. The engine's in-memory mutations happen
+ * through ChallengeAuth methods; persistence (auth snapshot, tool-call
+ * visibility) is returned as effects for the CALLER to apply through the
+ * injected config store — this module touches no disk and holds no state.
+ */
+import { type ChallengeAuth } from "./challenge-auth.js";
+export type AdminEffect = {
+    kind: "persistAuth";
+} | {
+    kind: "hideToolCalls";
+    value: boolean;
+}
+/** Trust was just granted to this user via a passed challenge — the caller
+ *  invites them into the organizational space (fire-once, best-effort). */
+ | {
+    kind: "spaceInvite";
+    userId: string;
+    transport?: string;
+};
+export interface AdminNotification {
+    message: string;
+    level: "info" | "warning";
+}
+export interface AdminCommandInput {
+    text: string;
+    userId: string;
+    transport?: string;
+    /** Current tool-call visibility (read by the caller before dispatch). */
+    hideToolCalls?: boolean;
+}
+export interface AdminCommandResult {
+    handled: boolean;
+    replies: string[];
+    notifications: AdminNotification[];
+    effects: AdminEffect[];
+}
+/** Admin command help — the auth-owned section of the unified /help output
+ *  (assembled by the command map; the management-room guide belongs to the
+ *  router and pi-command help to the command map). */
+export declare function adminCommandHelpText(): string;
+/**
+ * Handle bridge admin commands and challenge-code entry in DMs.
+ * Returns handled: false when the text is not an admin command and no
+ * challenge validation applies (the caller then continues its pipeline).
+ */
+export declare function handleAdminCommand(auth: ChallengeAuth, input: AdminCommandInput): AdminCommandResult;
+//# sourceMappingURL=admin-commands.d.ts.map

package/dist/auth/admin-commands.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"admin-commands.d.ts","sourceRoot":"","sources":["../../src/auth/admin-commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,KAAK,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAEvE,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE;AAC3C;2EAC2E;GACzE;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhE,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,yEAAyE;IACzE,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,aAAa,EAAE,iBAAiB,EAAE,CAAC;IACnC,OAAO,EAAE,WAAW,EAAE,CAAC;CACxB;AAMD;;sDAEsD;AACtD,wBAAgB,oBAAoB,IAAI,MAAM,CAK7C;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,iBAAiB,GAAG,kBAAkB,CAwIpG"}

package/dist/auth/admin-commands.js

@@ -0,0 +1,155 @@
+/**
+ * Admin command handling for the auth engine (/trusted /revoke /channels
+ * /enable /disable /toggletools + challenge-code entry).
+ *
+ * Pure input → output: text + identity in, handled / replies /
+ * notifications / effects out. The engine's in-memory mutations happen
+ * through ChallengeAuth methods; persistence (auth snapshot, tool-call
+ * visibility) is returned as effects for the CALLER to apply through the
+ * injected config store — this module touches no disk and holds no state.
+ */
+import { namespacedId } from "./challenge-auth.js";
+function handled(result) {
+    return { handled: true, ...result };
+}
+/** Admin command help — the auth-owned section of the unified /help output
+ *  (assembled by the command map; the management-room guide belongs to the
+ *  router and pi-command help to the command map). */
+export function adminCommandHelpText() {
+    return [
+        "**Bridge 管理命令**: `/help`(本帮助)、`/trusted`、`/revoke`、`/channels`、`/enable`、`/disable`、`/toggletools`",
+        "**认证**: 首次私聊 bot → bot 终端显示 6 位验证码 → 在聊天里输入验证码即成为信任用户(第一个信任用户 = 管理员)。群聊由信任用户在群里发 `/enable <模式>` 启用。",
+    ].join("\n");
+}
+/**
+ * Handle bridge admin commands and challenge-code entry in DMs.
+ * Returns handled: false when the text is not an admin command and no
+ * challenge validation applies (the caller then continues its pipeline).
+ */
+export function handleAdminCommand(auth, input) {
+    const namespacedUserId = namespacedId(input.userId, input.transport);
+    // Non-admin users: challenge-code entry (only when a challenge is active).
+    if (!auth.isTrustedUser(input.userId, input.transport)) {
+        if (/^\d{6}$/.test(input.text.trim())) {
+            const outcome = auth.validateChallengeCode(namespacedUserId, input.text.trim());
+            switch (outcome) {
+                case "authenticated":
+                    return handled({
+                        replies: ["✅ Authenticated! You can now chat with the agent."],
+                        notifications: [],
+                        effects: [
+                            { kind: "persistAuth" },
+                            { kind: "spaceInvite", userId: input.userId, transport: input.transport },
+                        ],
+                    });
+                case "expired":
+                    return handled({
+                        replies: ["⏱️ Challenge expired. Send any message to get a new code."],
+                        notifications: [],
+                        effects: [],
+                    });
+                case "blocked":
+                    return handled({
+                        replies: ["🚫 Too many failed attempts. Blocked for 5 minutes."],
+                        notifications: [],
+                        effects: [],
+                    });
+                case "wrong":
+                    return handled({
+                        replies: [`❌ Wrong code. ${auth.attemptsLeft(namespacedUserId)} attempts remaining.`],
+                        notifications: [],
+                        effects: [],
+                    });
+                default:
+                    return { handled: false, replies: [], notifications: [], effects: [] };
+            }
+        }
+        return { handled: false, replies: [], notifications: [], effects: [] };
+    }
+    // Admin commands
+    const parts = input.text.split(/\s+/);
+    const cmd = parts[0].toLowerCase();
+    switch (cmd) {
+        case "/enable": {
+            if (parts.length < 3) {
+                return handled({ replies: ["Usage: /enable <chatId> <all|mentions|trusted-only>"], notifications: [], effects: [] });
+            }
+            const mode = parts[2];
+            if (mode !== "all" && mode !== "mentions" && mode !== "trusted-only") {
+                return handled({ replies: ["Usage: /enable <chatId> <all|mentions|trusted-only>"], notifications: [], effects: [] });
+            }
+            auth.enableChannel(parts[1], mode);
+            return handled({
+                replies: [`✅ Channel ${parts[1]} enabled (mode: ${parts[2]})`],
+                notifications: [{ message: `Channel ${parts[1]} enabled (${parts[2]})`, level: "info" }],
+                effects: [{ kind: "persistAuth" }],
+            });
+        }
+        case "/disable": {
+            if (parts.length < 2) {
+                return handled({ replies: ["Usage: /disable <chatId>"], notifications: [], effects: [] });
+            }
+            auth.disableChannel(parts[1]);
+            return handled({
+                replies: [`❌ Channel ${parts[1]} disabled`],
+                notifications: [{ message: `Channel ${parts[1]} disabled`, level: "info" }],
+                effects: [{ kind: "persistAuth" }],
+            });
+        }
+        case "/channels": {
+            const channels = auth
+                .exportConfig()
+                .channels;
+            const lines = Object.entries(channels).map(([id, channel]) => `• ${id}: ${channel.enabled ? "✅" : "❌"} (${channel.mode})`);
+            return handled({ replies: [lines.join("\n") || "No channels configured"], notifications: [], effects: [] });
+        }
+        case "/trusted": {
+            const snapshot = auth.exportConfig();
+            const trusted = snapshot.trustedUsers
+                .map((id) => {
+                const [transport, uid] = id.split(":");
+                return uid ? `${uid} (${transport})` : id;
+            })
+                .join(", ");
+            return handled({
+                replies: [`Trusted users (${snapshot.trustedUsers.length}):\n${trusted || "None"}`],
+                notifications: [],
+                effects: [],
+            });
+        }
+        case "/toggletools": {
+            const next = !input.hideToolCalls;
+            return handled({
+                replies: [`🔧 Tool calls ${next ? "hidden" : "shown"} in remote messages`],
+                notifications: [],
+                effects: [{ kind: "hideToolCalls", value: next }],
+            });
+        }
+        case "/revoke": {
+            if (parts.length < 2) {
+                return handled({
+                    replies: ["Usage: /revoke <userId> or /revoke <transport:userId>"],
+                    notifications: [],
+                    effects: [],
+                });
+            }
+            const revokeId = parts[1];
+            const revoked = auth.revokeUser(revokeId);
+            if (revoked) {
+                return handled({
+                    replies: [`🔓 Revoked trust for ${revokeId}`],
+                    notifications: [{ message: `Revoked: ${revokeId}`, level: "warning" }],
+                    effects: [{ kind: "persistAuth" }],
+                });
+            }
+            return handled({
+                replies: [`❌ User ${revokeId} not found in trusted users`],
+                notifications: [],
+                effects: [],
+            });
+        }
+        default:
+            return { handled: false, replies: [], notifications: [], effects: [] };
+    }
+}
+//# sourceMappingURL=admin-commands.js.map

package/dist/auth/admin-commands.js.map

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

package/dist/auth/challenge-auth.d.ts

@@ -1,21 +1,31 @@
 /**
- * Challenge-based authentication for remote messengers
- * Ported from vscode-chonky-remote-pilot
+ * Challenge-based authentication strategy engine.
+ * Ported from vscode-chonky-remote-pilot.
+ *
+ * Pure strategy: authorization decisions, challenge lifecycle, channel modes
+ * and trust state — every method either reads state, mutates it in memory, or
+ * (for the challenge prompt) sends through the sender passed as a parameter.
+ * No persistence and no admin-command handling happens here: the caller
+ * applies persistence effects (see admin-commands.ts) through the injected
+ * config store.
  */
-/**
- * Manages authentication via 6-digit challenge codes and trusted users
+export type ChallengeOutcome = "authenticated" | "expired" | "wrong" | "blocked";
+/** Per-transport identity key (`transport:userId`) — the single namespacing
+ *  implementation for runtime identity: trust/admin lookups, challenge
+ *  storage and admin-command handling all key off it. (Config-storage
+ *  boundaries — the matrix env vars and setup — write the transport-prefixed
+ *  form directly; display-side splits are the inverse operation.)
  */
+export declare function namespacedId(userId: string, transport?: string): string;
 export declare class ChallengeAuth {
     private onShowCode;
     private onNotify;
-    private onSendMessage?;
-    private onSaveAuth?;
     private challenges;
     private trustedUsers;
     private channelAuth;
     private blockedUsers;
     private adminUserId?;
-    constructor(onShowCode: (code: string, username: string) => void, onNotify: (message: string, level?: "info" | "warning" | "error") => void, onSendMessage?: ((chatId: string, message: string) => Promise<void>) | undefined, onSaveAuth?: (() => void) | undefined);
+    constructor(onShowCode: (code: string, username: string) => void, onNotify: (message: string, level?: "info" | "warning" | "error") => void);
     /**
      * Initialize auth state from config
      */
@@ -39,44 +49,41 @@ export declare class ChallengeAuth {
         }>;
     };
     /**
-     * Check if a user is authorized to send messages
-     * Handles challenge creation, validation, and channel authorization
+     * Check if a user is authorized to send messages. Unknown DM users get a
+     * challenge; the prompt goes out through the sender passed here — the
+     * engine never stores a sender on itself.
      */
     checkAuthorization(userId: string, chatId: string, username: string, isGroupChat: boolean, wasMentioned: boolean, sendMessage?: (chatId: string, message: string) => Promise<void>, transport?: string): Promise<boolean>;
     /** Whether a user is in the trusted list (per transport). */
     isTrustedUser(userId: string, transport?: string): boolean;
+    /** Whether this user is the admin (namespaced comparison, per transport). */
+    isAdminUser(userId: string, transport?: string): boolean;
     /** Whether a group chat has been explicitly enabled by the admin. */
     isChannelEnabled(chatId: string): boolean;
-    /** Enable a group chat with a mode (used by /enable in the room itself). */
+    /** Enable a group chat with a mode (in-memory only; the caller persists). */
     enableChannel(chatId: string, mode: "all" | "mentions" | "trusted-only"): void;
+    /** Disable a group chat (in-memory only; the caller persists). */
+    disableChannel(chatId: string): void;
+    /** Revoke trust. Matching rule: full namespaced IDs (or exact entries)
+     *  match exactly; any other form — bare telegram IDs AND native MXIDs as
+     *  displayed by /trusted — matches the `:<id>` suffix of one entry.
+     *  Returns whether anything was revoked. */
+    revokeUser(revokeId: string): boolean;
     /**
-     * Initiate or validate a challenge
+     * Validate a challenge code. Mutates trust/blocked/challenge state and
+     * returns the outcome — the caller turns it into replies and persistence.
      */
-    private initiateChallenge;
+    validateChallengeCode(namespacedUserId: string, code: string): ChallengeOutcome | "none";
+    /** Attempts left on the active challenge (0 when none/blocked). */
+    attemptsLeft(namespacedUserId: string): number;
     /**
-     * Handle admin commands in DM
-     * Returns true if command was handled
+     * Initiate or re-check a challenge for a DM user. Returns false (the user
+     * is not yet authorized); the prompt is delivered via the sender argument.
      */
-    handleAdminCommand(text: string, _chatId: string, userId: string, sendMessage: (text: string) => Promise<void>, transport?: string): Promise<boolean>;
-    /**
-     * Validate a challenge code entered by the user
-     */
-    private validateChallenge;
+    private initiateChallenge;
     /**
      * Generate a random 6-digit code
      */
     private generateCode;
-    /**
-     * Get help text for admin commands
-     */
-    private getHelpText;
-    /**
-     * Get current stats with detailed user info
-     */
-    getStats(): {
-        trustedUsers: number;
-        channels: number;
-        usersByTransport: Record<string, string[]>;
-    };
 }
 //# sourceMappingURL=challenge-auth.d.ts.map

package/dist/auth/challenge-auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"challenge-auth.d.ts","sourceRoot":"","sources":["../../src/auth/challenge-auth.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAkBH;;GAEG;AACH,qBAAa,aAAa;IAQtB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,aAAa,CAAC;IACtB,OAAO,CAAC,UAAU,CAAC;IAVrB,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,WAAW,CAAkC;IACrD,OAAO,CAAC,YAAY,CAA6B;IACjD,OAAO,CAAC,WAAW,CAAC,CAAS;gBAGnB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,EACpD,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,KAAK,IAAI,EACzE,aAAa,CAAC,GAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,aAAA,EAClE,UAAU,CAAC,GAAE,MAAM,IAAI,aAAA;IAGjC;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE;QACrB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,OAAO,EAAE,OAAO,CAAC;YAAC,IAAI,EAAE,KAAK,GAAG,UAAU,GAAG,cAAc,CAAA;SAAE,CAAC,CAAC;KAC5F,GAAG,IAAI;IAYR;;OAEG;IACH,YAAY,IAAI;QACd,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,OAAO,EAAE,OAAO,CAAC;YAAC,IAAI,EAAE,KAAK,GAAG,UAAU,GAAG,cAAc,CAAA;SAAE,CAAC,CAAC;KAC3F;IAQD;;;OAGG;IACG,kBAAkB,CACtB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,OAAO,EACpB,YAAY,EAAE,OAAO,EACrB,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,EAChE,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC;IAyDnB,6DAA6D;IAC7D,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO;IAK1D,qEAAqE;IACrE,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIzC,4EAA4E;IAC5E,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,UAAU,GAAG,cAAc,GAAG,IAAI;IAK9E;;OAEG;YACW,iBAAiB;IAkD/B;;;OAGG;IACG,kBAAkB,CACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,EAC5C,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC;IAkHnB;;OAEG;YACW,iBAAiB;IAyC/B;;OAEG;IACH,OAAO,CAAC,YAAY;IAIpB;;OAEG;IACH,OAAO,CAAC,WAAW;IAyBnB;;OAEG;IACH,QAAQ,IAAI;QACV,YAAY,EAAE,MAAM,CAAC;QACrB,QAAQ,EAAE,MAAM,CAAC;QACjB,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;KAC5C;CAmBF"}
+{"version":3,"file":"challenge-auth.d.ts","sourceRoot":"","sources":["../../src/auth/challenge-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAgBH,MAAM,MAAM,gBAAgB,GAAG,eAAe,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;AAEjF;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAEvE;AAED,qBAAa,aAAa;IAQtB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,QAAQ;IARlB,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,WAAW,CAAkC;IACrD,OAAO,CAAC,YAAY,CAA6B;IACjD,OAAO,CAAC,WAAW,CAAC,CAAS;gBAGnB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,EACpD,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,KAAK,IAAI;IAGnF;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE;QACrB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,OAAO,EAAE,OAAO,CAAC;YAAC,IAAI,EAAE,KAAK,GAAG,UAAU,GAAG,cAAc,CAAA;SAAE,CAAC,CAAC;KAC5F,GAAG,IAAI;IAYR;;OAEG;IACH,YAAY,IAAI;QACd,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,OAAO,EAAE,OAAO,CAAC;YAAC,IAAI,EAAE,KAAK,GAAG,UAAU,GAAG,cAAc,CAAA;SAAE,CAAC,CAAC;KAC3F;IAQD;;;;OAIG;IACG,kBAAkB,CACtB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,OAAO,EACpB,YAAY,EAAE,OAAO,EACrB,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,EAChE,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC;IAgDnB,6DAA6D;IAC7D,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO;IAK1D,6EAA6E;IAC7E,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO;IAMxD,qEAAqE;IACrE,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIzC,6EAA6E;IAC7E,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,UAAU,GAAG,cAAc,GAAG,IAAI;IAI9E,kEAAkE;IAClE,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAIpC;;;gDAG4C;IAC5C,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAcrC;;;OAGG;IACH,qBAAqB,CAAC,gBAAgB,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,MAAM;IA8BxF,mEAAmE;IACnE,YAAY,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM;IAK9C;;;OAGG;YACW,iBAAiB;IAgD/B;;OAEG;IACH,OAAO,CAAC,YAAY;CAGrB"}