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

package/src/proxy/ProxySessionController.ts

@@ -1757,7 +1757,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);
@@ -2817,10 +2817,35 @@ 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)
@@ -2829,7 +2854,9 @@ export class ProxySessionController {
         || 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。请等待当前轮次完成后重试。`);
@@ -2837,7 +2864,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。");
@@ -2849,6 +2878,7 @@ export class ProxySessionController {
     const permissionMode = source?.permissionMode ?? "auto";
     const sourceTurnPrompt = truncateText(
       latestUserPromptFromTurnView(snapshot)
+        ?? completedTurn?.prompt
         ?? (lastTurnId === latestTurnId ? remote?.lastUserPrompt : undefined)
         ?? remote?.preview
         ?? source?.title
@@ -2858,6 +2888,8 @@ export class ProxySessionController {
     );
     const sourceTurnCompletedAt = snapshot?.completedAt
       ?? snapshot?.startedAt
+      ?? completedTurn?.completedAt
+      ?? completedTurn?.startedAt
       ?? (lastTurnId === latestTurnId
         ? latestRemoteTimestamp(remote?.recencyAt, remote?.updatedAt)
         : undefined)
@@ -2876,20 +2908,33 @@ 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,
     };
   }
 
+  private localForkCompletedTurns(source: SessionRecord): RemoteCompletedTurnSummary[] {
+    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,
+        };
+      });
+  }
+
   private async prepareForkGroupSession(
     contextKey: string,
     requestedTitle: string | undefined,
@@ -4963,8 +5008,9 @@ export class ProxySessionController {
     contextKey: string,
     command: string,
     sourceMessageId?: string,
+    incomingMessage?: IncomingMessage,
   ): Promise<void> {
-    const cwd = this.currentSession(contextKey)?.cwd ?? this.config.defaults.cwd;
+    const cwd = await this.shellCommandCwd(contextKey, incomingMessage);
     const created = await this.shellCommandJobs.createJob({ contextKey, sourceMessageId, command, cwd });
     let cardMessageId: string | undefined;
     const initialState: ShellCommandCardView = {
@@ -5010,6 +5056,42 @@ export class ProxySessionController {
     }
   }
 
+  private async shellCommandCwd(contextKey: string, incomingMessage?: IncomingMessage): Promise<string> {
+    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;
+  }
+
   private monitorShellCommandJob(
     job: ShellCommandJobSnapshot,
     seededState?: ShellCommandCardView,

package/src/shell/ShellCommandJobManager.ts

@@ -52,6 +52,7 @@ export interface ShellCommandJobSnapshot extends ShellCommandJobSpec, Omit<Shell
 export interface ShellCommandJobManagerLike {
   createJob(input: Pick<ShellCommandJobSpec, "contextKey" | "sourceMessageId" | "command" | "cwd">): Promise<ShellCommandJobSnapshot>;
   bindCard(jobId: string, cardMessageId: string): Promise<ShellCommandJobSnapshot>;
+  findJobByCardMessageId(cardMessageId: string): Promise<ShellCommandJobSnapshot | undefined>;
   startJob(jobId: string): Promise<void>;
   failJob(jobId: string, error: string): Promise<void>;
   readJob(jobId: string): Promise<ShellCommandJobSnapshot>;
@@ -68,6 +69,7 @@ export interface ShellCommandJobManagerOptions {
 export class ShellCommandJobManager implements ShellCommandJobManagerLike {
   private readonly runnerEntry: string;
   private readonly spawnRunner: (entry: string, jobDirectory: string) => Promise<void>;
+  private readonly jobIdByCardMessageId = new Map<string, string>();
 
   constructor(
     private readonly jobsRoot: string,
@@ -102,9 +104,37 @@ export class ShellCommandJobManager implements ShellCommandJobManagerLike {
     const jobDirectory = this.jobDirectory(jobId);
     const spec = await readJson<ShellCommandJobSpec>(path.join(jobDirectory, JOB_SPEC_FILE));
     await writeJsonAtomic(path.join(jobDirectory, JOB_SPEC_FILE), { ...spec, cardMessageId });
+    this.jobIdByCardMessageId.set(cardMessageId, jobId);
     return this.readJob(jobId);
   }
 
+  async findJobByCardMessageId(cardMessageId: string): Promise<ShellCommandJobSnapshot | undefined> {
+    const cachedJobId = this.jobIdByCardMessageId.get(cardMessageId);
+    if (cachedJobId) {
+      try {
+        return await this.readJob(cachedJobId);
+      } catch {
+        this.jobIdByCardMessageId.delete(cardMessageId);
+      }
+    }
+
+    const entries = await fs.readdir(this.jobsRoot, { withFileTypes: true }).catch((error: NodeJS.ErrnoException) => {
+      if (error.code === "ENOENT") return [];
+      throw error;
+    });
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      try {
+        const spec = await readJson<ShellCommandJobSpec>(path.join(this.jobsRoot, entry.name, JOB_SPEC_FILE));
+        if (spec.cardMessageId) this.jobIdByCardMessageId.set(spec.cardMessageId, spec.id);
+        if (spec.cardMessageId === cardMessageId) return this.readJob(spec.id);
+      } catch {
+        // Ignore partially written or unrelated job directories while rebuilding the card index.
+      }
+    }
+    return undefined;
+  }
+
   async startJob(jobId: string): Promise<void> {
     const jobDirectory = this.jobDirectory(jobId);
     await this.spawnRunner(this.runnerEntry, jobDirectory);