@keyou007/agent-bot 0.1.19-alpha.1 → 0.1.20-alpha.0

package/dist/proxy/ProxySessionController.js

@@ -46,7 +46,6 @@ const RECOVERY_HEARTBEAT_INTERVAL_MS = 60 * 1_000;
 const SHELL_COMMAND_JOB_POLL_INTERVAL_MS = 1_000;
 const SHELL_COMMAND_JOB_RELAUNCH_DELAY_MS = 5_000;
 const APP_SERVER_RELEASE_POLL_INTERVAL_MS = 500;
-const APP_SERVER_RELEASE_IDLE_DELAY_MS = 5_000;
 const FORWARD_ATTACHMENT_WINDOW_MS = 800;
 const DEFAULT_MERGED_FORWARD_INSTRUCTION = "请参考以下内容回复用户";
 const DEFAULT_REFERENCED_MESSAGE_INSTRUCTION = "请参考引用消息回复用户";
@@ -907,7 +906,6 @@ export class ProxySessionController {
             agentName: result.agentName,
             status: result.status,
             blockingTaskCount: result.blockingTaskCount,
-            ...(result.releaseInSeconds !== undefined ? { releaseInSeconds: result.releaseInSeconds } : {}),
         };
     }
     async controlArchiveTask(localSessionId) {
@@ -2324,7 +2322,7 @@ export class ProxySessionController {
         else {
             if (!taskId)
                 throw new Error("缺少要 fork 的 App Server 任务 ID。");
-            const resolved = await this.resolveRemoteCodexSession(taskId);
+            const resolved = await this.resolveRemoteCodexSession(taskId, { forFork: true });
             agentName = resolved.agentName;
             runtime = resolved.runtime;
             remote = resolved.remote;
@@ -4982,7 +4980,7 @@ export class ProxySessionController {
             ? this.store.findSessionByRemoteSessionId(scoped.remoteSessionId, contextKey, scoped.agentName)
             : this.store.findSessionByRemoteSessionId(reference, contextKey);
     }
-    async resolveRemoteCodexSession(reference) {
+    async resolveRemoteCodexSession(reference, options = {}) {
         const scoped = parseRemoteSessionReference(reference);
         const candidates = scoped
             ? [[scoped.agentName, this.runtimes.forAgent(scoped.agentName)]]
@@ -4993,10 +4991,13 @@ export class ProxySessionController {
             if (runtime.kind !== "codex" || !runtime.readRemoteSession) {
                 throw new Error(`Agent ${agentName} 不支持读取远端任务。`);
             }
+            const remoteSessionId = scoped?.remoteSessionId ?? reference;
             return {
                 agentName,
                 runtime,
-                remote: await runtime.readRemoteSession(scoped?.remoteSessionId ?? reference),
+                remote: options.forFork && runtime.readRemoteForkSource
+                    ? await runtime.readRemoteForkSource(remoteSessionId)
+                    : await runtime.readRemoteSession(remoteSessionId),
             };
         }));
         const matches = reads
@@ -5637,20 +5638,17 @@ export class ProxySessionController {
         let schedule = this.appServerReleaseSchedules.get(record.agentName);
         const created = !schedule;
         if (!schedule) {
-            const blockingTaskCount = this.appServerReleaseBlockers(record.agentName, runtime).length;
+            const blockers = this.appServerReleaseBlockers(record.agentName, runtime);
+            const blockingTaskCount = blockers.length;
             schedule = {
                 id: this.nextAppServerReleaseScheduleId++,
                 agentName: record.agentName,
                 runtime,
                 status: "waiting",
                 blockingTaskCount,
+                blockingTaskTitles: this.appServerReleaseTaskTitles(blockers),
                 targets: new Map(),
                 forced: false,
-                ...(blockingTaskCount === 0
-                    ? {
-                        releaseCountdownSeconds: Math.ceil(APP_SERVER_RELEASE_IDLE_DELAY_MS / 1_000),
-                    }
-                    : {}),
             };
             this.appServerReleaseSchedules.set(record.agentName, schedule);
         }
@@ -5659,12 +5657,6 @@ export class ProxySessionController {
             if (messageId) {
                 schedule.targets.set(`${contextKey}\u0000${messageId}`, { contextKey, messageId });
             }
-            if (schedule.status === "waiting"
-                && schedule.blockingTaskCount === 0
-                && schedule.releaseCountdownSeconds !== undefined
-                && schedule.releaseAt === undefined) {
-                schedule.releaseAt = Date.now() + APP_SERVER_RELEASE_IDLE_DELAY_MS;
-            }
         }
         catch (error) {
             if (created && schedule.targets.size === 0) {
@@ -5677,9 +5669,6 @@ export class ProxySessionController {
             agentName: schedule.agentName,
             status: schedule.status === "failed" ? "failed" : schedule.status === "released" ? "released" : "waiting",
             blockingTaskCount: schedule.blockingTaskCount,
-            ...(schedule.releaseCountdownSeconds !== undefined
-                ? { releaseInSeconds: schedule.releaseCountdownSeconds }
-                : {}),
             ...(schedule.error ? { error: schedule.error } : {}),
         };
     }
@@ -5690,7 +5679,7 @@ export class ProxySessionController {
         if (!Number.isSafeInteger(scheduleId) || !schedule || schedule.id !== scheduleId || schedule.status !== "waiting") {
             throw new Error("释放卡片已失效，请重新发送 /release。");
         }
-        await this.performAppServerRelease(schedule, true);
+        await this.performAppServerRelease(schedule);
     }
     async cancelAppServerRelease(action) {
         const scheduleId = Number(action.value.scheduleId);
@@ -5724,6 +5713,9 @@ export class ProxySessionController {
                 || Boolean(runtime.getSession(session.localSessionId)?.activeTurnId);
         });
     }
+    appServerReleaseTaskTitles(blockers) {
+        return blockers.map((session) => session.title?.trim() || "未命名任务");
+    }
     armAppServerReleaseCheck(schedule) {
         if (schedule.status !== "waiting" || schedule.timer || schedule.inFlight)
             return;
@@ -5739,36 +5731,22 @@ export class ProxySessionController {
     async refreshAppServerReleaseSchedule(schedule) {
         if (this.appServerReleaseSchedules.get(schedule.agentName) !== schedule || schedule.status !== "waiting")
             return;
-        const blockingTaskCount = this.appServerReleaseBlockers(schedule.agentName, schedule.runtime).length;
-        if (blockingTaskCount > 0) {
-            const changed = schedule.blockingTaskCount !== blockingTaskCount || schedule.releaseAt !== undefined;
-            schedule.releaseAt = undefined;
-            schedule.releaseCountdownSeconds = undefined;
-            if (changed) {
-                schedule.blockingTaskCount = blockingTaskCount;
-                await this.publishAppServerReleaseSchedule(schedule);
-            }
-            this.armAppServerReleaseCheck(schedule);
-            return;
-        }
-        schedule.blockingTaskCount = 0;
-        if (schedule.releaseAt !== undefined) {
-            const releaseCountdownSeconds = Math.max(0, Math.ceil((schedule.releaseAt - Date.now()) / 1_000));
-            if (releaseCountdownSeconds > 0) {
-                if (schedule.releaseCountdownSeconds !== releaseCountdownSeconds) {
-                    schedule.releaseCountdownSeconds = releaseCountdownSeconds;
-                    await this.publishAppServerReleaseSchedule(schedule);
-                }
-                this.armAppServerReleaseCheck(schedule);
-                return;
-            }
+        const blockers = this.appServerReleaseBlockers(schedule.agentName, schedule.runtime);
+        const blockingTaskCount = blockers.length;
+        const blockingTaskTitles = this.appServerReleaseTaskTitles(blockers);
+        const titlesChanged = schedule.blockingTaskTitles.length !== blockingTaskTitles.length
+            || schedule.blockingTaskTitles.some((title, index) => title !== blockingTaskTitles[index]);
+        if (schedule.blockingTaskCount !== blockingTaskCount || titlesChanged) {
+            schedule.blockingTaskCount = blockingTaskCount;
+            schedule.blockingTaskTitles = blockingTaskTitles;
+            await this.publishAppServerReleaseSchedule(schedule);
         }
-        await this.performAppServerRelease(schedule, false);
+        this.armAppServerReleaseCheck(schedule);
     }
-    async performAppServerRelease(schedule, force) {
+    async performAppServerRelease(schedule) {
         if (schedule.inFlight)
             return schedule.inFlight;
-        const operation = this.performAppServerReleaseNow(schedule, force);
+        const operation = this.performAppServerReleaseNow(schedule);
         schedule.inFlight = operation;
         try {
             await operation;
@@ -5780,31 +5758,16 @@ export class ProxySessionController {
                 this.armAppServerReleaseCheck(schedule);
         }
     }
-    async performAppServerReleaseNow(schedule, force) {
+    async performAppServerReleaseNow(schedule) {
         if (schedule.timer) {
             clearTimeout(schedule.timer);
             schedule.timer = undefined;
         }
-        const interruptedWork = force && this.appServerReleaseBlockers(schedule.agentName, schedule.runtime).length > 0;
-        if (force)
-            await this.cancelQueuedPromptsForAppServerRelease(schedule.agentName);
-        else {
-            const blockingTaskCount = this.appServerReleaseBlockers(schedule.agentName, schedule.runtime).length;
-            if (blockingTaskCount > 0) {
-                schedule.status = "waiting";
-                schedule.blockingTaskCount = blockingTaskCount;
-                schedule.releaseAt = undefined;
-                schedule.releaseCountdownSeconds = undefined;
-                schedule.releaseStarted = false;
-                await this.publishAppServerReleaseSchedule(schedule);
-                this.armAppServerReleaseCheck(schedule);
-                return;
-            }
-        }
+        const interruptedWork = this.appServerReleaseBlockers(schedule.agentName, schedule.runtime).length > 0;
+        await this.cancelQueuedPromptsForAppServerRelease(schedule.agentName);
         schedule.status = "releasing";
         schedule.blockingTaskCount = 0;
-        schedule.releaseAt = undefined;
-        schedule.releaseCountdownSeconds = undefined;
+        schedule.blockingTaskTitles = [];
         schedule.releaseStarted = false;
         schedule.forced = interruptedWork;
         await this.publishAppServerReleaseSchedule(schedule);
@@ -5813,15 +5776,15 @@ export class ProxySessionController {
             return;
         schedule.releaseStarted = true;
         try {
-            const result = await schedule.runtime.release?.({ force });
+            const result = await schedule.runtime.release?.({ force: true });
             if (!result)
                 throw new Error("当前 Agent 不支持释放 App Server。");
             if (result.status === "busy") {
+                const blockers = this.appServerReleaseBlockers(schedule.agentName, schedule.runtime);
                 schedule.status = "waiting";
-                schedule.blockingTaskCount = Math.max(result.activeSessionIds?.length ?? 0, this.appServerReleaseBlockers(schedule.agentName, schedule.runtime).length, 1);
+                schedule.blockingTaskCount = Math.max(result.activeSessionIds?.length ?? 0, blockers.length, 1);
+                schedule.blockingTaskTitles = this.appServerReleaseTaskTitles(blockers);
                 schedule.forced = false;
-                schedule.releaseAt = undefined;
-                schedule.releaseCountdownSeconds = undefined;
                 schedule.releaseStarted = false;
                 await this.publishAppServerReleaseSchedule(schedule);
                 this.armAppServerReleaseCheck(schedule);
@@ -5872,9 +5835,7 @@ export class ProxySessionController {
             scheduleId: schedule.id,
             agentName: schedule.agentName,
             ...(schedule.blockingTaskCount > 0 ? { blockingTaskCount: schedule.blockingTaskCount } : {}),
-            ...(schedule.releaseCountdownSeconds !== undefined
-                ? { releaseInSeconds: schedule.releaseCountdownSeconds }
-                : {}),
+            ...(schedule.blockingTaskTitles.length > 0 ? { blockingTaskTitles: schedule.blockingTaskTitles } : {}),
             ...(schedule.forced ? { forced: true } : {}),
             ...(schedule.error ? { error: schedule.error } : {}),
         };