support merging from codex, fix docker (#234)
This commit is contained in:
committed by
pullfrog[bot]
parent
6deeea7032
commit
eab198748a
@@ -144457,16 +144457,21 @@ url = "${ctx.mcpServerUrl}"`];
|
||||
}
|
||||
const featuresSection = features.length > 0 ? `[features]
|
||||
${features.join("\n")}` : "";
|
||||
const cwd = process.cwd();
|
||||
const projectTrustSection = `[projects."${cwd}"]
|
||||
trust_level = "trusted"`;
|
||||
writeFileSync7(
|
||||
configPath,
|
||||
`# written by pullfrog
|
||||
${featuresSection}
|
||||
|
||||
${projectTrustSection}
|
||||
|
||||
${mcpServerSections.join("\n\n")}
|
||||
`.trim() + "\n"
|
||||
);
|
||||
log.info(
|
||||
`\xBB Codex config written to ${configPath} (shell: ${bash === "enabled" ? "enabled" : "disabled"})`
|
||||
`\xBB Codex config written to ${configPath} (shell: ${bash === "enabled" ? "enabled" : "disabled"}, project trusted: ${cwd})`
|
||||
);
|
||||
return codexDir;
|
||||
}
|
||||
@@ -144522,7 +144527,6 @@ var codex = agent({
|
||||
const commandExecutionIds = /* @__PURE__ */ new Set();
|
||||
const env3 = {
|
||||
...process.env,
|
||||
HOME: ctx.tmpdir,
|
||||
CODEX_HOME: codexDir,
|
||||
CODEX_API_KEY: apiKey
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user