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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonoka-cli
-Version: 0.2.11
+Version: 0.2.12
 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.
@@ -57,18 +57,18 @@ 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`.
@@ -94,24 +94,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 +132,7 @@ Example output:
 
 ```
 nonoka-cli doctor
-✓ nonoka-cli 0.2.11
+✓ nonoka-cli 0.2.12
 ✓ Python 3.11
 ✓ opencode 1.18.2
 ✓ provider nonoka-opencode-provider@0.2.17
@@ -403,7 +403,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 +412,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 +430,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 +464,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 +483,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 +495,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 +512,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 +712,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.12}/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.
@@ -28,18 +28,18 @@ 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`.
@@ -65,24 +65,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 +103,7 @@ Example output:
 
 ```
 nonoka-cli doctor
-✓ nonoka-cli 0.2.11
+✓ nonoka-cli 0.2.12
 ✓ Python 3.11
 ✓ opencode 1.18.2
 ✓ provider nonoka-opencode-provider@0.2.17
@@ -374,7 +374,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 +383,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 +401,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 +435,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 +454,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 +466,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 +483,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 +683,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.12}/pyproject.toml

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

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

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

{nonoka_cli-0.2.11 → nonoka_cli-0.2.12}/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,6 +43,14 @@ from nonoka_cli.utils.logging import setup_logging
 logger = structlog.get_logger("nonoka_cli.cli")
 
 
