nonoka-cli 0.2.11__tar.gz → 0.2.13__tar.gz

{nonoka_cli-0.2.11 → nonoka_cli-0.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonoka-cli
-Version: 0.2.11
+Version: 0.2.13
 Summary: OpenCode backend for the Nonoka Agent framework
 License: MIT
 License-File: LICENSE
@@ -33,7 +33,7 @@ English | [简体中文](README.zh-CN.md)
 
 OpenCode backend for the [Nonoka](https://pypi.org/project/nonoka/) Agent framework.
 
-`nonoka-cli` runs as a stdio NDJSON bridge server (`nonoka-cli --server`) that
+Nonoka runs as a stdio NDJSON bridge server (`python -m nonoka_cli --server`) that
 talks to the `nonoka-opencode-provider` TypeScript package. When used inside
 OpenCode, Nonoka acts as the conversation/decision backend while OpenCode owns
 tool execution and human-in-the-loop (HITL) approval using its native tools.
@@ -51,24 +51,40 @@ The installer will:
 1. Check Python 3.10+ and Node/npm.
 2. Install or update OpenCode.
 3. Install `nonoka-cli` and the OpenCode provider.
-4. Generate `~/.config/nonoka/config.yaml` and `~/.config/opencode/opencode.json`.
+4. Ask where to keep the installation, configuration, and npm packages.
+5. Generate the Nonoka and project-level OpenCode configuration.
+
+The prompts show what each directory contains and provide these defaults:
+
+```text
+Installation directory (Python environment, launchers, and npm tools; e.g. ~/nonoka)
+  [~/.local/share/nonoka]
+Configuration directory (config.yaml and .env; e.g. ~/.config/nonoka)
+  [~/.config/nonoka]
+npm prefix (OpenCode/provider global packages)
+  [~/.local/share/nonoka/npm]
+```
+
+Press Enter to accept a default, or type a path such as `~/tools/nonoka`.
+The generated `INSTALL_DIR/bin/nonoka` launcher remembers all three paths, so
+using its absolute path does not require any environment exports.
 
 After installing, configure your API key and run `nonoka`:
 
 ```bash
 # Interactive: it will ask for your key and save it to ~/.config/nonoka/.env
-nonoka-cli config init
+nonoka config init
 
 # Or set it manually
 export DEEPSEEK_API_KEY=<your-key>
 
-nonoka-cli doctor
+nonoka doctor
 nonoka
 ```
 
-`nonoka` is a shortcut for `nonoka-cli run` and starts the OpenCode TUI with the
-Nonoka backend. You can also use `nonoka run --message "<task>"` for one-shot
-CLI usage.
+`nonoka` is the primary command. It starts the OpenCode TUI when invoked without
+a subcommand, while `nonoka run --message "<task>"` provides one-shot CLI usage.
+The legacy `nonoka-cli` executable remains available for compatibility.
 
 `nonoka-cli` automatically loads `~/.config/nonoka/.env` and `./.env` on startup,
 so you don't need to `export` every time if you save the key in `.env`.
@@ -76,6 +92,21 @@ so you don't need to `export` every time if you save the key in `.env`.
 > To use `uv` instead of `pip`, or to run non-interactively, pass flags:
 > `curl -fsSL https://nonoka.dev/install.sh | bash -s -- --uv --yes`.
 
+For a non-interactive custom location, use flags (environment variables with
+the same names are also supported):
+
+```bash
+bash install.sh --yes --uv --npm-opencode \
+  --install-dir ~/tools/nonoka \
+  --config-dir ~/.config/nonoka \
+  --npm-prefix ~/tools/nonoka/npm
+
+~/tools/nonoka/bin/nonoka doctor
+```
+
+The corresponding variables are `NONOKA_INSTALL_DIR`, `NONOKA_CONFIG_DIR`,
+and `NONOKA_NPM_PREFIX`. CLI flags take precedence over environment variables.
+
 ## Manual installation
 
 ```bash
@@ -94,24 +125,24 @@ npm install -g nonoka-opencode-provider
    `~/.config/nonoka/.env`):
 
 ```bash
-nonoka-cli config init
+nonoka config init
 ```
 
 For scripted setups, use the non-interactive mode (you'll still need to set the
 API key via `.env` or `export`):
 
 ```bash
-nonoka-cli config init --yes --model deepseek/deepseek-v4-pro
+nonoka config init --yes --model deepseek/deepseek-v4-pro
 ```
 
 2. Generate an OpenCode config in the current project or globally:
 
 ```bash
 # Project-level
-nonoka-cli opencode init
+nonoka init
 
 # User-level
-nonoka-cli opencode init --global
+nonoka init --global
 ```
 
 3. Make sure your model API key is exported, then run:
@@ -132,7 +163,7 @@ Example output:
 
 ```
 nonoka-cli doctor
-✓ nonoka-cli 0.2.11
+✓ nonoka-cli 0.2.13
 ✓ Python 3.11
 ✓ opencode 1.18.2
 ✓ provider nonoka-opencode-provider@0.2.17
@@ -403,7 +434,7 @@ similarity score without storing raw cache queries. `max_total_tokens` and
 is unavailable, `fail_on_unknown_cost: true` terminates the task rather than
 silently exceeding the cost budget.
 
-### `nonoka-cli opencode init`
+### `nonoka init`
 
 Generate or merge an `opencode.json` in the current directory and create
 `.opencode/agents/build.md` from your nonoka `system_prompt`. The generated
@@ -412,7 +443,8 @@ nonoka config path to the backend.
 
 ## OpenCode configuration
 
-`nonoka-cli opencode init` generates two things:
+`nonoka init` generates two things. `nonoka opencode init` remains as a
+backward-compatible, explicit spelling:
 
 1. `opencode.json` in the current directory, which wires OpenCode to the
    `nonoka-opencode-provider` package and sets HITL permissions.
@@ -429,7 +461,7 @@ A typical generated `opencode.json` looks like:
       "npm": "nonoka-opencode-provider",
       "name": "Nonoka",
       "options": {
-        "serverCommand": ["bash", "-c", "nonoka-cli --server 2>/tmp/nonoka-server.log"],
+        "serverCommand": ["/path/to/python", "-m", "nonoka_cli", "--server"],
         "cwd": ".",
         "configPath": "~/.config/nonoka/config.yaml"
       },
@@ -463,12 +495,12 @@ A typical generated `opencode.json` looks like:
 
 The `"tools": {"skill": false}` line disables OpenCode's native `skill:<name>`
 tool so it does not collide with nonoka's `load_skill` / `skill__<name>__<tool>`
-workflow. `nonoka-cli opencode init` writes this automatically.
+workflow. `nonoka init` writes this automatically.
 
 ## Prompt ownership
 
 Nonoka owns the canonical system prompt via `system_prompt` in
-`~/.config/nonoka/config.yaml`. When you run `nonoka-cli opencode init`, the
+`~/.config/nonoka/config.yaml`. When you run `nonoka init`, the
 command adapts that prompt and writes it to `.opencode/agents/build.md` so
 OpenCode uses it for its primary agent. OpenCode-specific guidelines (tool
 names, approval behavior, path conventions) are appended automatically; they are
@@ -482,10 +514,9 @@ When running inside OpenCode, HITL is handled by OpenCode itself. The generated
 Nonoka forwards OpenCode's native tool definitions to the model, approval
 dialogs render natively for `bash`, `read`, `write`, and `edit` operations.
 
-`nonoka-cli`'s own `cli.auto_approve` and `hitl.policy` settings only apply to
-standalone server / CLI mode. In OpenCode mode, permissions are governed by the
-`permission` block in `opencode.json`. To keep `nonoka.yaml` as the single
-source of truth, add a `permissions` block and re-run `nonoka-cli opencode init`:
+In OpenCode mode, `nonoka init` derives both generated permission blocks from
+`cli.auto_approve` and optional `permissions` overrides in `nonoka.yaml`. Add a
+`permissions` block and re-run `nonoka init` to keep YAML as the source of truth:
 
 ```yaml
 permissions:
@@ -495,8 +526,9 @@ permissions:
   edit: ask
 ```
 
-`cli.auto_approve: true` still auto-allows the core coding tools when no
-`permissions` block is present. For standalone mode, use `hitl.policy: auto`.
+`cli.auto_approve: true` auto-allows the core coding tools, including read-only
+`glob` and `grep`, before explicit overrides are applied. For standalone mode,
+`hitl.policy` still controls Nonoka-owned tool approval.
 
 ## External-tools mode
 
@@ -511,7 +543,8 @@ default. OpenCode sends its native tool list (e.g. `bash`, `read`, `write`,
   `Runner.resume_external_tools()`.
 
 To start external-tools mode, run OpenCode with the generated `opencode.json`;
-the provider spawns `nonoka-cli --server` automatically.
+the provider automatically spawns `python -m nonoka_cli --server` with the
+interpreter that generated the project config.
 
 ## MCP and Skill support
 
@@ -710,7 +743,8 @@ here because they affect the TUI/HITL experience but cannot be fixed inside
 
 ## Server logs and request traces
 
-When running inside OpenCode, the provider spawns `nonoka-cli --server` as a
+When running inside OpenCode, the provider spawns the interpreter-pinned
+`python -m nonoka_cli --server` command as a
 long-lived NDJSON bridge. Server stderr is redirected by the provider to a
 per-working-directory log file so it does not pollute OpenCode's TUI:
 

{nonoka_cli-0.2.11 → nonoka_cli-0.2.13}/README.md

@@ -4,7 +4,7 @@ English | [简体中文](README.zh-CN.md)
 
 OpenCode backend for the [Nonoka](https://pypi.org/project/nonoka/) Agent framework.
 
-`nonoka-cli` runs as a stdio NDJSON bridge server (`nonoka-cli --server`) that
+Nonoka runs as a stdio NDJSON bridge server (`python -m nonoka_cli --server`) that
 talks to the `nonoka-opencode-provider` TypeScript package. When used inside
 OpenCode, Nonoka acts as the conversation/decision backend while OpenCode owns
 tool execution and human-in-the-loop (HITL) approval using its native tools.
@@ -22,24 +22,40 @@ The installer will:
 1. Check Python 3.10+ and Node/npm.
 2. Install or update OpenCode.
 3. Install `nonoka-cli` and the OpenCode provider.
-4. Generate `~/.config/nonoka/config.yaml` and `~/.config/opencode/opencode.json`.
+4. Ask where to keep the installation, configuration, and npm packages.
+5. Generate the Nonoka and project-level OpenCode configuration.
+
+The prompts show what each directory contains and provide these defaults:
+
+```text
+Installation directory (Python environment, launchers, and npm tools; e.g. ~/nonoka)
+  [~/.local/share/nonoka]
+Configuration directory (config.yaml and .env; e.g. ~/.config/nonoka)
+  [~/.config/nonoka]
+npm prefix (OpenCode/provider global packages)
+  [~/.local/share/nonoka/npm]
+```
+
+Press Enter to accept a default, or type a path such as `~/tools/nonoka`.
+The generated `INSTALL_DIR/bin/nonoka` launcher remembers all three paths, so
+using its absolute path does not require any environment exports.
 
 After installing, configure your API key and run `nonoka`:
 
 ```bash
 # Interactive: it will ask for your key and save it to ~/.config/nonoka/.env
-nonoka-cli config init
+nonoka config init
 
 # Or set it manually
 export DEEPSEEK_API_KEY=<your-key>
 
-nonoka-cli doctor
+nonoka doctor
 nonoka
 ```
 
-`nonoka` is a shortcut for `nonoka-cli run` and starts the OpenCode TUI with the
-Nonoka backend. You can also use `nonoka run --message "<task>"` for one-shot
-CLI usage.
+`nonoka` is the primary command. It starts the OpenCode TUI when invoked without
+a subcommand, while `nonoka run --message "<task>"` provides one-shot CLI usage.
+The legacy `nonoka-cli` executable remains available for compatibility.
 
 `nonoka-cli` automatically loads `~/.config/nonoka/.env` and `./.env` on startup,
 so you don't need to `export` every time if you save the key in `.env`.
@@ -47,6 +63,21 @@ so you don't need to `export` every time if you save the key in `.env`.
 > To use `uv` instead of `pip`, or to run non-interactively, pass flags:
 > `curl -fsSL https://nonoka.dev/install.sh | bash -s -- --uv --yes`.
 
+For a non-interactive custom location, use flags (environment variables with
+the same names are also supported):
+
+```bash
+bash install.sh --yes --uv --npm-opencode \
+  --install-dir ~/tools/nonoka \
+  --config-dir ~/.config/nonoka \
+  --npm-prefix ~/tools/nonoka/npm
+
+~/tools/nonoka/bin/nonoka doctor
+```
+
+The corresponding variables are `NONOKA_INSTALL_DIR`, `NONOKA_CONFIG_DIR`,
+and `NONOKA_NPM_PREFIX`. CLI flags take precedence over environment variables.
+
 ## Manual installation
 
 ```bash
@@ -65,24 +96,24 @@ npm install -g nonoka-opencode-provider
    `~/.config/nonoka/.env`):
 
 ```bash
-nonoka-cli config init
+nonoka config init
 ```
 
 For scripted setups, use the non-interactive mode (you'll still need to set the
 API key via `.env` or `export`):
 
 ```bash
-nonoka-cli config init --yes --model deepseek/deepseek-v4-pro
+nonoka config init --yes --model deepseek/deepseek-v4-pro
 ```
 
 2. Generate an OpenCode config in the current project or globally:
 
 ```bash
 # Project-level
-nonoka-cli opencode init
+nonoka init
 
 # User-level
-nonoka-cli opencode init --global
+nonoka init --global
 ```
 
 3. Make sure your model API key is exported, then run:
@@ -103,7 +134,7 @@ Example output:
 
 ```
 nonoka-cli doctor
-✓ nonoka-cli 0.2.11
+✓ nonoka-cli 0.2.13
 ✓ Python 3.11
 ✓ opencode 1.18.2
 ✓ provider nonoka-opencode-provider@0.2.17
@@ -374,7 +405,7 @@ similarity score without storing raw cache queries. `max_total_tokens` and
 is unavailable, `fail_on_unknown_cost: true` terminates the task rather than
 silently exceeding the cost budget.
 
-### `nonoka-cli opencode init`
+### `nonoka init`
 
 Generate or merge an `opencode.json` in the current directory and create
 `.opencode/agents/build.md` from your nonoka `system_prompt`. The generated
@@ -383,7 +414,8 @@ nonoka config path to the backend.
 
 ## OpenCode configuration
 
-`nonoka-cli opencode init` generates two things:
+`nonoka init` generates two things. `nonoka opencode init` remains as a
+backward-compatible, explicit spelling:
 
 1. `opencode.json` in the current directory, which wires OpenCode to the
    `nonoka-opencode-provider` package and sets HITL permissions.
@@ -400,7 +432,7 @@ A typical generated `opencode.json` looks like:
       "npm": "nonoka-opencode-provider",
       "name": "Nonoka",
       "options": {
-        "serverCommand": ["bash", "-c", "nonoka-cli --server 2>/tmp/nonoka-server.log"],
+        "serverCommand": ["/path/to/python", "-m", "nonoka_cli", "--server"],
         "cwd": ".",
         "configPath": "~/.config/nonoka/config.yaml"
       },
@@ -434,12 +466,12 @@ A typical generated `opencode.json` looks like:
 
 The `"tools": {"skill": false}` line disables OpenCode's native `skill:<name>`
 tool so it does not collide with nonoka's `load_skill` / `skill__<name>__<tool>`
-workflow. `nonoka-cli opencode init` writes this automatically.
+workflow. `nonoka init` writes this automatically.
 
 ## Prompt ownership
 
 Nonoka owns the canonical system prompt via `system_prompt` in
-`~/.config/nonoka/config.yaml`. When you run `nonoka-cli opencode init`, the
+`~/.config/nonoka/config.yaml`. When you run `nonoka init`, the
 command adapts that prompt and writes it to `.opencode/agents/build.md` so
 OpenCode uses it for its primary agent. OpenCode-specific guidelines (tool
 names, approval behavior, path conventions) are appended automatically; they are
@@ -453,10 +485,9 @@ When running inside OpenCode, HITL is handled by OpenCode itself. The generated
 Nonoka forwards OpenCode's native tool definitions to the model, approval
 dialogs render natively for `bash`, `read`, `write`, and `edit` operations.
 
-`nonoka-cli`'s own `cli.auto_approve` and `hitl.policy` settings only apply to
-standalone server / CLI mode. In OpenCode mode, permissions are governed by the
-`permission` block in `opencode.json`. To keep `nonoka.yaml` as the single
-source of truth, add a `permissions` block and re-run `nonoka-cli opencode init`:
+In OpenCode mode, `nonoka init` derives both generated permission blocks from
+`cli.auto_approve` and optional `permissions` overrides in `nonoka.yaml`. Add a
+`permissions` block and re-run `nonoka init` to keep YAML as the source of truth:
 
 ```yaml
 permissions:
@@ -466,8 +497,9 @@ permissions:
   edit: ask
 ```
 
-`cli.auto_approve: true` still auto-allows the core coding tools when no
-`permissions` block is present. For standalone mode, use `hitl.policy: auto`.
+`cli.auto_approve: true` auto-allows the core coding tools, including read-only
+`glob` and `grep`, before explicit overrides are applied. For standalone mode,
+`hitl.policy` still controls Nonoka-owned tool approval.
 
 ## External-tools mode
 
@@ -482,7 +514,8 @@ default. OpenCode sends its native tool list (e.g. `bash`, `read`, `write`,
   `Runner.resume_external_tools()`.
 
 To start external-tools mode, run OpenCode with the generated `opencode.json`;
-the provider spawns `nonoka-cli --server` automatically.
+the provider automatically spawns `python -m nonoka_cli --server` with the
+interpreter that generated the project config.
 
 ## MCP and Skill support
 
@@ -681,7 +714,8 @@ here because they affect the TUI/HITL experience but cannot be fixed inside
 
 ## Server logs and request traces
 
-When running inside OpenCode, the provider spawns `nonoka-cli --server` as a
+When running inside OpenCode, the provider spawns the interpreter-pinned
+`python -m nonoka_cli --server` command as a
 long-lived NDJSON bridge. Server stderr is redirected by the provider to a
 per-working-directory log file so it does not pollute OpenCode's TUI:
 

{nonoka_cli-0.2.11 → nonoka_cli-0.2.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nonoka-cli"
-version = "0.2.11"
+version = "0.2.13"
 description = "OpenCode backend for the Nonoka Agent framework"
 readme = "README.md"
 license = { text = "MIT" }

{nonoka_cli-0.2.11 → nonoka_cli-0.2.13}/src/nonoka_cli/__init__.py

@@ -2,4 +2,4 @@
 
 from __future__ import annotations
 
-__version__ = "0.2.11"
+__version__ = "0.2.13"

{nonoka_cli-0.2.11 → nonoka_cli-0.2.13}/src/nonoka_cli/cli.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import argparse
+import importlib.metadata
 import logging
 import os
 import sys
@@ -42,17 +43,37 @@ from nonoka_cli.utils.logging import setup_logging
 logger = structlog.get_logger("nonoka_cli.cli")
 
 
-def _load_env_files() -> None:
+def _version() -> str:
+  """Return the installed CLI version, including editable installs."""
+  try:
+    return importlib.metadata.version("nonoka-cli")
+  except importlib.metadata.PackageNotFoundError:
+    return "unknown"
+
+
+def _load_env_files(config_path: Path | str | None = None) -> None:
   """Load .env files so config env-var substitution works transparently.
 
   Priority (lowest to highest):
-  1. ~/.config/nonoka/.env
-  2. ./.env
+  1. $NONOKA_CONFIG_DIR/.env or ~/.config/nonoka/.env
+  2. the explicit config file's sibling .env
+  3. ./.env
   Existing environment variables always win.
   """
-  global_env = Path.home() / ".config" / "nonoka" / ".env"
+  configured_dir = Path(
+    os.getenv("NONOKA_CONFIG_DIR", str(Path.home() / ".config" / "nonoka"))
+  ).expanduser()
+  candidates = [configured_dir / ".env"]
+  if config_path is not None:
+    candidates.append(Path(config_path).expanduser().resolve().parent / ".env")
   local_env = Path.cwd() / ".env"
-  for path in (global_env, local_env):
+  candidates.append(local_env)
+  seen: set[Path] = set()
+  for path in candidates:
+    path = path.resolve()
+    if path in seen:
+      continue
+    seen.add(path)
     if path.exists():
       load_dotenv(dotenv_path=path, override=False)
       logger.debug("loaded_env_file", path=str(path))
@@ -61,9 +82,14 @@ def _load_env_files() -> None:
 def _build_parser() -> argparse.ArgumentParser:
   """Build the argument parser."""
   parser = argparse.ArgumentParser(
-    prog="nonoka-cli",
+    prog="nonoka",
     description="Terminal frontend for the Nonoka Agent framework",
   )
+  parser.add_argument(
+    "--version",
+    action="version",
+    version=f"%(prog)s {_version()}",
+  )
   parser.add_argument(
     "--config",
     type=Path,
@@ -96,6 +122,7 @@ def _build_parser() -> argparse.ArgumentParser:
   subparsers = parser.add_subparsers(dest="command")
   config_cmd.add_subparser(subparsers)
   doctor_cmd.add_subparser(subparsers)
+  opencode_cmd.add_init_subparser(subparsers)
   opencode_cmd.add_subparser(subparsers)
   plugin_cmd.add_subparser(subparsers)
   run_cmd.add_subparser(subparsers)
@@ -116,28 +143,23 @@ def main() -> int:
   parser = _build_parser()
   args = parser.parse_args()
 
-  # Load .env files early so configuration and LLM providers see API keys.
-  _load_env_files()
+  log_level = (
+    logging.DEBUG if args.debug
+    else logging.INFO if args.verbose
+    else logging.WARNING
+  )
+  setup_logging(level=log_level, console=args.verbose or args.debug)
 
+  # Load .env files after logging is configured so the debug-only path message
+  # does not leak into normal command output.
+  _load_env_files(args.config)
   if args.server:
     return server_main(config_path=args.config, model=args.model)
 
   if args.command and getattr(args, "func", None):
-    log_level = (
-      logging.DEBUG if args.debug
-      else logging.INFO if args.verbose
-      else logging.WARNING
-    )
-    setup_logging(level=log_level, console=args.verbose or args.debug)
     return args.func(args)
 
   # No subcommand given: launch the OpenCode TUI by default.
-  log_level = (
-    logging.DEBUG if args.debug
-    else logging.INFO if args.verbose
-    else logging.WARNING
-  )
-  setup_logging(level=log_level, console=args.verbose or args.debug)
   return run_cmd.launch_tui(args)
 
 

{nonoka_cli-0.2.11 → nonoka_cli-0.2.13}/src/nonoka_cli/commands/config_cmd.py

@@ -23,6 +23,16 @@ logger = structlog.get_logger("nonoka_cli.commands.config")
 _GLOBAL_ENV_PATH = Path.home() / ".config" / "nonoka" / ".env"
 
 
+def _env_path_for_config(config_path: Path | None) -> Path:
+  """Keep credentials beside an explicitly selected configuration file."""
+  if config_path is not None:
+    return config_path.expanduser().resolve().parent / ".env"
+  configured_dir = os.getenv("NONOKA_CONFIG_DIR")
+  if configured_dir:
+    return Path(configured_dir).expanduser().resolve() / ".env"
+  return _GLOBAL_ENV_PATH
+
+
 def _load_manager(args: argparse.Namespace) -> ConfigManager:
   """Load or create a ConfigManager from the requested path."""
   path = getattr(args, "config", None)
@@ -162,23 +172,23 @@ def _api_key_env_for_model(model: str) -> str:
   return "OPENAI_API_KEY"
 
 
-def _api_key_source_summary(env_var: str) -> str:
+def _api_key_source_summary(env_var: str, env_path: Path = _GLOBAL_ENV_PATH) -> str:
   """Return a short description of where the API key is currently sourced."""
   if os.getenv(env_var):
     return f"from environment (${env_var})"
-  if _load_env_file(_GLOBAL_ENV_PATH).get(env_var):
-    return f"from {_GLOBAL_ENV_PATH}"
+  if _load_env_file(env_path).get(env_var):
+    return f"from {env_path}"
   return ""
 
 
-def _collect_api_key(model: str) -> tuple[str, str, str]:
+def _collect_api_key(model: str, env_path: Path = _GLOBAL_ENV_PATH) -> tuple[str, str, str]:
   """Collect API key info and optionally persist it.
 
   Returns:
     (env_var_name, api_key_for_config, summary_for_user)
   """
   env_var = _api_key_env_for_model(model)
-  existing = os.getenv(env_var) or _load_env_file(_GLOBAL_ENV_PATH).get(env_var)
+  existing = os.getenv(env_var) or _load_env_file(env_path).get(env_var)
   if existing:
     print(f"Found {env_var} already set.")
     return env_var, "", f"using existing ${env_var}"
@@ -203,16 +213,17 @@ def _collect_api_key(model: str) -> tuple[str, str, str]:
     return env_var, "", "not saved"
 
   # Default: save to .env
-  _write_env_file(_GLOBAL_ENV_PATH, env_var, key_input)
+  _write_env_file(env_path, env_var, key_input)
   # Make it available for the rest of this process too.
   os.environ[env_var] = key_input
-  print(f"Saved {env_var} to {_GLOBAL_ENV_PATH}")
-  return env_var, "", f"saved to {_GLOBAL_ENV_PATH}"
+  print(f"Saved {env_var} to {env_path}")
+  return env_var, "", f"saved to {env_path}"
 
 
 def cmd_init(args: argparse.Namespace) -> int:
   """Create an initial nonoka config, interactively or with --yes defaults."""
-  path = Path(args.config) if args.config else ConfigLoader.DEFAULT_PATH
+  path = Path(args.config).expanduser() if args.config else ConfigLoader.DEFAULT_PATH
+  env_path = _env_path_for_config(path if args.config else None)
 
   print(f"Creating nonoka configuration at: {path}")
 
@@ -220,7 +231,7 @@ def cmd_init(args: argparse.Namespace) -> int:
     model = getattr(args, "model", None) or "deepseek/deepseek-v4-pro"
     auto_approve = getattr(args, "auto_approve", False)
     env_var = _api_key_env_for_model(model)
-    key_summary = _api_key_source_summary(env_var) or "not configured"
+    key_summary = _api_key_source_summary(env_var, env_path) or "not configured"
 
     config = CLIConfig(
       model=model,
@@ -240,9 +251,9 @@ def cmd_init(args: argparse.Namespace) -> int:
     print(f"Configuration saved to {path}")
     print(f"Model: {model}")
     print(f"API key ({env_var}): {key_summary}")
-    if not os.getenv(env_var) and not _load_env_file(_GLOBAL_ENV_PATH).get(env_var):
+    if not os.getenv(env_var) and not _load_env_file(env_path).get(env_var):
       print(
-        f"Set your API key with: nonoka-cli config init (interactive) "
+        f"Set your API key with: nonoka config init (interactive) "
         f"or export {env_var}=<your-key>"
       )
     return 0
@@ -254,7 +265,7 @@ def cmd_init(args: argparse.Namespace) -> int:
   )
 
   model = _read_input("Model identifier", "deepseek/deepseek-v4-pro")
-  env_var, api_key_value, key_summary = _collect_api_key(model)
+  env_var, api_key_value, key_summary = _collect_api_key(model, env_path)
 
   system_prompt = _read_input(
     "Optional system prompt",