@keyou007/agent-bot 0.1.16-alpha.3 → 0.1.16-alpha.4

package/src/startup/SessionMetadataHydrator.ts

@@ -9,33 +9,6 @@ export class SessionMetadataHydrator {
   ) {}
 
   async hydrate(session: SessionRecord): Promise<SessionRecord> {
-    if (
-      session.runtimeKind === "codex"
-      && session.remoteSessionId
-      && session.lastTurnId
-      && session.status === "running"
-      && session.lastTurnStatus === "running"
-    ) {
-      const runtime = this.runtimes.forAgent(session.agentName);
-      const loaded = runtime.getSession(session.localSessionId) ?? await runtime.resumeSession({
-        localSessionId: session.localSessionId,
-        remoteSessionId: session.remoteSessionId,
-        activeTurnId: session.lastTurnId,
-        lastTurnId: session.lastTurnId,
-        lastTurnStatus: session.lastTurnStatus,
-        agentName: session.agentName,
-        cwd: session.cwd,
-        title: session.title,
-        model: session.model,
-        reasoningEffort: session.reasoningEffort,
-        permissionMode: session.permissionMode ?? "auto",
-      });
-      const synchronized = await runtime.synchronizeSession(loaded.localSessionId);
-      if (synchronized.title) {
-        this.store.updateRuntimeSession(session.localSessionId, { title: synchronized.title });
-      }
-      return this.store.getSession(session.localSessionId) ?? session;
-    }
     if (session.title || !session.runtimeKind || !session.remoteSessionId) return session;
     if (session.runtimeKind === "codex" && !session.lastTurnId) return session;
     const metadata = await this.runtimes.forAgent(session.agentName).readSessionMetadata(session.remoteSessionId);

package/src/state/StateStore.ts

@@ -111,6 +111,7 @@ export type TurnAttemptStatus =
   | "accepted"
   | "running"
   | "recovering"
+  | "cancelling"
   | "completed"
   | "failed"
   | "cancelled"
@@ -633,6 +634,15 @@ export class StateStore {
     return rows.map(mapTurnAttempt);
   }
 
+  listCancellationRequestedTurnAttempts(): TurnAttemptRecord[] {
+    const rows = this.db.prepare(`
+      SELECT * FROM turn_attempts
+      WHERE status = 'cancelling'
+      ORDER BY created_at ASC, rowid ASC
+    `).all() as TurnAttemptRow[];
+    return rows.map(mapTurnAttempt);
+  }
+
   updateTurnAttempt(
     attemptId: string,
     patch: Partial<{
@@ -697,6 +707,19 @@ export class StateStore {
     return row ? mapTurnAttempt(row) : undefined;
   }
 
+  requestTurnAttemptCancellation(turnId: string): TurnAttemptRecord | undefined {
+    const existing = this.findIncompleteTurnAttemptByTurnId(turnId);
+    if (!existing) return undefined;
+    this.updateTurnAttempt(existing.attemptId, { status: "cancelling" });
+    return existing;
+  }
+
+  restoreTurnAttemptAfterCancellationFailure(attempt: TurnAttemptRecord): void {
+    const current = this.getTurnAttempt(attempt.attemptId);
+    if (current?.status !== "cancelling") return;
+    this.updateTurnAttempt(attempt.attemptId, { status: attempt.status });
+  }
+
   touchTurnAttempt(turnId: string, activityAt = new Date()): void {
     const timestamp = activityAt.toISOString();
     const throttleCutoff = new Date(activityAt.getTime() - 15_000).toISOString();
@@ -737,6 +760,17 @@ export class StateStore {
     return this.getTurnAttempt(attemptId);
   }
 
+  prepareUnstartedTurnAttemptRetry(attemptId: string): TurnAttemptRecord | undefined {
+    const existing = this.getTurnAttempt(attemptId);
+    if (!existing || existing.turnId || !isIncompleteTurnAttemptStatus(existing.status)) return undefined;
+    this.updateTurnAttempt(attemptId, {
+      pendingTurnId: null,
+      retryCount: existing.retryCount + 1,
+      status: "recovering",
+    });
+    return this.getTurnAttempt(attemptId);
+  }
+
   rebindPendingTurnMessages(localSessionId: string, sourceTurnId: string, targetTurnId: string): void {
     const now = new Date().toISOString();
     const rebind = this.db.transaction(() => {