+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() -> None:
   """Load .env files so config env-var substitution works transparently.
 
@@ -61,9 +70,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 +110,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 +131,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()
   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.12}/src/nonoka_cli/commands/doctor_cmd.py

@@ -63,14 +63,24 @@ def _run(
   timeout: float = 10.0,
   check: bool = False,
 ) -> subprocess.CompletedProcess[str]:
-  """Run a command and return its result."""
-  return subprocess.run(
-    cmd,
-    capture_output=True,
-    text=True,
-    timeout=timeout,
-    check=check,
-  )
+  """Run a diagnostic command without leaking OS/timeout exceptions."""
+  try:
+    return subprocess.run(
+      cmd,
+      capture_output=True,
+      text=True,
+      timeout=timeout,
+      check=check,
+    )
+  except subprocess.TimeoutExpired as exc:
+    return subprocess.CompletedProcess(
+      cmd,
+      124,
+      stdout=exc.stdout if isinstance(exc.stdout, str) else "",
+      stderr=f"timed out after {timeout:g}s",
+    )
+  except OSError as exc:
+    return subprocess.CompletedProcess(cmd, 127, stdout="", stderr=str(exc))
 
 
 def check_nonoka_cli_version() -> CheckResult:
@@ -123,6 +133,12 @@ def check_opencode() -> CheckResult:
   version = result.stdout.strip() if result.returncode == 0 else "unknown"
   if result.returncode == 0:
     return CheckResult("ok", f"opencode {version}")
+  if result.returncode == 124:
+    return CheckResult(
+      "error",
+      "opencode version check timed out after 5s",
+      "Run `opencode --version` directly; inspect proxy/startup configuration or reinstall OpenCode.",
+    )
   return CheckResult(
     "warn",
     f"opencode found but returned an error (reported {version})",

{nonoka_cli-0.2.11 → nonoka_cli-0.2.12}/src/nonoka_cli/commands/opencode_cmd.py

@@ -7,6 +7,7 @@ import copy
 import json
 import shutil
 import subprocess
+import sys
 from pathlib import Path
 from typing import Any
 
@@ -37,7 +38,15 @@ _PROVIDER_VERSION = _resolve_provider_version() or "0.2.17"
 # Tool categories that nonoka-cli needs OpenCode to auto-approve when
 # ``cli.auto_approve`` is enabled. These are OpenCode's native permission
 # keys, not nonoka-cli's internal tool names.
-_OPENCODE_AUTO_APPROVED_TOOLS = ["read", "bash", "edit", "write", "todowrite"]
+_OPENCODE_AUTO_APPROVED_TOOLS = [
+  "read",
+  "glob",
+  "grep",
+  "bash",
+  "edit",
+  "write",
+  "todowrite",
+]
 
 
 def _build_opencode_permission(config: CLIConfig) -> dict[str, str]:
@@ -57,9 +66,7 @@ def _build_opencode_permission(config: CLIConfig) -> dict[str, str]:
     permission[tool] = action
 
   # nonoka.yaml permissions take precedence over auto_approve defaults.
-  user_permissions = getattr(config, "permissions", None)
-  if user_permissions:
-    permission.update(user_permissions)
+  permission.update(config.permissions)
   # OpenCode 1.18 migrates ``tools.skill=false`` to a top-level permission,
   # but an agent-specific permission block overrides that migration.  Deny it
   # explicitly in both generated blocks so Build cannot prompt for the native
@@ -80,7 +87,7 @@ _DEFAULT_OPENCODE_CONFIG = {
       "npm": "nonoka-opencode-provider",
       "name": "Nonoka",
       "options": {
-        "serverCommand": ["nonoka-cli", "--server"],
+        "serverCommand": [sys.executable, "-m", "nonoka_cli", "--server"],
         "cwd": ".",
         "requireFocusedVerification": True,
         "verificationEnforcement": "strict",
@@ -293,7 +300,12 @@ def cmd_init(args: argparse.Namespace) -> int:
   if config.model:
     provider_block["models"] = {"default": {"name": f"Nonoka {config.model}"}}
   provider_block["options"]["configPath"] = str(resolved_config_path)
-  provider_block["options"]["serverCommand"] = ["nonoka-cli", "--server"]
+  provider_block["options"]["serverCommand"] = [
+    sys.executable,
+    "-m",
+    "nonoka_cli",
+    "--server",
+  ]
 
   if not isinstance(merged.get("provider"), dict):
     merged["provider"] = {}
@@ -374,7 +386,7 @@ def cmd_init(args: argparse.Namespace) -> int:
     )
 
   print(f"Provider: {_PROVIDER_PACKAGE}@{_PROVIDER_VERSION} ready")
-  print("Ready. Then run: nonoka-cli run")
+  print("Ready. Then run: nonoka run")
   return 0
 
 
@@ -386,42 +398,56 @@ def _add_config_arg(parser: Any) -> None:
   )
 
 
-def add_subparser(subparsers: Any) -> None:
-  """Register the ``opencode`` subcommand and its children."""
-  opencode_parser = subparsers.add_parser("opencode", help="Manage OpenCode integration")
-  _add_config_arg(opencode_parser)
-  opencode_parser.add_argument(
+def _configure_init_parser(parser: Any) -> None:
+  """Add the shared options for ``nonoka init`` and ``opencode init``."""
+  _add_config_arg(parser)
+  parser.add_argument(
+    "--yes",
+    "-y",
+    action="store_true",
+    help="Non-interactive mode (default; kept for script compatibility)",
+  )
+  parser.add_argument(
     "--cwd",
     dest="cwd",
     default=".",
     help="Directory to write opencode.json into (default: current directory)",
   )
-  opencode_parser.add_argument(
+  parser.add_argument(
     "--global",
     dest="global_",
     action="store_true",
     help="Write to ~/.config/opencode/opencode.json instead of ./opencode.json",
   )
+  parser.set_defaults(func=cmd_init)
 
-  opencode_subparsers = opencode_parser.add_subparsers(dest="opencode_command", required=True)
-  init_parser = opencode_subparsers.add_parser("init", help="Generate or merge opencode.json")
-  _add_config_arg(init_parser)
-  init_parser.add_argument(
-    "--yes",
-    "-y",
-    action="store_true",
-    help="Non-interactive mode (default; kept for script compatibility)",
+
+def add_init_subparser(subparsers: Any) -> None:
+  """Register the concise top-level alias for OpenCode integration setup."""
+  init_parser = subparsers.add_parser(
+    "init",
+    help="Generate or merge OpenCode integration config",
   )
-  init_parser.add_argument(
+  _configure_init_parser(init_parser)
+
+
+def add_subparser(subparsers: Any) -> None:
+  """Register the ``opencode`` subcommand and its children."""
+  opencode_parser = subparsers.add_parser("opencode", help="Manage OpenCode integration")
+  _add_config_arg(opencode_parser)
+  opencode_parser.add_argument(
     "--cwd",
     dest="cwd",
     default=".",
     help="Directory to write opencode.json into (default: current directory)",
   )
-  init_parser.add_argument(
+  opencode_parser.add_argument(
     "--global",
     dest="global_",
     action="store_true",
     help="Write to ~/.config/opencode/opencode.json instead of ./opencode.json",
   )
-  init_parser.set_defaults(func=cmd_init)
+
+  opencode_subparsers = opencode_parser.add_subparsers(dest="opencode_command", required=True)
+  init_parser = opencode_subparsers.add_parser("init", help="Generate or merge opencode.json")
+  _configure_init_parser(init_parser)

{nonoka_cli-0.2.11 → nonoka_cli-0.2.12}/src/nonoka_cli/commands/run_cmd.py

@@ -18,7 +18,7 @@ from nonoka_cli.commands.doctor_cmd import (
     check_provider,
 )
 from nonoka_cli.config.loader import ConfigLoader
-from nonoka_cli.safety import SrtSandbox
+from nonoka_cli.safety import PROCESS_SANDBOX_ENV, SrtSandbox
 
 
 def _has_opencode() -> bool:
@@ -40,7 +40,7 @@ def _ensure_opencode_config(args: argparse.Namespace, cwd: Path) -> int:
     if _has_opencode_config(cwd):
         return 0
 
-    print(f"No opencode.json found in {cwd}. Running 'nonoka-cli opencode init'...", file=sys.stderr)
+    print(f"No opencode.json found in {cwd}. Running 'nonoka init'...", file=sys.stderr)
 
     init_args = argparse.Namespace(
         config=getattr(args, "config", None),
@@ -74,7 +74,7 @@ def _run_preflight(args: argparse.Namespace, cwd: Path) -> tuple[Path, Any] | No
         if result.remedy:
             print(f"  Try: {result.remedy}", file=sys.stderr)
     if failures:
-        print(f"  Diagnose: nonoka-cli doctor --cwd {cwd}", file=sys.stderr)
+        print(f"  Diagnose: nonoka doctor --cwd {cwd}", file=sys.stderr)
         return None
 
     referenced = _referenced_config_path(cwd)
@@ -93,7 +93,7 @@ def _run_preflight(args: argparse.Namespace, cwd: Path) -> tuple[Path, Any] | No
             print("Error: --config does not match the config recorded in opencode.json.", file=sys.stderr)
             print(f"  Requested: {requested}", file=sys.stderr)
             print(f"  OpenCode:  {referenced}", file=sys.stderr)
-            print(f"  Try: nonoka-cli opencode init --cwd {cwd} --config {requested}", file=sys.stderr)
+            print(f"  Try: nonoka init --cwd {cwd} --config {requested}", file=sys.stderr)
             return None
 
     try:
@@ -189,7 +189,16 @@ def launch_tui(args: argparse.Namespace) -> int:
         executable = srt.executable()
         if not executable:
             if config.safety.required:
-                print("Error: required SRT sandbox is unavailable. Run `nonoka-cli doctor --check-sandbox`.", file=sys.stderr)
+                print(
+                    "Error: the required OpenCode process-tree sandbox needs SRT, "
+                    "but `srt` is unavailable.",
+                    file=sys.stderr,
+                )
+                print(
+                    "Install it with `npm install -g @anthropic-ai/sandbox-runtime`, "
+                    "then run `nonoka doctor --check-sandbox`.",
+                    file=sys.stderr,
+                )
                 return 1
         else:
             settings = srt.settings(cwd)
@@ -201,6 +210,10 @@ def launch_tui(args: argparse.Namespace) -> int:
         # for the whole TUI process tree so a launch cannot race an upgrade,
         # even if OpenCode reads update policy before the project config.
         launch_env["OPENCODE_DISABLE_AUTOUPDATE"] = "1"
+        if settings is not None:
+            # The bridge and its custom tools inherit the outer SRT boundary.
+            # Mark ownership so they do not try to bootstrap a nested SRT.
+            launch_env[PROCESS_SANDBOX_ENV] = "srt"
         result = subprocess.run(cmd, cwd=cwd, env=launch_env)
         return result.returncode
     except KeyboardInterrupt: