wushenghua/hapi
1
0
Fork 0
mirror of https://github.com/wu736139669/hapi.git synced 2026-08-05 06:24:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Codex reasoning effort resume and updates

Browse Source
This commit is contained in:
weishu
2026-04-10 11:50:03 +08:00
parent 0e1b653d43
commit 79a13d26c6
34 changed files with 664 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/src/codex/runCodex.ts
+37 -4
View File
@@ -16,6 +16,8 @@ import type { ReasoningEffort } from './appServerTypes';
export { emitReadyIfIdle } from './utils/emitReadyIfIdle';
const REASONING_EFFORTS = new Set<ReasoningEffort>(['none', 'minimal', 'low', 'medium', 'high', 'xhigh'])
export async function runCodex(opts: {
startedBy?: 'runner' | 'terminal';
codexArgs?: string[];
@@ -37,7 +39,8 @@ export async function runCodex(opts: {
startedBy,
workingDirectory,
agentState: state,
model: opts.model
model: opts.model,
modelReasoningEffort: opts.modelReasoningEffort
});
const startingMode: 'local' | 'remote' = startedBy === 'runner' ? 'remote' : 'local';
@@ -56,7 +59,7 @@ export async function runCodex(opts: {
let currentPermissionMode: PermissionMode = opts.permissionMode ?? 'default';
let currentModel = opts.model;
const currentModelReasoningEffort = opts.modelReasoningEffort;
let currentModelReasoningEffort: ReasoningEffort | undefined = opts.modelReasoningEffort;
let currentCollaborationMode: EnhancedMode['collaborationMode'] = 'default';
const lifecycle = createRunnerLifecycle({
@@ -77,8 +80,13 @@ export async function runCodex(opts: {
if (sessionModel !== undefined) {
currentModel = sessionModel ?? undefined;
}
const sessionModelReasoningEffort = sessionInstance.getModelReasoningEffort();
if (sessionModelReasoningEffort !== undefined) {
currentModelReasoningEffort = sessionModelReasoningEffort ?? undefined;
}
sessionInstance.setPermissionMode(currentPermissionMode);
sessionInstance.setModel(currentModel ?? null);
sessionInstance.setModelReasoningEffort(currentModelReasoningEffort ?? null);
sessionInstance.setCollaborationMode(currentCollaborationMode);
logger.debug(
`[Codex] Synced session config for keepalive: ` +
@@ -96,6 +104,10 @@ export async function runCodex(opts: {
if (sessionModel !== undefined) {
currentModel = sessionModel ?? undefined;
}
const sessionModelReasoningEffort = sessionWrapperRef.current?.getModelReasoningEffort();
if (sessionModelReasoningEffort !== undefined) {
currentModelReasoningEffort = sessionModelReasoningEffort ?? undefined;
}
const sessionCollaborationMode = sessionWrapperRef.current?.getCollaborationMode();
if (sessionCollaborationMode) {
currentCollaborationMode = sessionCollaborationMode;
@@ -145,22 +157,42 @@ export async function runCodex(opts: {
return parsed.data;
};
const resolveModelReasoningEffort = (value: unknown): ReasoningEffort | undefined => {
if (value === null) {
return undefined;
}
if (typeof value !== 'string' || !REASONING_EFFORTS.has(value as ReasoningEffort)) {
throw new Error('Invalid model reasoning effort');
}
return value as ReasoningEffort;
};
session.rpcHandlerManager.registerHandler('set-session-config', async (payload: unknown) => {
if (!payload || typeof payload !== 'object') {
throw new Error('Invalid session config payload');
}
const config = payload as { permissionMode?: unknown; collaborationMode?: unknown };
const config = payload as { permissionMode?: unknown; modelReasoningEffort?: unknown; collaborationMode?: unknown };
if (config.permissionMode !== undefined) {
currentPermissionMode = resolvePermissionMode(config.permissionMode);
}
if (config.modelReasoningEffort !== undefined) {
currentModelReasoningEffort = resolveModelReasoningEffort(config.modelReasoningEffort);
}
if (config.collaborationMode !== undefined) {
currentCollaborationMode = resolveCollaborationMode(config.collaborationMode);
}
syncSessionMode();
return { applied: { permissionMode: currentPermissionMode, collaborationMode: currentCollaborationMode } };
return {
applied: {
permissionMode: currentPermissionMode,
modelReasoningEffort: currentModelReasoningEffort ?? null,
collaborationMode: currentCollaborationMode
}
};
});
try {
@@ -175,6 +207,7 @@ export async function runCodex(opts: {
startedBy,
permissionMode: currentPermissionMode,
model: currentModel,
modelReasoningEffort: currentModelReasoningEffort,
collaborationMode: currentCollaborationMode,
resumeSessionId: opts.resumeSessionId,
onModeChange: createModeChangeHandler(session),