Fix worker
This commit is contained in:
@@ -430,6 +430,9 @@ const codexModel = (claim: Claim) => {
|
||||
return model.includes('/') ? model.split('/').at(-1) ?? model : model;
|
||||
};
|
||||
|
||||
const codexModelFlag = (claim: Claim) =>
|
||||
isCodexLoginProfile(claim) ? '' : ` --model ${quoteShell(codexModel(claim))}`;
|
||||
|
||||
const writeJsonFile = async (filePath: string, content: string) => {
|
||||
let normalized = content.trim();
|
||||
try {
|
||||
@@ -694,15 +697,15 @@ const runCodexTurn = async (args: {
|
||||
});
|
||||
const command = workspace.codexSessionId
|
||||
? commandToShell(
|
||||
`codex exec resume --json --model ${quoteShell(
|
||||
codexModel(workspace.claim),
|
||||
`codex exec resume --json${codexModelFlag(
|
||||
workspace.claim,
|
||||
)} --dangerously-bypass-approvals-and-sandbox ${quoteShell(
|
||||
workspace.codexSessionId,
|
||||
)} ${quoteShell(prompt)}`,
|
||||
)
|
||||
: commandToShell(
|
||||
`codex exec --json --model ${quoteShell(
|
||||
codexModel(workspace.claim),
|
||||
`codex exec --json${codexModelFlag(
|
||||
workspace.claim,
|
||||
)} --dangerously-bypass-approvals-and-sandbox --cd ${quoteShell(
|
||||
codexContainerRepo,
|
||||
)} ${quoteShell(prompt)}`,
|
||||
@@ -734,7 +737,7 @@ const runCodexTurn = async (args: {
|
||||
if (line.trim()) {
|
||||
await appendEvent(
|
||||
workspace.claim.job._id,
|
||||
'debug',
|
||||
'info',
|
||||
'plan',
|
||||
truncate(line, 10_000),
|
||||
);
|
||||
@@ -1439,9 +1442,10 @@ export const sendWorkspaceMessage = async (jobId: string, prompt: string) => {
|
||||
});
|
||||
await appendEvent(claim.job._id, 'info', 'plan', 'Sending message to agent.');
|
||||
|
||||
let assistantMessageId: Id<'agentJobMessages'> | undefined;
|
||||
try {
|
||||
workspace.agentTurnActive = true;
|
||||
const assistantMessageId = await appendMessage({
|
||||
assistantMessageId = await appendMessage({
|
||||
jobId: claim.job._id,
|
||||
role: 'assistant',
|
||||
status: 'streaming',
|
||||
@@ -1449,6 +1453,12 @@ export const sendWorkspaceMessage = async (jobId: string, prompt: string) => {
|
||||
});
|
||||
const assistantContent = { value: '' };
|
||||
if (isCodexLoginProfile(claim)) {
|
||||
await appendEvent(
|
||||
claim.job._id,
|
||||
'info',
|
||||
'plan',
|
||||
'Starting Codex CLI turn with the configured login profile.',
|
||||
);
|
||||
await runCodexTurn({
|
||||
workspace,
|
||||
prompt,
|
||||
@@ -1456,6 +1466,12 @@ export const sendWorkspaceMessage = async (jobId: string, prompt: string) => {
|
||||
assistantContent,
|
||||
});
|
||||
} else if (env.runtime === 'docker') {
|
||||
await appendEvent(
|
||||
claim.job._id,
|
||||
'info',
|
||||
'plan',
|
||||
'Starting OpenCode server turn with the configured API provider.',
|
||||
);
|
||||
await runOpenCodeTurn({
|
||||
workspace,
|
||||
prompt,
|
||||
@@ -1532,12 +1548,20 @@ export const sendWorkspaceMessage = async (jobId: string, prompt: string) => {
|
||||
'cleanup',
|
||||
truncate(redact(message), 20_000),
|
||||
);
|
||||
await appendMessage({
|
||||
jobId: claim.job._id,
|
||||
role: 'assistant',
|
||||
status: 'failed',
|
||||
content: truncate(redact(message), 40_000),
|
||||
});
|
||||
if (assistantMessageId) {
|
||||
await updateMessage({
|
||||
messageId: assistantMessageId,
|
||||
status: 'failed',
|
||||
content: truncate(redact(message), 40_000),
|
||||
});
|
||||
} else {
|
||||
await appendMessage({
|
||||
jobId: claim.job._id,
|
||||
role: 'assistant',
|
||||
status: 'failed',
|
||||
content: truncate(redact(message), 40_000),
|
||||
});
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user