chore: final cleanup, and updates in tests

Author: DevelopmentCats

registry/coder-labs/modules/codex/README.md

@@ -13,7 +13,7 @@ Run Codex CLI in your workspace to access OpenAI's models through the Codex inte
 ```tf
 module "codex" {
   source         = "registry.coder.com/coder-labs/codex/coder"
-  version        = "1.0.2"
+  version        = "1.1.0"
   agent_id       = coder_agent.example.id
   openai_api_key = var.openai_api_key
   folder         = "/home/coder/project"
@@ -33,7 +33,7 @@ module "codex" {
 module "codex" {
   count               = data.coder_workspace.me.start_count
   source              = "registry.coder.com/coder-labs/codex/coder"
-  version             = "1.0.2"
+  version             = "1.1.0"
   agent_id            = coder_agent.example.id
   openai_api_key      = "..."
   install_codex       = true
@@ -62,13 +62,13 @@ module "coder-login" {
 }
 
 module "codex" {
-  source          = "registry.coder.com/coder-labs/codex/coder"
-  version         = "1.0.2"
-  agent_id        = coder_agent.example.id
-  openai_api_key  = "..."
-  ai_prompt       = data.coder_parameter.ai_prompt.value
-  folder          = "/home/coder/project"
-  
+  source         = "registry.coder.com/coder-labs/codex/coder"
+  version        = "1.1.0"
+  agent_id       = coder_agent.example.id
+  openai_api_key = "..."
+  ai_prompt      = data.coder_parameter.ai_prompt.value
+  folder         = "/home/coder/project"
+
   # Custom configuration for full auto mode
   base_config_toml = <<-EOT
     approval_policy = "never"
@@ -103,6 +103,7 @@ writable_roots = ["$/path/to/your/folder$", "$HOME/.codex"]
 ```
 
 The default configuration allows writing to only two specific directories:
+
 - Your specified `folder` (working directory)
 - `$HOME/.codex` (for configuration files like AGENTS.md)
 
