@deepseek-harness-tui/dsh-tui 0.15.0 → 0.16.0

package/lib/types/components/sidePanel/companion/skins.js

@@ -16,7 +16,7 @@ import { existsSync, readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { join } from 'node:path';
 import { Box, Text, Image, useTerminalImages, useTerminalImageProtocol, useTerminalImageCellSize } from '../../../ui.js';
-import { WhaleArt, renderSpriteRows } from '../../Whale.js';
+import { WhaleArt, renderSpriteRows, renderCellRows } from '../../Whale.js';
 import { loadSharp } from '../../../dsh-adapter/sharp.js';
 import { DEEPY_CELLS, DEEPY_MOOD_ANIMATION, DEEPY_SEMANTIC_ANIMATION, frameAt, loadDeepyKit, loadWhaleGirlKit, renderedDeepyAnimation, } from './deepy.js';
 /** deepy 小鲸鱼（默认）：语义/心情 → 动画，elapsed → frameAt 确定性选帧。 */
@@ -122,14 +122,31 @@ export function resolveWhaleGirlAnimationKey(pose, animationSemantic, hasKey) {
  * 回归锁「全部帧内容 ⊆ [5, 5+31)」防素材更新后悄悄越窗被截。 */
 const WHALE_GIRL_LETTER_WINDOW_START = 5;
 const whaleGirlWindowCache = new Map();
-function renderedWhaleGirlWindowRows(kit, key) {
+function renderedWhaleGirlWindowRows(kit, key, imageBox) {
     const animation = kit.byKey[key];
     if (animation === undefined)
         return undefined;
-    const cacheKey = kit.id + ':window:' + key;
+    const cacheKey = kit.id + ':window:' + key + (imageBox === undefined ? '' : `:${imageBox.columns}x${imageBox.rows}`);
     let rendered = whaleGirlWindowCache.get(cacheKey);
     if (rendered === undefined) {
-        rendered = Object.freeze(animation.frames.map(frame => renderSpriteRows(frame.rows.map(row => row.slice(WHALE_GIRL_LETTER_WINDOW_START, WHALE_GIRL_LETTER_WINDOW_START + WHALE_GIRL_CELLS.columns)), kit.palette)));
+        rendered = Object.freeze(animation.frames.map(frame => {
+            if (imageBox === undefined)
+                return renderSpriteRows(frame.rows.map(row => row.slice(WHALE_GIRL_LETTER_WINDOW_START, WHALE_GIRL_LETTER_WINDOW_START + WHALE_GIRL_CELLS.columns)), kit.palette);
+            // 解码前/失败时整幅字母格 contain 进同一个槽，不裁掉头脚，也不换画跳高。
+            const pixelRows = imageBox.rows * 2;
+            const scale = Math.min(imageBox.columns / WHALE_GIRL_CELLS.columns, pixelRows / kit.rows);
+            const width = Math.max(1, Math.floor(WHALE_GIRL_CELLS.columns * scale));
+            const height = Math.max(1, Math.floor(kit.rows * scale));
+            const left = Math.floor((imageBox.columns - width) / 2);
+            const top = Math.floor((pixelRows - height) / 2);
+            return renderCellRows(imageBox.columns, pixelRows, (x, y) => {
+                if (x < left || x >= left + width || y < top || y >= top + height)
+                    return undefined;
+                const sx = Math.min(WHALE_GIRL_CELLS.columns - 1, Math.floor((x - left) * WHALE_GIRL_CELLS.columns / width));
+                const sy = Math.min(kit.rows - 1, Math.floor((y - top) * kit.rows / height));
+                return kit.palette[frame.rows[sy]?.[sx + WHALE_GIRL_LETTER_WINDOW_START] ?? '.'];
+            });
+        }));
         whaleGirlWindowCache.set(cacheKey, rendered);
     }
     return rendered;
@@ -146,14 +163,14 @@ function renderWhaleGirlLetterGrid(input) {
     const animationKey = resolveWhaleGirlAnimationKey(pose, animationSemantic, key => kit.byKey[key] !== undefined);
     if (animationKey === undefined)
         return DeepySkin.render({ ...input, width: WHALE_GIRL_CELLS.columns });
-    const rendered = renderedWhaleGirlWindowRows(kit, animationKey);
+    const rendered = renderedWhaleGirlWindowRows(kit, animationKey, input.imageBox);
     const animation = kit.byKey[animationKey];
     if (rendered === undefined || animation === undefined) {
         return DeepySkin.render({ ...input, width: WHALE_GIRL_CELLS.columns });
     }
     const frameIndex = frameAt(animation, now - moodSince);
     const rows = rendered[frameIndex] ?? rendered[0] ?? [];
-    return (_jsx(Box, { flexDirection: "column", flexShrink: 0, width: WHALE_GIRL_CELLS.columns, children: rows.map((row, index) => (_jsx(Text, { wrap: "truncate-end", children: row }, index))) }));
+    return (_jsx(Box, { flexDirection: "column", flexShrink: 0, width: input.imageBox?.columns ?? WHALE_GIRL_CELLS.columns, children: rows.map((row, index) => (_jsx(Text, { wrap: "truncate-end", children: row }, index))) }));
 }
 export const WhaleGirlSkin = {
     id: 'whaleGirl',
@@ -210,8 +227,25 @@ export function loadWhaleGirlImageKit() {
                 continue;
             const kit = parseWhaleGirlImageKit(JSON.parse(readFileSync(join(dir, 'timings.json'), 'utf8')), dir);
             if (kit !== undefined) {
-                whaleGirlImageKitCache = kit;
-                return kit;
+                const first = kit.byKey.idle?.frames[0];
+                let canvas;
+                if (first !== undefined) {
+                    try {
+                        const png = readFileSync(join(dir, 'idle', first.file));
+                        if (png.length >= 24 && png.subarray(0, 8).equals(Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]))
+                            && png.toString('ascii', 12, 16) === 'IHDR') {
+                            const width = png.readUInt32BE(16);
+                            const height = png.readUInt32BE(20);
+                            if (width > 0 && height > 0 && width <= 4096 && height <= 4096)
+                                canvas = { width, height };
+                        }
+                    }
+                    catch {
+                        // 缺失/坏帧仍走原来的异步解码失败与字母格回退。
+                    }
+                }
+                whaleGirlImageKitCache = { ...kit, ...(canvas === undefined ? {} : { canvas }) };
+                return whaleGirlImageKitCache;
             }
         }
         catch {
@@ -537,17 +571,28 @@ function WhaleGirlRasterSkin(input) {
             const frameRatio = source.width / source.height;
             // 盒宽=图宽（钳在 cells.columns 内；超宽像元比下 contain 收行不裁剪）。
             const rawColumns = Math.max(1, Math.round(cellRatio * WHALE_GIRL_CELLS.rows * frameRatio));
-            const columns = whaleGirlImageBoxColumns(cellSize, frameRatio);
-            const rows = rawColumns > columns
+            const columns = input.imageBox?.columns ?? whaleGirlImageBoxColumns(cellSize, frameRatio);
+            const rows = input.imageBox?.rows ?? (rawColumns > columns
                 ? Math.max(1, Math.round(columns / (cellRatio * frameRatio)))
-                : WHALE_GIRL_CELLS.rows;
+                : WHALE_GIRL_CELLS.rows);
             image = (_jsx(Image, { transparent: true, source: source, width: columns, height: rows, alt: "", presentation: "transcript", children: _jsx(Text, { children: Array.from({ length: rows }, () => ' '.repeat(columns)).join('\n') }) }));
         }
     }
     // 本次候选或上一帧；都没有（冷启动）时画字母格。切到还没解码的键时
     // 保持上一帧，不闪回字母格。
     const [visibleImage] = useHeldCommittedImage(image);
-    return (_jsx(Box, { ref: boxRef, flexDirection: "column", flexShrink: 0, alignItems: "center", justifyContent: "center", width: WHALE_GIRL_CELLS.columns, height: WHALE_GIRL_CELLS.rows, children: visibleImage !== undefined ? visibleImage : renderWhaleGirlLetterGrid(input) }));
+    let raster = visibleImage;
+    // 换键等待解码时保留旧像素，但 resize 后不能把旧的大 Image 盒塞进新小槽。
+    if (input.imageBox !== undefined && React.isValidElement(raster)
+        && (raster.props.width !== input.imageBox.columns || raster.props.height !== input.imageBox.rows)) {
+        const { columns, rows } = input.imageBox;
+        raster = React.cloneElement(raster, {
+            width: columns,
+            height: rows,
+            children: _jsx(Text, { children: Array.from({ length: rows }, () => ' '.repeat(columns)).join('\n') }),
+        });
+    }
+    return (_jsx(Box, { ref: boxRef, flexDirection: "column", flexShrink: 0, alignItems: "center", justifyContent: "center", width: input.imageBox?.columns ?? WHALE_GIRL_CELLS.columns, height: input.imageBox?.rows ?? WHALE_GIRL_CELLS.rows, children: raster !== undefined ? raster : renderWhaleGirlLetterGrid(input) }));
 }
 const WHALE_CELLS = Object.freeze({ columns: 40, rows: 13 });
 /** 现有像素鲸鱼：直接消费 nativeWhalePose（与开屏 splash 同一规划器、

package/lib/types/components/sidePanel/types.d.ts

@@ -74,6 +74,12 @@ export interface PanelEntry {
     /** 同 id 重注册时递增，用于重挂 error boundary。 */
     readonly registrationId: number;
     readonly badge: PanelBadge | null;
+    /**
+     * 面板自己广告的键位片段（底栏用）。`''` = 面板明确「此刻没有要广告的键」
+     * （底栏连能力位那一段也不画）；没设置过则由底栏按 capabilities 兜底。
+     * 层内状态（编辑层 vs 列表层）只有面板自己知道，所以由面板发、宿主只拼。
+     */
+    readonly hint?: string;
     readonly lastError: {
         readonly message: string;
         readonly at: number;

package/lib/types/components/sidePanel/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/components/sidePanel/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/components/sidePanel/types.ts"],"names":[],"mappings":"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"}

package/lib/types/components/splashArtRows.d.ts

@@ -0,0 +1,29 @@
+import type { Brand } from '../branding.js';
+/** 启动页立绘槽的占行：鲸鱼自然高度、portrait 的 minimal 等高盒、吉祥物的侧栏默认盒。 */
+export declare const WHALE_ART_ROWS = 13;
+export declare const PORTRAIT_ART_ROWS = 11;
+export declare const MASCOT_ART_ROWS = 15;
+export type SplashArtForm = 'whale' | 'portrait' | 'mascot';
+export interface SplashImageBox {
+    readonly columns: number;
+    readonly rows: number;
+}
+/** 与 LogoV2 的默认品牌及 mascot → portrait → whale 分支一致。 */
+export declare function resolveSplashArtForm(input: {
+    readonly brand: Brand | undefined;
+    readonly whaleGirl: boolean;
+    readonly mascotSkin: string | undefined;
+}): SplashArtForm;
+export declare function splashArtRows(form: SplashArtForm, imageBox?: SplashImageBox): number;
+/**
+ * 启动页图片按原生画布占位：只缩小、不预留放大后用不上的空间。
+ * 同一个稳定画布用于全部动画帧；不按 alpha 包围盒逐帧裁剪。
+ */
+export declare function fitSplashImageBox(source: {
+    readonly width: number;
+    readonly height: number;
+}, cell: {
+    readonly width: number;
+    readonly height: number;
+}, limit: SplashImageBox): SplashImageBox;
+//# sourceMappingURL=splashArtRows.d.ts.map

package/lib/types/components/splashArtRows.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"splashArtRows.d.ts","sourceRoot":"","sources":["../../../src/components/splashArtRows.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAE3C,yDAAyD;AACzD,eAAO,MAAM,cAAc,KAAK,CAAA;AAChC,eAAO,MAAM,iBAAiB,KAAK,CAAA;AACnC,eAAO,MAAM,eAAe,KAAK,CAAA;AAEjC,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,UAAU,GAAG,QAAQ,CAAA;AAC3D,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB;AAED,sDAAsD;AACtD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE;IAC1C,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,CAAA;IACjC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;CACxC,GAAG,aAAa,CAKhB;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,MAAM,CAIpF;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAC3D,IAAI,EAAE;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACzD,KAAK,EAAE,cAAc,GACpB,cAAc,CAMhB"}

package/lib/types/components/splashArtRows.js

@@ -0,0 +1,31 @@
+/** 启动页立绘槽的占行：鲸鱼自然高度、portrait 的 minimal 等高盒、吉祥物的侧栏默认盒。 */
+export const WHALE_ART_ROWS = 13;
+export const PORTRAIT_ART_ROWS = 11;
+export const MASCOT_ART_ROWS = 15;
+/** 与 LogoV2 的默认品牌及 mascot → portrait → whale 分支一致。 */
+export function resolveSplashArtForm(input) {
+    const brand = input.brand ?? 'deepseek';
+    if (brand === 'deepseek' && (input.mascotSkin === 'deepy' || input.mascotSkin === 'whaleGirl'))
+        return 'mascot';
+    if (input.whaleGirl || brand !== 'deepseek')
+        return 'portrait';
+    return 'whale';
+}
+export function splashArtRows(form, imageBox) {
+    if (form === 'whale')
+        return WHALE_ART_ROWS;
+    if (form === 'portrait')
+        return PORTRAIT_ART_ROWS;
+    return imageBox?.rows ?? MASCOT_ART_ROWS;
+}
+/**
+ * 启动页图片按原生画布占位：只缩小、不预留放大后用不上的空间。
+ * 同一个稳定画布用于全部动画帧；不按 alpha 包围盒逐帧裁剪。
+ */
+export function fitSplashImageBox(source, cell, limit) {
+    const scale = Math.min(1, limit.columns * cell.width / source.width, limit.rows * cell.height / source.height);
+    return {
+        columns: Math.max(1, Math.min(limit.columns, Math.ceil(source.width * scale / cell.width))),
+        rows: Math.max(1, Math.min(limit.rows, Math.ceil(source.height * scale / cell.height))),
+    };
+}

package/lib/types/components/teamRoster.d.ts

@@ -0,0 +1,70 @@
+/**
+ * Agent Teams in the agents surfaces (issue #1241, phase 2): fold the
+ * session's `TeamView` and its subagent rows into what the dashboard
+ * renders. A teammate is a continuable subagent of the Lead whose row id is
+ * the member id, so the two join by id; neither side overwrites the other's
+ * state (see `teamMemberStatus`). Pure: no I/O, no backend import.
+ */
+import type { TeamMember, TeamTask, TeamView } from '../adapter/ports/channel-view.js';
+import type { SubagentState } from '../dsh-adapter/subagents.js';
+/** A member's state as shown: durable `phase` first, then the run. `active`
+ *  is an active member whose run this session cannot see (a teammate's own
+ *  subagent rows never hold its siblings). */
+export type TeamMemberStatus = 'provisioning' | 'running' | 'idle' | 'active' | 'failed';
+/** One teammate, with its subagent row once the host has announced it. */
+export interface TeamMemberRow {
+    readonly member: TeamMember;
+    readonly subagent?: SubagentState;
+    readonly status: TeamMemberStatus;
+}
+export interface TeamDashboardModel {
+    readonly lead?: TeamMember;
+    /** Whether the session on screen is the Lead (its subagent rows are the teammates). */
+    readonly viewedFromLead: boolean;
+    readonly teammates: readonly TeamMemberRow[];
+    /** Subagent rows that are not team members (workflow / ralph spawns). */
+    readonly others: readonly SubagentState[];
+}
+/**
+ * A member's shown state. A failed `phase` is durable and wins; provisioning
+ * has no run yet. An active member is running only while its row runs: a
+ * finished turn leaves the member alive and waiting (a message wakes it),
+ * so a completed — or failed, or absent — run reads as idle, never done.
+ * @param member - Roster row.
+ * @param subagent - The member's subagent row, if any.
+ * @param runKnown - Whether the subagent rows are the Lead's (default).
+ * @returns the state to render.
+ */
+export declare function teamMemberStatus(member: TeamMember, subagent: SubagentState | undefined, runKnown?: boolean): TeamMemberStatus;
+/**
+ * Join the roster with the subagent rows.
+ * @param team - The session's team.
+ * @param subagents - The session's subagent rows.
+ * @param sessionId - The session on screen; inside a teammate its rows are
+ *   its own children, never joined with the roster.
+ * @returns the Lead, teammates in roster order, and the remaining rows.
+ */
+export declare function teamDashboardModel(team: TeamView, subagents: readonly SubagentState[], sessionId?: string): TeamDashboardModel;
+/**
+ * Teammates on the roster: those known to be running or provisioning, and
+ * those that may be running. Inside a teammate a sibling's run is not
+ * visible, so an active sibling is `unseen`; the teammate on screen itself
+ * counts in neither.
+ * @param team - The session's team.
+ * @param subagents - The session's subagent rows.
+ * @param sessionId - The session on screen.
+ * @returns the three counts.
+ */
+export declare function teamMemberCounts(team: TeamView, subagents: readonly SubagentState[], sessionId?: string): {
+    readonly total: number;
+    readonly active: number;
+    readonly unseen: number;
+};
+/** Completed / total of the task board. */
+export declare function teamTaskProgress(tasks: readonly TeamTask[]): {
+    readonly completed: number;
+    readonly total: number;
+};
+/** A pending task some blocker still holds back. */
+export declare function isTeamTaskBlocked(task: TeamTask): boolean;
+//# sourceMappingURL=teamRoster.d.ts.map

package/lib/types/components/teamRoster.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"teamRoster.d.ts","sourceRoot":"","sources":["../../../src/components/teamRoster.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAA;AACtF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAEhE;;8CAE8C;AAC9C,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAExF,0EAA0E;AAC1E,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAA;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAA;IACjC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAA;CAClC;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,CAAA;IAC1B,uFAAuF;IACvF,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAA;IAChC,QAAQ,CAAC,SAAS,EAAE,SAAS,aAAa,EAAE,CAAA;IAC5C,yEAAyE;IACzE,QAAQ,CAAC,MAAM,EAAE,SAAS,aAAa,EAAE,CAAA;CAC1C;AAED;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,GAAG,SAAS,EAAE,QAAQ,UAAO,GAAG,gBAAgB,CAK3H;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,aAAa,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,kBAAkB,CAmB9H;AAED;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,aAAa,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAQtL;AAED,2CAA2C;AAC3C,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,QAAQ,EAAE,GAAG;IAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAEnH;AAED,oDAAoD;AACpD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAEzD"}

package/lib/types/components/teamRoster.js

@@ -0,0 +1,78 @@
+/**
+ * A member's shown state. A failed `phase` is durable and wins; provisioning
+ * has no run yet. An active member is running only while its row runs: a
+ * finished turn leaves the member alive and waiting (a message wakes it),
+ * so a completed — or failed, or absent — run reads as idle, never done.
+ * @param member - Roster row.
+ * @param subagent - The member's subagent row, if any.
+ * @param runKnown - Whether the subagent rows are the Lead's (default).
+ * @returns the state to render.
+ */
+export function teamMemberStatus(member, subagent, runKnown = true) {
+    if (member.phase === 'failed')
+        return 'failed';
+    if (member.phase === 'provisioning')
+        return 'provisioning';
+    if (!runKnown)
+        return 'active';
+    return subagent?.status === 'running' || subagent?.status === 'starting' ? 'running' : 'idle';
+}
+/**
+ * Join the roster with the subagent rows.
+ * @param team - The session's team.
+ * @param subagents - The session's subagent rows.
+ * @param sessionId - The session on screen; inside a teammate its rows are
+ *   its own children, never joined with the roster.
+ * @returns the Lead, teammates in roster order, and the remaining rows.
+ */
+export function teamDashboardModel(team, subagents, sessionId) {
+    const viewedFromLead = sessionId === undefined || sessionId === team.leadSessionId;
+    const byId = new Map();
+    if (viewedFromLead)
+        for (const row of subagents)
+            byId.set(row.agentId, row);
+    const teammates = [];
+    const memberIds = new Set();
+    for (const member of team.members) {
+        if (member.role !== 'teammate')
+            continue;
+        const subagent = byId.get(member.id);
+        if (subagent !== undefined)
+            memberIds.add(member.id);
+        teammates.push({ member, status: teamMemberStatus(member, subagent, viewedFromLead), ...subagent === undefined ? {} : { subagent } });
+    }
+    const lead = team.members.find(member => member.role === 'lead');
+    return {
+        ...lead === undefined ? {} : { lead },
+        viewedFromLead,
+        teammates,
+        others: subagents.filter(row => !memberIds.has(row.agentId)),
+    };
+}
+/**
+ * Teammates on the roster: those known to be running or provisioning, and
+ * those that may be running. Inside a teammate a sibling's run is not
+ * visible, so an active sibling is `unseen`; the teammate on screen itself
+ * counts in neither.
+ * @param team - The session's team.
+ * @param subagents - The session's subagent rows.
+ * @param sessionId - The session on screen.
+ * @returns the three counts.
+ */
+export function teamMemberCounts(team, subagents, sessionId) {
+    const { teammates } = teamDashboardModel(team, subagents, sessionId);
+    const counted = teammates.filter(row => row.member.id !== sessionId);
+    return {
+        total: teammates.length,
+        active: counted.filter(row => row.status === 'running' || row.status === 'provisioning').length,
+        unseen: counted.filter(row => row.status === 'active').length,
+    };
+}
+/** Completed / total of the task board. */
+export function teamTaskProgress(tasks) {
+    return { completed: tasks.filter(task => task.status === 'completed').length, total: tasks.length };
+}
+/** A pending task some blocker still holds back. */
+export function isTeamTaskBlocked(task) {
+    return task.status === 'pending' && !task.ready;
+}

package/lib/types/dsh-adapter/admission-loader.d.ts

@@ -7,6 +7,55 @@
  */
 import { Context } from '@deepseek-ai/cordis';
 import { type TuiPluginHost } from './plugin-host.js';
+/**
+ * The Loader's own ESM resolver (`cordis-plugin-loader`'s Node-internals
+ * adapter, or `undefined` when this runtime exposes no internals). Admission
+ * must resolve the entry through it: the Loader's active export conditions and
+ * custom hooks decide which module actually executes, and that module's
+ * manifest owns the identity and permissions.
+ *
+ * `import` is the same door `EntryTree.import()` uses — the module the Loader
+ * would execute for that specifier, out of the Loader's own cache. It is
+ * optional because the shape is classified by `resolveSync` alone; a
+ * resolution that cannot be executed is still a resolution, and the D-1
+ * assembly falls back to importing the URL the resolver returned.
+ */
+export type ActiveResolver = {
+    readonly version: 'v1';
+    resolveSync(specifier: string, parentURL: string, attributes: object): {
+        readonly url: string;
+    };
+    import?(specifier: string, parentURL: string, attributes: object): Promise<unknown>;
+} | {
+    readonly version: 'v2';
+    resolveSync(parentURL: string, request: {
+        specifier: string;
+        attributes: object;
+    }): {
+        readonly url: string;
+    };
+    import?(specifier: string, parentURL: string, attributes: object): Promise<unknown>;
+};
+/** The Cordis loader entry that owns a fiber (`cordis-plugin-loader`). */
+interface LoaderEntryLike {
+    readonly options?: {
+        readonly name?: string;
+    };
+    readonly ctx?: {
+        readonly baseUrl?: string;
+    };
+    readonly fiber?: {
+        readonly state?: number;
+    } | null;
+}
+/** The part of the Loader's surface this package reads. Exported (D-1) because
+ *  the backend assembly resolves a bundle's entry through the same resolver. */
+export interface LoaderLike {
+    readonly internal?: ActiveResolver;
+    locate?(fiber?: object): string | undefined;
+    resolve?(id: string): LoaderEntryLike | undefined;
+    entries?(): Iterable<LoaderEntryLike>;
+}
 /**
  * Watch `ctx`'s composition and admit every third-party activation that
  * carries a package-root `dsh-plugin.json`. The listeners and the retry
@@ -17,4 +66,37 @@ export declare function armAdmissionLoader(ctx: Context, options?: {
     /** @internal retry bound for the regression; production uses RETRY_ATTEMPTS. */
     retryAttempts?: number;
 }): void;
+/** The Loader of `ctx`'s composition, when there is one. One accessor for both
+ *  readers of it (the admission loader and the D-1 backend assembly), so
+ *  "which Loader" cannot drift between them. */
+export declare function compositionLoader(ctx: Context): LoaderLike | undefined;
+/**
+ * The **URL** an entry `name` resolves to, through the exact resolver owned by
+ * the Loader that would execute it: its active conditions and hooks must select
+ * the same code and authority.
+ *
+ * `undefined` is a refusal to guess, not a "not found": a `cordis:` builtin has
+ * no module of its own, and a Loader without Node internals leaves the question
+ * open (one debug line, then out). Exported for the D-1 backend assembly, which
+ * resolves a *package* the same way rather than growing a second path resolver.
+ */
+export declare function resolveEntryUrl(loader: LoaderLike, name: string, baseUrl: string | undefined): string | undefined;
+/**
+ * Import a module through the Loader's own door (`EntryTree.import`), so the
+ * namespace handed back is the one the Loader executed — conditions, hooks and
+ * module cache included. Falls back to importing the URL the resolver already
+ * returned (still the Loader's answer; no second resolver) for a loader shape
+ * that can resolve but not import.
+ */
+export declare function loadThroughLoader(loader: LoaderLike, name: string, url: string, baseUrl: string | undefined): Promise<Record<string, unknown>>;
+/** Walk up from the entry module to its package root. A manifest counts only
+ *  beside the `package.json` that establishes that root: a stray copy deeper
+ *  in the tree (a build output directory, say) must not claim an outer
+ *  package's code for its own identity. The walk stops at the first
+ *  `package.json`, so DSH's own rows (a `package.json` one level up from
+ *  their entry) cost one lookup instead of a climb to the filesystem root.
+ *  Exported for the D-1 backend assembly, which reads a bundle's declaration
+ *  through this same rule. */
+export declare function findManifest(from: string): string | undefined;
+export {};
 //# sourceMappingURL=admission-loader.d.ts.map

package/lib/types/dsh-adapter/admission-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admission-loader.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/admission-loader.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAMH,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAG7C,OAAO,EAAoB,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAA;AA6BvE;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,OAAO,EACZ,OAAO,GAAE;IACP,IAAI,CAAC,EAAE,MAAM,aAAa,GAAG,SAAS,CAAA;IACtC,gFAAgF;IAChF,aAAa,CAAC,EAAE,MAAM,CAAA;CAClB,GACL,IAAI,CA8JN"}
+{"version":3,"file":"admission-loader.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/admission-loader.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAG7C,OAAO,EAAoB,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAA;AASvE;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,cAAc,GACtB;IAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAA;IACtB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG;QAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;IAC/F,MAAM,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CAAE,GACvF;IAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAA;IACtB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;IAC5G,MAAM,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CAAE,CAAA;AAE3F,0EAA0E;AAC1E,UAAU,eAAe;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC7C,QAAQ,CAAC,GAAG,CAAC,EAAE;QAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC5C,QAAQ,CAAC,KAAK,CAAC,EAAE;QAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;CACpD;AAED;gFACgF;AAChF,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAA;IAClC,MAAM,CAAC,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;IAC3C,OAAO,CAAC,CAAC,EAAE,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAAA;IACjD,OAAO,CAAC,IAAI,QAAQ,CAAC,eAAe,CAAC,CAAA;CACtC;AASD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,OAAO,EACZ,OAAO,GAAE;IACP,IAAI,CAAC,EAAE,MAAM,aAAa,GAAG,SAAS,CAAA;IACtC,gFAAgF;IAChF,aAAa,CAAC,EAAE,MAAM,CAAA;CAClB,GACL,IAAI,CA8JN;AAED;;gDAEgD;AAChD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,CAKtE;AAgCD;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAgBjH;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAMlC;AAWD;;;;;;;8BAO8B;AAC9B,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAY7D"}

package/lib/types/dsh-adapter/admission-loader.js

@@ -5,9 +5,8 @@
  * unload would rewrite the user's profile) but stays outside every mediated
  * capability. Listeners and the retry timer ride the caller's `ctx.effect`.
  */
-import { findPackageJSON } from 'node:module';
 import { existsSync, readFileSync } from 'node:fs';
-import { dirname, isAbsolute, join, resolve as resolvePath } from 'node:path';
+import { dirname, join, resolve as resolvePath } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { Context } from '@deepseek-ai/cordis';
 import { componentIdentityOf } from './component-identity.js';
@@ -27,8 +26,8 @@ const RETRY_ATTEMPTS = 100;
 export function armAdmissionLoader(ctx, options = {}) {
     const root = compositionRoot(ctx);
     const retryAttempts = options.retryAttempts ?? RETRY_ATTEMPTS;
-    const loader = root.get('loader', false);
-    if (loader === undefined || typeof loader.locate !== 'function' || typeof loader.resolve !== 'function') {
+    const loader = compositionLoader(root);
+    if (loader === undefined) {
         logForDebugging('dsh-tui: admission loader not armed — this composition has no cordis loader');
         return;
     }
@@ -181,6 +180,15 @@ export function armAdmissionLoader(ctx, options = {}) {
     ctx.effect(() => stopTimer);
     seed();
 }
+/** The Loader of `ctx`'s composition, when there is one. One accessor for both
+ *  readers of it (the admission loader and the D-1 backend assembly), so
+ *  "which Loader" cannot drift between them. */
+export function compositionLoader(ctx) {
+    const loader = compositionRoot(ctx).get('loader', false);
+    return loader !== undefined && typeof loader.locate === 'function' && typeof loader.resolve === 'function'
+        ? loader
+        : undefined;
+}
 /** The package-root `dsh-plugin.json` of the entry that owns `fiber`, if any.
  *  Both loader calls are fenced: `EntryTree.resolve` throws for nested ids
  *  (`include:<group>:<row>`); an uninspectable entry is simply skipped. */
@@ -196,33 +204,67 @@ function manifestPathOf(loader, fiber) {
     const name = entry?.options?.name;
     if (typeof name !== 'string' || name === '')
         return undefined;
-    const entryFile = resolveEntryFile(name, entry?.ctx?.baseUrl);
+    const entryFile = resolveEntryFile(loader, name, entry?.ctx?.baseUrl);
     return entryFile === undefined ? undefined : findManifest(entryFile);
 }
-/** The module file an entry `name` resolves to, following the same rules the
+/** The module an entry `name` resolves to, following the same rules the
  *  loader's own import uses (file URL, relative to `baseUrl`, bare
  *  specifier relative to the profile). */
-function resolveEntryFile(name, baseUrl) {
+function resolveEntryFile(loader, name, baseUrl) {
+    const url = resolveEntryUrl(loader, name, baseUrl);
+    if (url === undefined)
+        return undefined;
+    try {
+        return fileURLToPath(url);
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * The **URL** an entry `name` resolves to, through the exact resolver owned by
+ * the Loader that would execute it: its active conditions and hooks must select
+ * the same code and authority.
+ *
+ * `undefined` is a refusal to guess, not a "not found": a `cordis:` builtin has
+ * no module of its own, and a Loader without Node internals leaves the question
+ * open (one debug line, then out). Exported for the D-1 backend assembly, which
+ * resolves a *package* the same way rather than growing a second path resolver.
+ */
+export function resolveEntryUrl(loader, name, baseUrl) {
     try {
-        // Builtin rows (loader groups, timers) have no package directory.
         if (name.startsWith('cordis:'))
             return undefined;
-        if (name.startsWith('file:'))
-            return fileURLToPath(name);
-        if (isAbsolute(name))
-            return name;
-        if (name.startsWith('.')) {
-            return baseUrl === undefined || baseUrl === '' ? undefined : fileURLToPath(new URL(name, baseUrl));
+        const resolver = loader.internal;
+        if (resolver === undefined) {
+            logForDebugging('dsh-tui: admission skipped — the Loader ESM resolver is unavailable; refusing to guess component identity');
+            return undefined;
         }
-        // Through the package's own resolution: `exports` need not list
-        // `./package.json`, and a subpath (`pkg/sub`) lands on the same root.
-        return findPackageJSON(name, requireBase(baseUrl));
+        const parent = moduleBase(baseUrl).href;
+        const resolved = resolver.version === 'v1'
+            ? resolver.resolveSync(name, parent, {})
+            : resolver.resolveSync(parent, { specifier: name, attributes: {} });
+        return resolved.url;
     }
     catch {
         return undefined;
     }
 }
-function requireBase(baseUrl) {
+/**
+ * Import a module through the Loader's own door (`EntryTree.import`), so the
+ * namespace handed back is the one the Loader executed — conditions, hooks and
+ * module cache included. Falls back to importing the URL the resolver already
+ * returned (still the Loader's answer; no second resolver) for a loader shape
+ * that can resolve but not import.
+ */
+export async function loadThroughLoader(loader, name, url, baseUrl) {
+    const internal = loader.internal;
+    if (internal?.import !== undefined) {
+        return await internal.import(name, moduleBase(baseUrl).href, {});
+    }
+    return await import(/* @vite-ignore */ url);
+}
+function moduleBase(baseUrl) {
     if (baseUrl === undefined || baseUrl === '')
         return pathToFileURL(join(process.cwd(), 'index.js'));
     try {
@@ -232,18 +274,21 @@ function requireBase(baseUrl) {
         return pathToFileURL(join(process.cwd(), 'index.js'));
     }
 }
-/** Walk up from the entry module to its package root. The walk stops at the
- *  first `package.json`: a manifest lives at the package root, never deeper,
- *  so DSH's own rows (a `package.json` one level up from their entry) cost
- *  one lookup instead of a climb to the filesystem root. */
-function findManifest(from) {
+/** Walk up from the entry module to its package root. A manifest counts only
+ *  beside the `package.json` that establishes that root: a stray copy deeper
+ *  in the tree (a build output directory, say) must not claim an outer
+ *  package's code for its own identity. The walk stops at the first
+ *  `package.json`, so DSH's own rows (a `package.json` one level up from
+ *  their entry) cost one lookup instead of a climb to the filesystem root.
+ *  Exported for the D-1 backend assembly, which reads a bundle's declaration
+ *  through this same rule. */
+export function findManifest(from) {
     let dir = dirname(resolvePath(from));
     for (let depth = 0; depth < 64; depth += 1) {
-        const candidate = join(dir, 'dsh-plugin.json');
-        if (existsSync(candidate))
-            return candidate;
-        if (existsSync(join(dir, 'package.json')))
-            return undefined;
+        if (existsSync(join(dir, 'package.json'))) {
+            const candidate = join(dir, 'dsh-plugin.json');
+            return existsSync(candidate) ? candidate : undefined;
+        }
         const parent = dirname(dir);
         if (parent === dir)
             return undefined;

package/lib/types/dsh-adapter/agent-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-view.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/agent-view.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAEnD,gEAAgE;AAChE,eAAO,MAAM,uBAAuB,EAAE,SAAS,eAAe,EAE7D,CAAA;AAED,gEAAgE;AAChE,eAAO,MAAM,wBAAwB,MAAM,CAAA;AAE3C;4DAC4D;AAC5D,eAAO,MAAM,qBAAqB,KAAK,CAAA;AAEvC;iEACiE;AACjE,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5C;AAED,0EAA0E;AAC1E,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAcpE;AAED,2DAA2D;AAC3D,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,OAAO,CAE1E;AAED;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,OAAO,CAAA;IACjB,4DAA4D;IAC5D,WAAW,EAAE,MAAM,CAAA;IACnB;kEAC8D;IAC9D,OAAO,EAAE,MAAM,CAAA;IACf;yCACqC;IACrC,WAAW,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,WAAW,CAAA;IACrD,KAAK,EAAE,MAAM,CAAA;IACb,6DAA6D;IAC7D,SAAS,EAAE,MAAM,CAAA;IACjB,wDAAwD;IACxD,cAAc,EAAE,OAAO,CAAA;CACxB;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,SAAS,YAAY,EAAE,EAC/B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,aAAa,GAClB,aAAa,CAkDf;AAED,gEAAgE;AAChE,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,EAAE,CAanG;AAED;4DAC4D;AAC5D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAUzF;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,IAAI,EAAE,aAAa,EACnB,UAAU,EAAE,OAAO,GAClB,eAAe,CAMjB"}
+{"version":3,"file":"agent-view.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/agent-view.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAGnD,gEAAgE;AAChE,eAAO,MAAM,uBAAuB,EAAE,SAAS,eAAe,EAE7D,CAAA;AAED,gEAAgE;AAChE,eAAO,MAAM,wBAAwB,MAAM,CAAA;AAE3C;4DAC4D;AAC5D,eAAO,MAAM,qBAAqB,KAAK,CAAA;AAEvC;iEACiE;AACjE,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5C;AAED,0EAA0E;AAC1E,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAcpE;AAED,2DAA2D;AAC3D,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,OAAO,CAE1E;AAED;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,OAAO,CAAA;IACjB,4DAA4D;IAC5D,WAAW,EAAE,MAAM,CAAA;IACnB;kEAC8D;IAC9D,OAAO,EAAE,MAAM,CAAA;IACf;yCACqC;IACrC,WAAW,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,WAAW,CAAA;IACrD,KAAK,EAAE,MAAM,CAAA;IACb,6DAA6D;IAC7D,SAAS,EAAE,MAAM,CAAA;IACjB,wDAAwD;IACxD,cAAc,EAAE,OAAO,CAAA;CACxB;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,SAAS,YAAY,EAAE,EAC/B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,aAAa,GAClB,aAAa,CAmDf;AAED,gEAAgE;AAChE,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,EAAE,CAanG;AAED;4DAC4D;AAC5D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAUzF;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,IAAI,EAAE,aAAa,EACnB,UAAU,EAAE,OAAO,GAClB,eAAe,CAMjB"}