cdx-manager 0.21.3 → 0.21.4

package/README.md

@@ -4,7 +4,7 @@
 
 <br clear="left"/>
 
-[![License](https://img.shields.io/badge/license-MIT-4C8BF5)](LICENSE) ![Version](https://img.shields.io/badge/version-v0.21.3-4C8BF5) ![Python](https://img.shields.io/badge/python-3.9%2B-3776AB?logo=python&logoColor=white)
+[![License](https://img.shields.io/badge/license-MIT-4C8BF5)](LICENSE) ![Version](https://img.shields.io/badge/version-v0.21.4-4C8BF5) ![Python](https://img.shields.io/badge/python-3.9%2B-3776AB?logo=python&logoColor=white)
 
 **The right AI coding account, when you need it.** CDX Manager keeps your Codex and Claude accounts in separate profiles, shows which ones have quota, and helps you pick the next usable session from your terminal.
 

package/VERSION

@@ -1 +1 @@
-0.21.3
+0.21.4

package/changelogs/CHANGELOGS_0_21_4.md

@@ -0,0 +1,10 @@
+# CDX Manager 0.21.4
+
+## Start a session on a first message
+
+- `cdx <name> --prompt TEXT` and `cdx <name> --prompt-file PATH` launch an interactive session that starts on that message, for launcher scripts that open a session already pointed at a task. Both spellings `--flag value` and `--flag=value` work. They are refused before the provider starts when combined with each other, with `--resume` or `cdx resume`, with `--prompt-file -` (the session needs standard input), and for Ollama sessions (`ollama run` answers once and exits). A relative `--prompt-file` path is read from the current directory, not `--dir`. Contributed by Nicolas Rigaudy (#13).
+
+## Fixes
+
+- Claude sessions started from inside a running Claude Code session (a hook, or a terminal or script it spawned) saved no transcript: they inherited the parent's session markers (`CLAUDECODE`, `CLAUDE_CODE_CHILD_SESSION`, ...) and ran as a child session, which broke resume and interactive usage backfill. CDX now drops those markers for every Claude spawn; user settings such as `CLAUDE_CODE_DISABLE_*` still pass through. Contributed by Nicolas Rigaudy (#14).
+- A prompt starting with `-` (from `--prompt`, `cdx handoff` or `cdx run`) is now passed after `--`, so Claude, Codex and Ollama no longer read it as an option (for example `-h` printed the provider's help instead of starting).

package/checksums/release-archives.json

@@ -507,6 +507,17 @@
         "x86_64-pc-windows-msvc": "856f9dc459182adb10f66f2836abc862be82feff1cc3f1cf859764336487d781",
         "x86_64-unknown-linux-musl": "f1832fdbe7114b4625da21d6a3a0f0c100f18d3a441796e809e568620e4cd345"
       }
+    },
+    "v0.21.3": {
+      "github_tarball_sha256": "4f38562539953131cd2d8aedffea71ba1e7b2d8ccbc899b6521a1ed8c7507cf2",
+      "github_zip_sha256": "06e95cf08fcdec0e978c16980f58f282b01daee0513ab8db1ea659b423e58dc6",
+      "tray_assets": {
+        "aarch64-apple-darwin": "086ec24d2d1ad2820394e74a5f100cec62da1ffe2df91ee470c247f5b1cb9bb0",
+        "aarch64-unknown-linux-musl": "0f32a168e097a4d18da86fe0ae028465d5fb43afae6344da39a76463ba99c0ea",
+        "x86_64-apple-darwin": "348ec8e5ed89c1181a800ab65b5d736a46b8118d7b83445847049cae95735af8",
+        "x86_64-pc-windows-msvc": "9729f245b46420ae4b11c1a50d3ba9cba682854866ef37a3f334dccbdd70ac89",
+        "x86_64-unknown-linux-musl": "182fb651dab29a6a21b3b8ef56c196e954fd75230891f8532c21b09ff5fbacee"
+      }
     }
   }
 }

package/docs/cli.md

@@ -8,6 +8,7 @@
 | `cdx --json` | List all sessions as a machine-readable JSON payload |
 | `cdx <name>` | Launch a session (checks auth first) |
 | `cdx <name> [--json]` | Launch a session; `--json` returns a structured success payload after the interactive run ends |
+| `cdx <name> --prompt TEXT` / `cdx <name> --prompt-file PATH` | Launch a session that starts on this first message (not with `--resume` or Ollama sessions; `--prompt-file -` is refused because the session needs standard input; a relative `--prompt-file` path is read from the current directory, not `--dir`) |
 | `cdx <name> -r` / `cdx <name> --resume` | Resume the provider-native conversation for a session when supported |
 | `cdx add [provider] <name> [--model MODEL] [--json]` | Register a new session (`provider`: `codex`, `claude`, `antigravity`, or `ollama`; Ollama requires `--model`) |
 | `cdx cp <source> <dest> [--json]` | Copy a session into another session name, overwriting the destination if it exists |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdx-manager",
-  "version": "0.21.3",
+  "version": "0.21.4",
   "description": "Terminal session manager for Codex and Claude accounts.",
   "license": "MIT",
   "author": "Alexandre Agostini",

package/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cdx-manager"
-version = "0.21.3"
+version = "0.21.4"
 description = "Terminal session manager for Codex and Claude accounts."
 readme = "README.md"
 requires-python = ">=3.9"

package/src/cli.py

@@ -70,6 +70,7 @@ from .cli_render import (
     _visible_len,
     format_error,
 )
+from .config import PROVIDER_OLLAMA
 from .errors import CdxError
 from .provider_runtime import (
     LOG_ROTATE_BYTES,
@@ -288,6 +289,7 @@ def _print_help(use_color=False):
         f"  {_style('cdx set <name> --notify on', '36', use_color)}  # agent finishes or needs attention",
         f"  {_style('cdx ready', '36', use_color)}  # next session to become ready",
         f"  {_style('cdx <name> [--json]', '36', use_color)}",
+        f"  {_style('cdx <name> --prompt TEXT|--prompt-file PATH', '36', use_color)}  # start with a first message",
         f"  {_style('cdx --help', '36', use_color)}",
         f"  {_style('cdx --version', '36', use_color)}",
     ])
@@ -623,10 +625,18 @@ def main(argv, options=None):
     if handler:
         return handler(rest, ctx)
 
-    from .commands.launch import _parse_launch_args
-    directory, launch_args = _parse_launch_args(rest)
+    from .commands.launch import _parse_launch_args, _read_launch_prompt
+    directory, launch_args, prompt = _parse_launch_args(rest)
     if all(arg in ("--json", "-r", "--resume") for arg in launch_args):
-        return handle_launch(command, ctx, resume=("-r" in launch_args or "--resume" in launch_args), directory=directory)
+        resume = "-r" in launch_args or "--resume" in launch_args
+        has_prompt = prompt["prompt"] is not None or prompt["prompt_file"] is not None
+        if resume and has_prompt:
+            raise CdxError("cdx <name>: --prompt and --prompt-file are not supported with --resume.")
+        # `ollama run MODEL PROMPT` answers once and exits instead of opening a session.
+        if has_prompt and (ctx["service"]["get_session"](command) or {}).get("provider") == PROVIDER_OLLAMA:
+            raise CdxError("cdx <name>: --prompt and --prompt-file are not supported for Ollama sessions.")
+        return handle_launch(command, ctx, initial_prompt=_read_launch_prompt(prompt), resume=resume,
+                             directory=directory)
 
     raise CdxError(f"Unknown command: {command}. Use cdx --help.")
 

package/src/commands/launch.py

@@ -30,31 +30,45 @@ from ..provider_runtime import (
     _get_auth_home,
     _run_interactive_provider_command,
 )
+from ..run_command import PROMPT_STDIN, read_run_prompt
 from ..run_usage import estimate_cost
 
+LAUNCH_USAGE = "Usage: cdx <name> [--dir PATH] [--prompt TEXT|--prompt-file PATH] [--resume] [--json]"
+
 
 def _parse_launch_args(args):
-    """Return the per-launch directory and ordinary launch flags."""
-    directory = None
+    """Return the per-launch directory, initial prompt source and ordinary launch flags."""
+    values = {"--dir": None, "--prompt": None, "--prompt-file": None}
     cleaned = []
     index = 0
     while index < len(args):
         arg = args[index]
-        if arg == "--dir":
-            if directory is not None or index + 1 >= len(args):
-                raise CdxError("Usage: cdx <name> [--dir PATH] [--resume] [--json]")
-            directory = args[index + 1]
-            index += 2
-            continue
-        if arg.startswith("--dir="):
-            if directory is not None or not arg.split("=", 1)[1]:
-                raise CdxError("Usage: cdx <name> [--dir PATH] [--resume] [--json]")
-            directory = arg.split("=", 1)[1]
+        flag, sep, inline = arg.partition("=")
+        if flag not in values:
+            cleaned.append(arg)
             index += 1
             continue
-        cleaned.append(arg)
-        index += 1
-    return directory, cleaned
+        if sep:
+            value, index = inline, index + 1
+        elif index + 1 < len(args):
+            value, index = args[index + 1], index + 2
+        else:
+            raise CdxError(LAUNCH_USAGE)
+        if values[flag] is not None or not value:
+            raise CdxError(LAUNCH_USAGE)
+        values[flag] = value
+    if values["--prompt"] is not None and values["--prompt-file"] is not None:
+        raise CdxError("cdx <name>: --prompt and --prompt-file are mutually exclusive.")
+    if values["--prompt-file"] == PROMPT_STDIN:
+        raise CdxError("cdx <name>: --prompt-file - is not supported; the interactive session needs standard input.")
+    prompt = {"prompt": values["--prompt"], "prompt_file": values["--prompt-file"]}
+    return values["--dir"], cleaned, prompt
+
+
+def _read_launch_prompt(prompt):
+    if prompt["prompt"] is None and prompt["prompt_file"] is None:
+        return None
+    return read_run_prompt(prompt)
 
 
 def _launch_directory(session, ctx, explicit, json_flag):
@@ -154,7 +168,9 @@ def handle_can_resume(rest, ctx):
     return 0
 
 def handle_resume(rest, ctx):
-    directory, rest = _parse_launch_args(rest)
+    directory, rest, prompt = _parse_launch_args(rest)
+    if prompt["prompt"] is not None or prompt["prompt_file"] is not None:
+        raise CdxError("cdx resume: --prompt and --prompt-file are not supported when resuming.")
     json_flag, args = _parse_json_flag(rest)
     if len(args) != 1:
         raise CdxError(RESUME_USAGE)

package/src/provider_runtime.py

@@ -137,6 +137,21 @@ REDACTED_PROMPT_ARG = "[prompt redacted]"
 # Documented Claude Code switch that stops it from setting and clearing the
 # terminal title, leaving cdx's shared title keeper as the only writer.
 CLAUDE_DISABLE_TERMINAL_TITLE_ENV = "CLAUDE_CODE_DISABLE_TERMINAL_TITLE"
+# Set by a running Claude Code session for its own child processes. When cdx is
+# started from inside one (a hook, or a terminal or script it spawned), the new
+# claude inherits them, treats itself as a child session and turns transcript
+# saving off, which breaks resume and usage backfill.
+CLAUDE_PARENT_SESSION_ENV = (
+    "CLAUDECODE",
+    "CLAUDE_CODE_CHILD_SESSION",
+    "CLAUDE_CODE_SESSION_ID",
+    "CLAUDE_CODE_SESSION_ATTENDED",
+    "CLAUDE_CODE_ENTRYPOINT",
+    "CLAUDE_CODE_EXECPATH",
+    "CLAUDE_CODE_MESSAGING_SOCKET",
+    "CLAUDE_CODE_MESSAGING_TOKEN",
+    "CLAUDE_PID",
+)
 CLAUDE_CLI_MODEL_ALIASES = {
     "claude-sonnet": "sonnet",
     "claude-opus": "opus",
@@ -216,6 +231,8 @@ def _claude_env(base_env, auth_home, own_terminal_title=False):
     env = {**base_env, **_home_env_overrides(auth_home)}
     env.pop("CLAUDE_CONFIG_DIR", None)
     env.pop("CODEX_HOME", None)
+    for key in CLAUDE_PARENT_SESSION_ENV:
+        env.pop(key, None)
     env.setdefault("ANTHROPIC_PROFILE", _anthropic_profile_name())
     if own_terminal_title:
         env[CLAUDE_DISABLE_TERMINAL_TITLE_ENV] = "1"
@@ -672,7 +689,8 @@ def _build_launch_spec(session, cwd=None, env_override=None, initial_prompt=None
         args += preference_args
         args += _extra_args(session)
         if initial_prompt:
-            args.append(initial_prompt)
+            # `--` keeps a prompt that starts with `-` from being read as an option.
+            args += ["--", initial_prompt]
         auth_home = _get_auth_home(session)
         claude_env = _claude_env(env, auth_home, own_terminal_title=True)
         oauth_token = _read_claude_launch_oauth_token(auth_home)
@@ -711,7 +729,8 @@ def _build_launch_spec(session, cwd=None, env_override=None, initial_prompt=None
         # failed only on the model pull.
         args = ["run", model] + _launch_config_args(session)
         if initial_prompt:
-            args.append(initial_prompt)
+            # `--` keeps a prompt that starts with `-` from being read as an option.
+            args += ["--", initial_prompt]
         return _wrap_launch_with_transcript(session, {
             "command": "ollama",
             "args": args,
@@ -728,7 +747,8 @@ def _build_launch_spec(session, cwd=None, env_override=None, initial_prompt=None
     args += _launch_config_args(session)
     args += preference_args
     if initial_prompt:
-        args.append(initial_prompt)
+        # `--` keeps a prompt that starts with `-` from being read as an option.
+        args += ["--", initial_prompt]
     return _wrap_launch_with_transcript(session, {
         "command": "codex",
         "args": args,
@@ -933,7 +953,8 @@ def _build_headless_launch_spec(session, cwd=None, env_override=None, initial_pr
         args += preference_args
         args += _extra_args(session)
         if initial_prompt:
-            args.append(initial_prompt)
+            # `--` keeps a prompt that starts with `-` from being read as an option.
+            args += ["--", initial_prompt]
         auth_home = _get_auth_home(session)
         claude_env = _claude_env(env, auth_home)
         oauth_token = _read_claude_launch_oauth_token(auth_home)
@@ -958,7 +979,8 @@ def _build_headless_launch_spec(session, cwd=None, env_override=None, initial_pr
             args += HEADLESS_CODEX_PERMISSION_ARGS.get(permission, [])
         args += preference_args
         if initial_prompt:
-            args.append(initial_prompt)
+            # `--` keeps a prompt that starts with `-` from being read as an option.
+            args += ["--", initial_prompt]
         return {
             "command": "codex",
             "args": args,