05bb5d7d46
Note the high-level motivation behind this change is to avoid the need
to make temporary changes in the source tree in order to cut a release
build since that runs the risk of leaving things in an inconsistent
state in the event of a failure. The existing code:
```
import pkg from "../../package.json" assert { type: "json" };
```
did not work as intended because, as written, ESBuild would bake the
contents of the local `package.json` into the release build at build
time whereas we want it to read the contents at runtime so we can use
the `package.json` in the tree to build the code and later inject a
modified version into the release package with a timestamped build
version.
Changes:
* move `CLI_VERSION` out of `src/utils/session.ts` and into
`src/version.ts` so `../package.json` is a correct relative path both
from `src/version.ts` in the source tree and also in the final
`dist/cli.js` build output
* change `assert` to `with` in `import pkg` as apparently `with` became
standard in Node 22
* mark `"../package.json"` as external in `build.mjs` so the version is
not baked into the `.js` at build time
After using `pnpm stage-release` to build a release version, if I use
Node 22.0 to run Codex, I see the following printed to stderr at
startup:
```
(node:71308) ExperimentalWarning: Importing JSON modules is an experimental feature and might change at any time
(Use `node --trace-warnings ...` to show where the warning was created)
```
Note it is a warning and does not prevent Codex from running.
In Node 22.12, the warning goes away, but the warning still appears in
Node 22.11. For Node 22, 22.15.0 is the current LTS version, so LTS
users will not see this.
Also, something about moving the definition of `CLI_VERSION` caused a
problem with the mocks in `check-updates.test.ts`. I asked Codex to fix
it, and it came up with the change to the test configs. I don't know
enough about vitest to understand what it did, but the tests seem
healthy again, so I'm going with it.
107 lines
2.9 KiB
TypeScript
107 lines
2.9 KiB
TypeScript
import type { ApprovalPolicy } from "./approvals";
|
|
import type { AppConfig } from "./utils/config";
|
|
import type { TerminalChatSession } from "./utils/session.js";
|
|
import type { ResponseItem } from "openai/resources/responses/responses";
|
|
|
|
import TerminalChat from "./components/chat/terminal-chat";
|
|
import TerminalChatPastRollout from "./components/chat/terminal-chat-past-rollout";
|
|
import { checkInGit } from "./utils/check-in-git";
|
|
import { onExit } from "./utils/terminal";
|
|
import { CLI_VERSION } from "./version";
|
|
import { ConfirmInput } from "@inkjs/ui";
|
|
import { Box, Text, useApp, useStdin } from "ink";
|
|
import React, { useMemo, useState } from "react";
|
|
|
|
export type AppRollout = {
|
|
session: TerminalChatSession;
|
|
items: Array<ResponseItem>;
|
|
};
|
|
|
|
type Props = {
|
|
prompt?: string;
|
|
config: AppConfig;
|
|
imagePaths?: Array<string>;
|
|
rollout?: AppRollout;
|
|
approvalPolicy: ApprovalPolicy;
|
|
additionalWritableRoots: ReadonlyArray<string>;
|
|
fullStdout: boolean;
|
|
};
|
|
|
|
export default function App({
|
|
prompt,
|
|
config,
|
|
rollout,
|
|
imagePaths,
|
|
approvalPolicy,
|
|
additionalWritableRoots,
|
|
fullStdout,
|
|
}: Props): JSX.Element {
|
|
const app = useApp();
|
|
const [accepted, setAccepted] = useState(() => false);
|
|
const [cwd, inGitRepo] = useMemo(
|
|
() => [process.cwd(), checkInGit(process.cwd())],
|
|
[],
|
|
);
|
|
const { internal_eventEmitter } = useStdin();
|
|
internal_eventEmitter.setMaxListeners(20);
|
|
|
|
if (rollout) {
|
|
return (
|
|
<TerminalChatPastRollout
|
|
session={rollout.session}
|
|
items={rollout.items}
|
|
/>
|
|
);
|
|
}
|
|
|
|
if (!inGitRepo && !accepted) {
|
|
return (
|
|
<Box flexDirection="column">
|
|
<Box borderStyle="round" paddingX={1} width={64}>
|
|
<Text>
|
|
● OpenAI <Text bold>Codex</Text>{" "}
|
|
<Text dimColor>
|
|
(research preview) <Text color="blueBright">v{CLI_VERSION}</Text>
|
|
</Text>
|
|
</Text>
|
|
</Box>
|
|
<Box
|
|
borderStyle="round"
|
|
borderColor="redBright"
|
|
flexDirection="column"
|
|
gap={1}
|
|
>
|
|
<Text>
|
|
<Text color="yellow">Warning!</Text> It can be dangerous to run a
|
|
coding agent outside of a git repo in case there are changes that
|
|
you want to revert. Do you want to continue?
|
|
</Text>
|
|
<Text>{cwd}</Text>
|
|
<ConfirmInput
|
|
defaultChoice="cancel"
|
|
onCancel={() => {
|
|
app.exit();
|
|
onExit();
|
|
// eslint-disable-next-line
|
|
console.error(
|
|
"Quitting! Run again to accept or from inside a git repo",
|
|
);
|
|
}}
|
|
onConfirm={() => setAccepted(true)}
|
|
/>
|
|
</Box>
|
|
</Box>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<TerminalChat
|
|
config={config}
|
|
prompt={prompt}
|
|
imagePaths={imagePaths}
|
|
approvalPolicy={approvalPolicy}
|
|
additionalWritableRoots={additionalWritableRoots}
|
|
fullStdout={fullStdout}
|
|
/>
|
|
);
|
|
}
|