@keyou007/agent-bot 0.1.17 → 0.1.18-alpha.1

package/dist/proxy/ProxySessionController.js

@@ -1302,7 +1302,7 @@ export class ProxySessionController {
         }
         switch (command.type) {
             case "shell":
-                await this.runShellCommand(contextKey, command.command, messageId);
+                await this.runShellCommand(contextKey, command.command, messageId, incomingMessage);
                 return;
             case "dir":
                 await this.openDirectoryBrowser(contextKey, command.directory);
@@ -2163,17 +2163,41 @@ export class ProxySessionController {
         if (!runtime.readRemoteSession && !source) {
             throw new Error("当前 App Server Agent 不支持读取指定任务。");
         }
-        remote ??= runtime.readRemoteSession
-            ? await runtime.readRemoteSession(remoteSessionId)
-            : undefined;
-        const latestTurnId = remote?.lastTurnId ?? source?.lastTurnId;
+        const persistedCompletedTurns = source ? this.localForkCompletedTurns(source) : [];
+        const sourceLastSnapshot = turnViewSnapshot(source?.lastTurnId ? this.store.getTurnSnapshot(source.lastTurnId) : undefined);
+        const localCompletedTurns = persistedCompletedTurns.length > 0
+            ? persistedCompletedTurns
+            : source?.lastTurnId
+                && (source.lastTurnStatus === "completed" || sourceLastSnapshot?.status === "completed")
+                ? [{
+                        id: source.lastTurnId,
+                        prompt: latestUserPromptFromTurnView(sourceLastSnapshot) ?? source.title,
+                        startedAt: sourceLastSnapshot?.startedAt ?? parseIsoTimestamp(source.updatedAt),
+                        completedAt: sourceLastSnapshot?.completedAt
+                            ?? sourceLastSnapshot?.startedAt
+                            ?? parseIsoTimestamp(source.updatedAt),
+                    }]
+                : [];
+        if (!remote && runtime.readRemoteSession && (!source || persistedCompletedTurns.length === 0)) {
+            try {
+                remote = await runtime.readRemoteSession(remoteSessionId);
+            }
+            catch (error) {
+                if (localCompletedTurns.length === 0)
+                    throw error;
+                this.logger.warn({ error, contextKey, remoteSessionId, sourceTurnId: localCompletedTurns.at(-1)?.id }, "Failed to read the complete source task before Fork; using the locally persisted completed Turn.");
+            }
+        }
+        const latestTurnId = remote?.lastTurnId ?? source?.lastTurnId ?? localCompletedTurns.at(-1)?.id;
         const latestSnapshot = turnViewSnapshot(latestTurnId ? this.store.getTurnSnapshot(latestTurnId) : undefined);
         const isRunning = remote
             ? isRemoteSessionActive(remote)
             : Boolean((source && runtime.getSession(source.localSessionId)?.activeTurnId)
                 || source?.lastTurnStatus === "running"
                 || isTurnStillRunning(latestSnapshot?.status));
-        const lastTurnId = isRunning ? remote?.lastCompletedTurnId : latestTurnId;
+        const lastTurnId = remote?.lastCompletedTurnId
+            ?? (remote?.lastTurnStatus === "completed" ? remote.lastTurnId : undefined)
+            ?? localCompletedTurns.at(-1)?.id;
         if (!lastTurnId) {
             if (isRunning) {
                 throw new Error(`${sourceLabel}正在执行，且还没有已完成轮次可供 fork。请等待当前轮次完成后重试。`);
@@ -2181,7 +2205,9 @@ export class ProxySessionController {
             throw new Error(`${sourceLabel}还没有可供 fork 的轮次。请先完成至少一轮对话。`);
         }
         const snapshot = turnViewSnapshot(this.store.getTurnSnapshot(lastTurnId));
-        const forkedFromHistoricalTurn = isRunning && lastTurnId !== latestTurnId;
+        const forkedFromHistoricalTurn = lastTurnId !== latestTurnId;
+        const completedTurn = (remote?.completedTurns ?? localCompletedTurns)
+            .find((turn) => turn.id === lastTurnId);
         const cwd = remote?.cwd || source?.cwd;
         if (!cwd)
             throw new Error("指定的 App Server 任务没有可用的工作目录，暂时不能 fork。");
@@ -2192,6 +2218,7 @@ export class ProxySessionController {
         const reasoningEffort = source?.reasoningEffort;
         const permissionMode = source?.permissionMode ?? "auto";
         const sourceTurnPrompt = truncateText(latestUserPromptFromTurnView(snapshot)
+            ?? completedTurn?.prompt
             ?? (lastTurnId === latestTurnId ? remote?.lastUserPrompt : undefined)
             ?? remote?.preview
             ?? source?.title
@@ -2199,6 +2226,8 @@ export class ProxySessionController {
             ?? "Fork 来源轮次", 1_000);
         const sourceTurnCompletedAt = snapshot?.completedAt
             ?? snapshot?.startedAt
+            ?? completedTurn?.completedAt
+            ?? completedTurn?.startedAt
             ?? (lastTurnId === latestTurnId
                 ? latestRemoteTimestamp(remote?.recencyAt, remote?.updatedAt)
                 : undefined)
@@ -2216,19 +2245,31 @@ export class ProxySessionController {
             model,
             reasoningEffort,
             permissionMode,
-            lastTurnStatus: forkedFromHistoricalTurn
-                ? "completed"
-                : mapRemoteTurnStatus(remote?.lastTurnStatus)
-                    ?? forkedTurnStatus(snapshot?.status)
-                    ?? source?.lastTurnStatus,
+            lastTurnStatus: "completed",
             sourceTurnPrompt,
             sourceTurnStartedAt: snapshot?.startedAt ?? sourceTurnCompletedAt,
             sourceTurnCompletedAt,
-            sourceCompletedTurns: remote?.completedTurns ?? [],
+            sourceCompletedTurns: remote?.completedTurns
+                ?? (persistedCompletedTurns.length > 0 ? [] : localCompletedTurns),
             sourceWasRunning: isRunning,
             forkedFromHistoricalTurn,
         };
     }
+    localForkCompletedTurns(source) {
+        return this.store.listTaskTurnGraph(source.localSessionId)
+            .slice()
+            .reverse()
+            .map((record) => {
+            const snapshot = turnViewSnapshot(record.snapshot);
+            const startedAt = snapshot?.startedAt ?? parseIsoTimestamp(record.updatedAt);
+            return {
+                id: record.turnId,
+                prompt: latestUserPromptFromTurnView(snapshot),
+                startedAt,
+                completedAt: snapshot?.completedAt ?? startedAt,
+            };
+        });
+    }
     async prepareForkGroupSession(contextKey, requestedTitle, incomingMessage) {
         if (!incomingMessage?.threadContext) {
             const plan = await this.prepareForkSession(contextKey, undefined, requestedTitle);
@@ -3863,8 +3904,8 @@ export class ProxySessionController {
             this.logger.warn({ error, localSessionId }, "Failed to read the latest Agent Goal status.");
         }
     }
-    async runShellCommand(contextKey, command, sourceMessageId) {
-        const cwd = this.currentSession(contextKey)?.cwd ?? this.config.defaults.cwd;
+    async runShellCommand(contextKey, command, sourceMessageId, incomingMessage) {
+        const cwd = await this.shellCommandCwd(contextKey, incomingMessage);
         const created = await this.shellCommandJobs.createJob({ contextKey, sourceMessageId, command, cwd });
         let cardMessageId;
         const initialState = {
@@ -3903,6 +3944,40 @@ export class ProxySessionController {
             throw error;
         }
     }
+    async shellCommandCwd(contextKey, incomingMessage) {
+        const current = this.currentSession(contextKey);
+        if (current)
+            return current.cwd;
+        if (incomingMessage?.threadContext) {
+            const anchorMessageIds = threadForkAnchorMessageIds(incomingMessage);
+            const anchor = anchorMessageIds
+                .map((messageId) => this.store.findTurnAnchorByMessageId(messageId))
+                .find((candidate) => candidate !== undefined);
+            const source = anchor?.contextKey
+                ? this.store.getSessionForContext(anchor.localSessionId, anchor.contextKey)
+                : anchor
+                    ? this.store.getSession(anchor.localSessionId)
+                    : undefined;
+            const sourceContextKey = anchor?.contextKey ?? source?.contextKey;
+            if (source && sourceContextKey && baseChatContextKey(sourceContextKey) === baseChatContextKey(contextKey)) {
+                return source.cwd;
+            }
+            for (const messageId of anchorMessageIds) {
+                const commandJob = await this.shellCommandJobs.findJobByCardMessageId(messageId);
+                if (commandJob && baseChatContextKey(commandJob.contextKey) === baseChatContextKey(contextKey)) {
+                    return commandJob.cwd;
+                }
+            }
+            const baseContextKey = baseChatContextKey(contextKey);
+            const baseSession = this.currentSession(baseContextKey);
+            if (baseSession)
+                return baseSession.cwd;
+            const boundProjectCwd = this.store.getUserContext(baseContextKey)?.boundProjectCwd;
+            if (boundProjectCwd)
+                return boundProjectCwd;
+        }
+        return this.config.defaults.cwd;
+    }
     monitorShellCommandJob(job, seededState) {
         if (!job.cardMessageId || this.shellCommandJobMonitors.has(job.id))
             return;