Honor --cwd in resume preflight and close quoted paths with trailing backslash

- task-resume-candidate now accepts --cwd/-C with the same validated
  resolution as task, and the rescue preflight guidance forwards the
  requested workspace so the continue/new-thread question is scoped to
  the right repo
- In the raw-argument splitter, a backslash before a closing quote is
  treated as a literal path separator when the quote is followed by
  whitespace or end-of-input, so quoted Windows paths like
  "C:\Program Files\Repo\" tokenize correctly while embedded
  escaped quotes elsewhere keep their existing behavior

Author: jugol

plugins/codex/agents/codex-rescue.md

@@ -23,7 +23,7 @@ Forwarding rules:
 - If the user did not explicitly choose `--background` or `--wait`, prefer foreground for a small, clearly bounded rescue request.
 - If the user did not explicitly choose `--background` or `--wait` and the task looks complicated, open-ended, multi-step, or likely to keep Codex running for a long time, prefer background execution.
 - For any task expected to exceed a few minutes, add `--background` to the `task` invocation by default so a caller timeout cannot terminate it.
-- Pass `--cwd <dir>` explicitly on every `task` invocation, using the intended workspace root forwarded by the caller.
+- Treat `--cwd <dir>` and `-C <dir>` as workspace routing controls. Pass `--cwd <dir>` explicitly on every `task` invocation, using the intended workspace root forwarded by the caller.
 - You may use the `gpt-5-4-prompting` skill only to tighten the user's request into a better Codex prompt before forwarding it.
 - Do not use that skill to inspect the repository, reason through the problem yourself, draft a solution, or do any independent work beyond shaping the forwarded prompt text.
 - Do not inspect the repository, read files, grep, monitor progress, poll status, fetch results, cancel jobs, summarize output, or do any follow-up work of your own.

plugins/codex/commands/rescue.md

@@ -1,6 +1,6 @@
 ---
 description: Delegate investigation, an explicit fix request, or follow-up rescue work to the Codex rescue subagent
-argument-hint: "[--background|--wait] [--cwd <dir>] [--resume|--fresh] [--model <model|spark>] [--effort <none|minimal|low|medium|high|xhigh>] [what Codex should investigate, solve, or continue]"
+argument-hint: "[--background|--wait] [--cwd <dir>|-C <dir>] [--resume|--fresh] [--model <model|spark>] [--effort <none|minimal|low|medium|high|xhigh>] [what Codex should investigate, solve, or continue]"
 allowed-tools: Bash(node:*), AskUserQuestion, Agent
 ---
 
@@ -18,6 +18,7 @@ Execution mode:
 - If neither flag is present, default to foreground.
 - `--background` and `--wait` are execution flags for Claude Code. Do not forward them to `task`, and do not treat them as part of the natural-language task text.
 - `--model` and `--effort` are runtime-selection flags. Preserve them for the forwarded `task` call, but do not treat them as part of the natural-language task text.
+- `--cwd <dir>` and `-C <dir>` are workspace-routing flags. Preserve the directory for the resume preflight and the forwarded `task` call, but do not treat either form as part of the natural-language task text.
 - If the request includes `--resume`, do not ask whether to continue. The user already chose.
 - If the request includes `--fresh`, do not ask whether to continue. The user already chose.
 - Otherwise, before starting Codex, check for a resumable rescue thread from this Claude session by running:
@@ -26,6 +27,12 @@ Execution mode:
 node "${CLAUDE_PLUGIN_ROOT}/scripts/codex-companion.mjs" task-resume-candidate --json
 ```
 
+- If the request includes `--cwd <dir>` or `-C <dir>`, pass the same directory to that helper as `--cwd <dir>`:
+
+```bash
+node "${CLAUDE_PLUGIN_ROOT}/scripts/codex-companion.mjs" task-resume-candidate --json --cwd "<dir>"
+```
+
 - If that helper reports `available: true`, use `AskUserQuestion` exactly once to ask whether to continue the current Codex thread or start a new one.
 - The two choices must be:
   - `Continue current Codex thread`

plugins/codex/scripts/codex-companion.mjs

@@ -968,8 +968,8 @@ function handleTaskResumeCandidate(argv) {
     booleanOptions: ["json"]
   });
 
-  const cwd = resolveCommandCwd(options);
-  const workspaceRoot = resolveCommandWorkspace(options);
+  const cwd = resolveTaskCwd(options);
+  const workspaceRoot = resolveWorkspaceRoot(cwd);
   const sessionId = getCurrentClaudeSessionId();
   const jobs = filterJobsForCurrentClaudeSession(sortJobsNewestFirst(listJobs(workspaceRoot)));
   const candidate = findLatestResumableTaskJob(jobs);

plugins/codex/scripts/lib/args.mjs

@@ -83,6 +83,15 @@ export function splitRawArgumentString(raw) {
 
     if (character === "\\") {
       const nextCharacter = raw[index + 1];
+      const characterAfterQuote = raw[index + 2];
+      const closesQuotedRegion =
+        quote !== null &&
+        nextCharacter === quote &&
+        (characterAfterQuote === undefined || /\s/.test(characterAfterQuote));
+      if (closesQuotedRegion) {
+        current += character;
+        continue;
+      }
       if (
         nextCharacter !== undefined &&
         (nextCharacter === "'" || nextCharacter === "\"" || nextCharacter === "\\" || /\s/.test(nextCharacter))

tests/args.test.mjs

@@ -17,10 +17,29 @@ test("splitRawArgumentString preserves a quoted Windows path with spaces", () =>
   ]);
 });
 
+test("splitRawArgumentString closes a quoted Windows path after a trailing backslash", () => {
+  assert.deepEqual(splitRawArgumentString(String.raw`--cwd "C:\Program Files\Repo\" --write`), [
+    "--cwd",
+    "C:\\Program Files\\Repo\\",
+    "--write"
+  ]);
+});
+
+test("splitRawArgumentString closes a final quoted Windows path after a trailing backslash", () => {
+  assert.deepEqual(splitRawArgumentString(String.raw`--cwd "C:\Program Files\Repo\"`), [
+    "--cwd",
+    "C:\\Program Files\\Repo\\"
+  ]);
+});
+
 test("splitRawArgumentString accepts an escaped quote inside double quotes", () => {
   assert.deepEqual(splitRawArgumentString(String.raw`"say \"hello\""`), ['say "hello"']);
 });
 