@@ -115,7 +116,7 @@ For custom Codex configuration, use `base_config_toml` and/or `additional_mcp_se
 ```tf
 module "codex" {
   source  = "registry.coder.com/coder-labs/codex/coder"
-  version = "1.0.2"
+  version = "1.1.0"
   # ... other variables ...
 
   # Override default configuration

registry/coder-labs/modules/codex/main.test.ts

@@ -143,7 +143,7 @@ describe("codex", async () => {
       id,
       "/home/coder/.codex-module/agentapi-start.log",
     );
-    expect(resp).toContain("openai_api_key provided !");
+    expect(resp).toContain("OpenAI API Key: Provided");
   });
 
   test("pre-post-install-scripts", async () => {
@@ -271,7 +271,7 @@ describe("codex", async () => {
 
     // Check default base config
     expect(resp).toContain("sandbox_mode = \"workspace-write\"");
-    expect(resp).toContain("approval_policy = \"on-request\"");
+    expect(resp).toContain("approval_policy = \"never\"");
     expect(resp).toContain("[sandbox_workspace_write]");
     expect(resp).toContain("network_access = true");
 
@@ -305,6 +305,7 @@ describe("codex", async () => {
     `.trim();
     const pre_install_script = dedent`
         #!/bin/bash
+        mkdir -p /home/coder/.codex
         echo -e "${prompt_3}" >> /home/coder/.codex/AGENTS.md
         `.trim();
 
@@ -350,7 +351,11 @@ describe("codex", async () => {
   });
 
   test("start-without-prompt", async () => {
-    const { id } = await setup();
+    const { id } = await setup({
+      moduleVariables: {
+        codex_system_prompt: "", // Explicitly disable system prompt
+      },
+    });
     await execModuleScript(id);
     const prompt = await execContainer(id, [
       "ls",

registry/coder-labs/modules/codex/main.tf

@@ -110,11 +110,9 @@ variable "ai_prompt" {
 variable "codex_system_prompt" {
   type        = string
   description = "System instructions written to AGENTS.md in the ~/.codex directory"
-  default     = ""
+  default     = "You are a helpful coding assistant. Start every response with `Codex says:`"
 }
 
-
-
 resource "coder_env" "openai_api_key" {
   agent_id = var.agent_id
   name     = "OPENAI_API_KEY"

registry/coder-labs/modules/codex/scripts/install.sh

@@ -3,7 +3,6 @@ source "$HOME"/.bashrc
 
 BOLD='\033[0;1m'
 
-# Function to check if a command exists
 command_exists() {
   command -v "$1" > /dev/null 2>&1
 }
@@ -28,7 +27,6 @@ echo "======================================"
 set +o nounset
 
 function install_node() {
-  # borrowed from claude-code module
   if ! command_exists npm; then
     printf "npm not found, checking for Node.js installation...\n"
     if ! command_exists node; then
@@ -57,24 +55,18 @@ function install_node() {
 
 function install_codex() {
   if [ "${ARG_INSTALL}" = "true" ]; then
-    # we need node to install and run codex-cli
     install_node
 
-    # If nvm does not exist, we will create a global npm directory (this os to prevent the possibility of EACCESS issues on npm -g)
     if ! command_exists nvm; then
       printf "which node: %s\n" "$(which node)"
       printf "which npm: %s\n" "$(which npm)"
 
-      # Create a directory for global packages
       mkdir -p "$HOME"/.npm-global
 
-      # Configure npm to use it
       npm config set prefix "$HOME/.npm-global"
 
-      # Add to PATH for current session
       export PATH="$HOME/.npm-global/bin:$PATH"
 
-      # Add to shell profile for future sessions
       if ! grep -q "export PATH=$HOME/.npm-global/bin:\$PATH" ~/.bashrc; then
         echo "export PATH=$HOME/.npm-global/bin:\$PATH" >> ~/.bashrc
       fi
@@ -91,7 +83,6 @@ function install_codex() {
   fi
 }
 
-# Write minimal default configuration
 write_minimal_default_config() {
     local config_path="$1"
     cat << EOF > "$config_path"
@@ -107,7 +98,6 @@ writable_roots = ["${ARG_CODEX_START_DIRECTORY}", "$HOME/.codex"]
 EOF
 }
 
-# Append MCP servers section
 append_mcp_servers_section() {
     local config_path="$1"
 
@@ -129,12 +119,10 @@ EOF
     fi
 }
 
-# Main configuration function
 function populate_config_toml() {
     CONFIG_PATH="$HOME/.codex/config.toml"
     mkdir -p "$(dirname "$CONFIG_PATH")"
 
-    # Step 1: Write base config (user-provided or minimal default)
     if [ -n "$ARG_BASE_CONFIG_TOML" ]; then
         printf "Using provided base configuration\n"
         echo "$ARG_BASE_CONFIG_TOML" > "$CONFIG_PATH"
@@ -143,28 +131,23 @@ function populate_config_toml() {
         write_minimal_default_config "$CONFIG_PATH"
     fi
 
-    # Step 2: Always append complete MCP servers section
     append_mcp_servers_section "$CONFIG_PATH"
 }
 
 function add_instruction_prompt_if_exists() {
   if [ -n "${ARG_CODEX_INSTRUCTION_PROMPT:-}" ]; then
-    # Create AGENTS.md in .codex directory instead of polluting the working directory
     AGENTS_PATH="$HOME/.codex/AGENTS.md"
     printf "Creating AGENTS.md in .codex directory: %s\\n" "${AGENTS_PATH}"
 
-    # Ensure .codex directory exists
     mkdir -p "$HOME/.codex"
 
-    # Check if AGENTS.md contains the instruction prompt already
-    if [ -f "${AGENTS_PATH}" ] && grep -Fxq "${ARG_CODEX_INSTRUCTION_PROMPT}" "${AGENTS_PATH}"; then
+    if [ -f "${AGENTS_PATH}" ] && grep -Fq "${ARG_CODEX_INSTRUCTION_PROMPT}" "${AGENTS_PATH}"; then
       printf "AGENTS.md already contains the instruction prompt. Skipping append.\n"
     else
       printf "Appending instruction prompt to AGENTS.md in .codex directory\n"
       echo -e "\n${ARG_CODEX_INSTRUCTION_PROMPT}" >> "${AGENTS_PATH}"
     fi
 
-    # Ensure the working directory exists for Codex to run in
     if [ ! -d "${ARG_CODEX_START_DIRECTORY}" ]; then
       printf "Creating start directory '%s'\\n" "${ARG_CODEX_START_DIRECTORY}"
       mkdir -p "${ARG_CODEX_START_DIRECTORY}" || {
@@ -177,7 +160,6 @@ function add_instruction_prompt_if_exists() {
   fi
 }
 
-# Install Codex
 install_codex
 codex --version
 populate_config_toml

registry/coder-labs/modules/codex/scripts/start.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# Load shell environment
 source "$HOME"/.bashrc
 set -o errexit
 set -o pipefail