opencode-subagent-magazine 1.6.1 → 1.7.1

package/dist/panel/entry-map.d.ts

@@ -1,6 +1,23 @@
 import type { SubEntry } from "../core/types";
 export type SubEntryPatch = Omit<SubEntry, "startedAt" | "endedAt"> & {
     startedAt?: number;
+    endedAt?: number;
 };
 export declare function findSubEntryKey(entries: ReadonlyMap<string, SubEntry>, id: string, sessionId?: string): string | undefined;
 export declare function upsertSubEntry(entries: ReadonlyMap<string, SubEntry>, partial: SubEntryPatch, now?: number): Map<string, SubEntry>;
+/**
+ * 合并同一子代理条目的两个视图，绝不回退状态。
+ *
+ * 持久化存储由多个 TUI 实例写入，每个写入者都可能
+ * 持有过期快照。终态始终优先于 running /
+ * cancel_requested，进度计数只增不减，描述性字段
+ * 则回退到仍保有它的一侧。
+ */
+export declare function mergeSubEntry(base: SubEntry, incoming: SubEntry): SubEntry;
+/**
+ * 合并两个条目集合，去重方式与 `upsertSubEntry` 相同
+ * （先子会话、后条目 id），冲突用 `mergeSubEntry` 合并。
+ * 所有持久化路径都走这里，避免并发实例以整表写入
+ * 互相丢弃对方的条目。
+ */
+export declare function mergeSubEntries(base: Iterable<SubEntry>, incoming: Iterable<SubEntry>): Map<string, SubEntry>;

package/dist/panel/entry-map.js

@@ -19,7 +19,81 @@ export function upsertSubEntry(entries, partial, now = Date.now()) {
         ...partial,
         id: existing?.id ?? partial.id,
         startedAt: existing?.startedAt || partial.startedAt || now,
-        endedAt: ended ? (existing?.endedAt || now) : undefined,
+        endedAt: ended ? (existing?.endedAt ?? partial.endedAt ?? now) : undefined,
     });
     return next;
 }
+/** running < cancel_requested < 终态（done/error/cancelled）。 */
+function statusRank(status) {
+    if (status === "running")
+        return 0;
+    if (status === "cancel_requested")
+        return 1;
+    return 2;
+}
+const isTerminalStatus = (status) => statusRank(status) === 2;
+function minDefined(a, b) {
+    if (a === undefined)
+        return b;
+    if (b === undefined)
+        return a;
+    return Math.min(a, b);
+}
+function maxDefined(a, b) {
+    if (a === undefined)
+        return b;
+    if (b === undefined)
+        return a;
+    return Math.max(a, b);
+}
+/**
+ * 合并同一子代理条目的两个视图，绝不回退状态。
+ *
+ * 持久化存储由多个 TUI 实例写入，每个写入者都可能
+ * 持有过期快照。终态始终优先于 running /
+ * cancel_requested，进度计数只增不减，描述性字段
+ * 则回退到仍保有它的一侧。
+ */
+export function mergeSubEntry(base, incoming) {
+    const successor = statusRank(incoming.status) > statusRank(base.status) ? incoming : base;
+    const status = successor.status;
+    const ended = isTerminalStatus(status);
+    return {
+        ...base,
+        ...incoming,
+        id: base.id,
+        status,
+        sessionId: incoming.sessionId ?? base.sessionId,
+        startedAt: minDefined(base.startedAt, incoming.startedAt) ?? base.startedAt,
+        endedAt: ended ? (base.endedAt ?? incoming.endedAt ?? Date.now()) : undefined,
+        tokens: maxDefined(base.tokens, incoming.tokens),
+        cost: maxDefined(base.cost, incoming.cost),
+        model: incoming.model ?? base.model,
+        todoTotal: maxDefined(base.todoTotal, incoming.todoTotal),
+        todoDone: maxDefined(base.todoDone, incoming.todoDone),
+        error: incoming.error ?? base.error,
+        cancelRequestedAt: minDefined(base.cancelRequestedAt, incoming.cancelRequestedAt),
+        abortAccepted: base.abortAccepted || incoming.abortAccepted || undefined,
+        cancelReason: incoming.cancelReason ?? base.cancelReason,
+    };
+}
+/**
+ * 合并两个条目集合，去重方式与 `upsertSubEntry` 相同
+ * （先子会话、后条目 id），冲突用 `mergeSubEntry` 合并。
+ * 所有持久化路径都走这里，避免并发实例以整表写入
+ * 互相丢弃对方的条目。
+ */
+export function mergeSubEntries(base, incoming) {
+    const out = new Map();
+    for (const entry of base)
+        out.set(entry.id, entry);
+    for (const entry of incoming) {
+        const key = findSubEntryKey(out, entry.id, entry.sessionId);
+        if (!key) {
+            out.set(entry.id, entry);
+            continue;
+        }
+        out.set(key, mergeSubEntry(out.get(key), entry));
+    }
+    return out;
+}

package/dist/panel/panel-api.d.ts

@@ -8,6 +8,20 @@ export interface SessionLike {
     agent?: string;
     cost?: number;
 }
+/** Spawned child session summary (V2 reads it from the local database). */
+export interface ChildSessionLike {
+    id: string;
+    agent?: string;
+    title?: string;
+    model?: string;
+    cost?: number;
+    tokens?: number;
+    timeCreated?: number;
+    timeIdle?: number;
+    idleOutcome?: string;
+    /** Still running: last message is newer than time_idle (resume keeps the old value). */
+    active?: boolean;
+}
 export interface SessionStatusLike {
     type: string;
 }
@@ -45,6 +59,16 @@ export interface PanelApi {
         messages(sid: string): unknown[] | undefined;
         /** Raw parts of a message (scan). */
         part(messageID: string): unknown[] | undefined;
+        /** Optional host-side fallback: map a subagent tool call to its child session
+         *  when live events/history lack the link (V2 reads the local database). */
+        resolveChild?(input: {
+            parentId: string;
+            callId?: string;
+            agent?: string;
+            startedAt?: number;
+        }): string | undefined;
+        /** Optional host-side listing of spawned child sessions. */
+        listChildren?(parentId: string): ChildSessionLike[] | undefined;
     };
     event: {
         on(type: PanelEventType, cb: (e: PanelEvent) => void): () => void;