+test("splitRawArgumentString preserves an escaped quote before a non-boundary character", () => {
+  assert.deepEqual(splitRawArgumentString(String.raw`"say \"hi\"..."`), ['say "hi"...']);
+});
+
 test("splitRawArgumentString collapses an escaped backslash", () => {
   assert.deepEqual(splitRawArgumentString(String.raw`C:\\repo`), [String.raw`C:\repo`]);
 });

tests/commands.test.mjs

@@ -107,6 +107,8 @@ test("rescue command absorbs continue semantics", () => {
   assert.match(rescue, /--model <model\|spark>/);
   assert.match(rescue, /--effort <none\|minimal\|low\|medium\|high\|xhigh>/);
   assert.match(rescue, /task-resume-candidate --json/);
+  assert.match(rescue, /task-resume-candidate --json --cwd "<dir>"/);
+  assert.match(rescue, /request includes `--cwd <dir>` or `-C <dir>`.*same directory.*helper/i);
   assert.match(rescue, /AskUserQuestion/);
   assert.match(rescue, /Continue current Codex thread/);
   assert.match(rescue, /Start a new Codex thread/);
@@ -132,6 +134,7 @@ test("rescue command absorbs continue semantics", () => {
   assert.match(agent, /If the user did not explicitly choose `--background` or `--wait` and the task looks complicated, open-ended, multi-step, or likely to keep Codex running for a long time, prefer background execution/i);
   assert.match(agent, /expected to exceed a few minutes.*`--background`/i);
   assert.match(agent, /pass `--cwd <dir>` explicitly/i);
+  assert.match(agent, /`--cwd <dir>` and `-C <dir>`.*workspace routing controls/i);
   assert.match(agent, /Use exactly one `Bash` call/i);
   assert.match(agent, /Do not inspect the repository, read files, grep, monitor progress, poll status, fetch results, cancel jobs, summarize output, or do any follow-up work of your own/i);
   assert.match(agent, /Do not call `review`, `adversarial-review`, `status`, `result`, or `cancel`/i);

tests/runtime.test.mjs

@@ -547,8 +547,9 @@ test("task --resume-last resumes the latest persisted task thread", () => {
   assert.equal(result.stdout, "Resumed the prior run.\nFollow-up prompt accepted.\n");
 });
 
-test("task-resume-candidate returns the latest rescue thread from the current session", () => {
+test("task-resume-candidate uses an explicit workspace cwd from an unrelated invocation directory", () => {
   const workspace = makeTempDir();
+  const invocationDir = makeTempDir();
   const stateDir = resolveStateDir(workspace);
   const jobsDir = path.join(stateDir, "jobs");
   fs.mkdirSync(jobsDir, { recursive: true });
@@ -598,8 +599,8 @@ test("task-resume-candidate returns the latest rescue thread from the current se
     "utf8"
   );
 
-  const result = run("node", [SCRIPT, "task-resume-candidate", "--json"], {
-    cwd: workspace,
+  const result = run("node", [SCRIPT, "task-resume-candidate", "-C", workspace, "--json"], {
+    cwd: invocationDir,
     env: {
       ...process.env,
       CODEX_COMPANION_SESSION_ID: "sess-current"
@@ -614,6 +615,17 @@ test("task-resume-candidate returns the latest rescue thread from the current se
   assert.equal(payload.candidate.threadId, "thr_current");
 });
 
+test("task-resume-candidate rejects a nonexistent explicit workspace cwd", () => {
+  const invocationDir = makeTempDir();
+  const missingDir = path.join(invocationDir, "missing-workspace");
+  const result = run("node", [SCRIPT, "task-resume-candidate", "--cwd", missingDir, "--json"], {
+    cwd: invocationDir
+  });
+
+  assert.notEqual(result.status, 0);
+  assert.match(result.stderr, /Task workspace directory does not exist/);
+});
+
 test("task --resume-last does not resume a task from another Claude session", () => {
   const repo = makeTempDir();
   const binDir = makeTempDir();