mirrors/pikasTech-HWLAB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1681 from pikasTech/fix/manual-session-profile-recovery

Browse Source 
允许 thread-resume-failed session 跨 profile 恢复
This commit is contained in:
Lyon
2026-06-20 10:27:25 +08:00
committed by GitHub
parent 809f3a2b4b c3de9d6e4d
commit 322ba24e2e
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/cloud/server-code-agent-http.ts
+18 -2
View File
@@ -377,7 +377,8 @@ async function prepareManualCodeAgentSession({ params, options, traceId, respons
sendJson(response, 404, manualSessionErrorPayload({ code: "session_not_found", message: "Code Agent session is not visible to the current actor.", traceId, sessionId }));
return { blocked: true };
}
if (!manualSessionUsable(session.status)) {
const profileRecovery = manualSessionProfileRecoveryAllowed(session, params);
if (!manualSessionUsable(session.status) && !profileRecovery) {
sendJson(response, 409, manualSessionErrorPayload({ code: "session_not_usable", message: `Code Agent session ${sessionId} is ${session.status}; create a new session before continuing.`, traceId, sessionId, session }));
return { blocked: true };
}
@@ -401,10 +402,25 @@ async function prepareManualCodeAgentSession({ params, options, traceId, respons
params.conversationId = conversationId;
params.sessionId = sessionId;
params.projectId = requestedProjectId || sessionProjectId || DEFAULT_CODE_AGENT_PROJECT_ID;
params.threadId = safeOpaqueId(params.threadId) || safeOpaqueId(session.threadId) || undefined;
params.threadId = profileRecovery ? undefined : safeOpaqueId(params.threadId) || safeOpaqueId(session.threadId) || undefined;
return { session };
}
function manualSessionProfileRecoveryAllowed(session, params = {}) {
const status = String(session?.status ?? "").trim().toLowerCase().replace(/_/gu, "-");
if (status !== "thread-resume-failed") return false;
const requestedProfile = manualSessionProviderProfileToken(params.providerProfile ?? params.codeAgentProviderProfile);
const sessionProfile = manualSessionProviderProfileToken(session?.session?.providerProfile);
return Boolean(requestedProfile && sessionProfile && requestedProfile !== sessionProfile);
}
function manualSessionProviderProfileToken(value) {
const profile = String(value ?? "").trim().toLowerCase();
if (!profile || profile === "runtime-default") return "";
if (profile === "codex-api") return "codex";
return profile;
}
async function getVisibleManualAgentSession(options, sessionId) {
if (!safeSessionId(sessionId) || !options.actor?.id || !options.accessController?.getAgentSession) return null;
const session = await options.accessController.getAgentSession(sessionId);