Repository navigation
codex: honor --cwd when reporting session runtime - #35
Conversation
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 42aa3e4b7b
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
| const workspaceRoot = resolveWorkspaceRoot(cwd); | ||
| const endpoint = env?.[BROKER_ENDPOINT_ENV] ?? loadBrokerSession(workspaceRoot)?.endpoint ?? null; |
There was a problem hiding this comment.
Preserve subdirectory broker session lookup
getSessionRuntimeStatus now always resolves cwd to the Git top-level before loading broker.json, but broker sessions are still persisted using the raw cwd passed to ensureBrokerSession (via CodexAppServerClient.connect(cwd) in review flows). In the scenario where a command is run from a repo subdirectory (or with --cwd pointing to one) and CODEX_COMPANION_APP_SERVER_ENDPOINT is not set, setup/status will now look in the workspace root and report direct startup even though a shared broker session exists under the subdirectory state path.
Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Addressed in 49d8d0c. I removed the extra workspace-root normalization inside getSessionRuntimeStatus(...) and kept the fix scoped to the callers that were actually wrong (setup and status now pass the resolved target workspace). That preserves the original lookup semantics for any other call sites while still fixing the cross-workspace --cwd bug.
Rebases fork onto upstream v1.0.4 and layers only the notification pipeline deltas on top. Preserves all upstream v1.0.1-1.0.4 fixes (openai#35, openai#83, openai#84, openai#126, openai#159, openai#166, openai#177, openai#179) which were lost in the prior overlay. Changes: - scripts/lib/notify.mjs (new): writeCompletionMarker / readInbox / consumeMarkers writing to \$CLAUDE_PLUGIN_DATA/inbox/<sessionId>/ <jobId>.json. Uses \${pid}.\${Date.now()} tmp suffix so concurrent writers racing on the same jobId can't clobber each other's tmp file. - scripts/notify-hook.mjs (new): UserPromptSubmit hook that drains the current session's inbox and emits a <system-reminder> listing finished jobs. - scripts/lib/tracked-jobs.mjs: writeCompletionMarker on runTrackedJob success and failure paths. - scripts/codex-companion.mjs: worker exit-path safety handlers (process exit/SIGTERM/SIGINT/uncaughtException/unhandledRejection) and cancel-path marker in handleCancel. - hooks/hooks.json: registers notify-hook.mjs on UserPromptSubmit. - commands/prune.md (new): /codex:prune command. The custom activity-watchdog/hard-timer block from the prior overlay is not ported here — upstream v1.0.4 has its own completionTimer in codex.mjs. If hangs recur in practice, that block can be re-applied from backup-9c07229. Co-Authored-By: Claude Opus 4.7 <[email protected]>
* Fix working-tree review crash on untracked directories (openai#166) * fix: skip untracked directories in review context * fix: skip broken untracked symlinks in reviews * fix: respect SHELL on Windows for Git Bash (openai#178) * Use app-server auth status for Codex readiness (openai#177) * Use app-server auth status for Codex readiness * fix: reuse existing app server for auth checks * fix: inherit process.env in app-server spawn when no explicit env is provided (openai#159) `SpawnedCodexAppServerClient.initialize()` passes `this.options.env` to `spawn()`, but no caller ever sets `env` in options. In Node.js, passing `undefined` for `env` gives the child process **no** environment variables, breaking any model provider that relies on env vars (e.g. DATABRICKS_TOKEN). Fall back to `process.env` when `this.options.env` is not set, matching the existing pattern in `broker-lifecycle.mjs` and `codex-companion.mjs`. Co-authored-by: Isaac Co-authored-by: Bhuvanesh Sridharan <[email protected]> * fix: gracefully handle unsupported thread/name/set on older Codex CLI (openai#126) * fix: gracefully handle unsupported thread/name/set on older Codex CLI Codex CLI v0.118.0 does not recognize the thread/name/set JSON-RPC method, causing startThread() to throw. Thread naming is cosmetic (for job log labels) and should not block thread creation. Wraps the call in try/catch so it fails silently on older CLI versions. Fixes openai#119 * refactor: only suppress unsupported-method errors for thread/name/set Address Codex review feedback: the bare catch swallowed all errors including auth, network, and server failures. Now only suppresses errors containing 'unknown variant' or 'unknown method' (the specific error older CLI versions return) and rethrows everything else. * codex: scope implicit resume-last selection to the current Claude session (openai#83) Co-authored-by: VOIDXAI <[email protected]> * codex: scope default cancel selection to the current Claude session (openai#84) Co-authored-by: VOIDXAI <[email protected]> * fix: avoid embedding large adversarial review diffs (openai#179) * fix: avoid embedding large adversarial review diffs * fix: preserve untracked content in lightweight review * address comments * fix: handle ENOBUFS type check in git diff sizing * bump: update plugin version to 1.0.3 (openai#180) * codex: honor --cwd when reporting session runtime (openai#35) * codex: honor --cwd when reporting session runtime * codex: keep session runtime lookup scoped to callers --------- Co-authored-by: VOIDXAI <[email protected]> * fix: declare model in codex-rescue agent frontmatter (openai#169) * fix: declare model in codex-rescue agent frontmatter The codex-rescue agent had no model field, leaving Claude Code to assign whatever default it chooses. As a thin forwarding wrapper that issues a single Bash call, this agent is well-suited to the haiku tier; declaring it explicitly ensures a predictable cost profile and tier guarantee. Co-Authored-By: Claude Code <[email protected]> * Update codex-rescue.md --------- Co-authored-by: claude[bot] <[email protected]> Co-authored-by: Claude Code <[email protected]> Co-authored-by: Dominik Kundel <[email protected]> * fix: correct invalid 'xhigh' reasoning effort in README (openai#99) Closes openai#77 Updated README to replace unsupported 'xhigh' value with 'high' to prevent configuration errors. * fix: quote \$ARGUMENTS in cancel, result, and status commands (openai#168) Unquoted \$ARGUMENTS in the ! shell commands allowed shell metacharacters in user-supplied job IDs to be expanded before Node received them (e.g., `task-123; malicious-cmd` would execute the trailing command). This is inconsistent with review.md and adversarial-review.md, which both wrap "$ARGUMENTS" in double quotes. Co-authored-by: claude[bot] <[email protected]> Co-authored-by: Claude Code <[email protected]> * fix: route /codex:rescue through the Agent tool to stop Skill recursion (openai#234) (openai#235) * fix: route /codex:rescue through the Agent tool to stop Skill recursion (openai#234) `/codex:rescue` previously combined two things that together caused a hang: - `context: fork` in the frontmatter, which spawns a `general-purpose` subagent for the command body. - Body prose "Route this request to the `codex:codex-rescue` subagent." without naming the transport. When the main agent called `Skill(codex:rescue)` programmatically, the fork resolved the ambiguous prose by trying `Skill(codex:codex-rescue)` (unknown skill) and then falling back to `Skill(codex:rescue)`, which re-entered this command and hung the session until the user cancelled. No Codex job was ever created. Naming the transport as `Agent(codex:codex-rescue)` alone is not enough: forked general-purpose subagents do not expose the `Agent` tool, so the forked runner cannot reach the subagent that way either. The minimal fix is therefore two coordinated changes: - Drop `context: fork` so the command body runs inline in the calling agent's context, where `Agent` is in scope. - Say explicitly "use the `Agent` tool with `subagent_type: "codex:codex-rescue"`", and call out that `Skill(codex:codex-rescue)` and `Skill(codex:rescue)` are not valid routing paths. Add `Agent` to `allowed-tools` so the call does not prompt for permission. Everything else in rescue.md (resume-candidate check, flag handling, background/foreground semantics, operating rules) is unchanged. The `codex:codex-rescue` subagent itself is unchanged. Tests pin the new allow-list, the explicit `subagent_type`, the ban on `Skill(codex:codex-rescue)`, and the absence of `context: fork`. The existing "run the `codex:codex-rescue` subagent in the background" assertion continues to hold since that sentence still reads correctly with the Agent-tool transport. Fixes openai#234 * test: match quoted result and cancel command arguments --------- Co-authored-by: Dominik Kundel <[email protected]> * fix: bump plugin version to 1.0.4 (openai#244) * feat: add Claude session transfer command (openai#374) * fix: bump plugin version to 1.0.5 (openai#398) * Remove shell expansion for git commands (openai#447) * Remove shell expansion for git commands * Version bump --------- Co-authored-by: Dominik Kundel <[email protected]> Co-authored-by: Bhuvanesh Sridharan <[email protected]> Co-authored-by: Bhuvanesh Sridharan <[email protected]> Co-authored-by: Trevin Chow <[email protected]> Co-authored-by: VOIDXAI <[email protected]> Co-authored-by: VOIDXAI <[email protected]> Co-authored-by: xiaolai <[email protected]> Co-authored-by: claude[bot] <[email protected]> Co-authored-by: Claude Code <[email protected]> Co-authored-by: Manav Agarwal <[email protected]> Co-authored-by: Friende <[email protected]> Co-authored-by: stefanstokic-oai <[email protected]> Co-authored-by: bryane-oai <[email protected]>
Summary
setup,status, andgetSessionRuntimeStatus(...)--cwdcaseWhy
Closes #30.
setup --cwdandstatus --cwdcan misreportdirect startupwhen a shared broker exists for the target workspace but the command is invoked from a different directory.Validation
setup/status --cwdworkspace resolutiongetSessionRuntimeStatus(process.env, targetWorkspace)reportsshared