agentproc 0.2.1__tar.gz → 0.4.0__tar.gz

{agentproc-0.2.1 → agentproc-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentproc
-Version: 0.2.1
+Version: 0.4.0
 Summary: AgentProc Protocol SDK + CLI — connect any Agent CLI to a messaging platform
 License: MIT
 Project-URL: Homepage, https://github.com/jeffkit/agentproc

{agentproc-0.2.1 → agentproc-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "agentproc"
-version = "0.2.1"
+version = "0.4.0"
 description = "AgentProc Protocol SDK + CLI — connect any Agent CLI to a messaging platform"
 readme = "README.md"
 license = { text = "MIT" }

{agentproc-0.2.1 → agentproc-0.4.0}/src/agentproc/__init__.py

@@ -47,8 +47,35 @@ __all__ = [
     "load_history",
     "append_history",
     "session_file_path",
+    "__version__",
 ]
 
+
+def _read_version() -> str:
+    try:
+        from importlib.metadata import version, PackageNotFoundError
+        try:
+            return version("agentproc")
+        except PackageNotFoundError:
+            pass
+    except ImportError:
+        pass
+    try:
+        from pathlib import Path
+        toml_path = Path(__file__).resolve().parents[2] / "pyproject.toml"
+        if toml_path.exists():
+            import re
+            text = toml_path.read_text(encoding="utf-8")
+            m = re.search(r'^version\s*=\s*"([^"]+)"', text, re.MULTILINE)
+            if m:
+                return m.group(1)
+    except Exception:
+        pass
+    return "0.0.0+unknown"
+
+
+__version__ = _read_version()
+
 PROTOCOL_VERSION = "0.1"
 
 

{agentproc-0.2.1 → agentproc-0.4.0}/src/agentproc/cli.py

@@ -25,7 +25,20 @@ from .runner import (
 
 
 def _read_pkg_version() -> str:
-    """Read version from pyproject.toml at runtime (zero-dep)."""
+    """Read installed package version.
+
+    Primary: importlib.metadata (works after pip/pipx install).
+    Fallback: parse pyproject.toml (works in source checkout, dev mode).
+    """
+    try:
+        from importlib.metadata import version, PackageNotFoundError
+        try:
+            return version("agentproc")
+        except PackageNotFoundError:
+            pass
+    except ImportError:
+        pass
+    # Fallback for source checkout (development, not installed).
     try:
         toml_path = Path(__file__).resolve().parents[2] / "pyproject.toml"
         if toml_path.exists():
@@ -214,6 +227,27 @@ def build_parser() -> argparse.ArgumentParser:
 def show_help() -> None:
     sys.stdout.write(f"""agentproc v{PKG_VERSION} (protocol {PROTOCOL_VERSION})
 
+The fastest way in:
+  agentproc hub list                          # see what's available
+  agentproc hub run echo-agent -p "hello"     # smoke test (no API key)
+  cd ~/projects/my-app && agentproc hub run claude-code -p "explain this"
+
+The CLI fetches the profile from the GitHub hub on first use, caches it at
+~/.agentproc/cache/hub/<name>/ (24h TTL), and uses your current directory as
+the agent's cwd. Set GITHUB_TOKEN to raise the rate limit (see `agentproc hub --help`).
+
+Hub subcommands:
+  hub list                          List all profiles in the hub
+  hub show <name>                   Show a profile's README
+  hub run <name> [run-options]      Fetch (if needed) and run a profile
+  hub install <name>                Copy a profile to the current directory
+
+Run `agentproc hub --help` for the full hub reference.
+
+───────────────────────────────────────────────────────────────────────────────
+
+Advanced: run a local profile YAML directly (no hub fetch)
+
 Usage:
   agentproc --profile <path.yaml> --prompt "hello" [options]
 
@@ -227,7 +261,8 @@ Session:
   --from <user>             Sender identifier
 
 Execution:
-  --cwd <path>              Override profile.cwd
+  --cwd <path>              Override profile.cwd (relative paths resolve
+                            against the profile.yaml's directory)
   --env KEY=VALUE           Extra env var (repeatable)
   --timeout <secs>          Override profile.timeout_secs
   --no-stream               Set AGENT_STREAMING=0
@@ -250,9 +285,16 @@ Output semantics:
 The final session id is printed on stderr as: agentproc:session:<id>
 
 Examples:
-  agentproc --profile hub/echo-agent/profile.yaml --prompt "hi"
-  agentproc -p hub/claude-code/profile.yaml --prompt "hello" --verbose
-  cat prompt.txt | agentproc -p prof.yaml --stdin
+  # Local profile (relative cwd resolves next to profile.yaml):
+  agentproc --profile ./hub/echo-agent/profile.yaml --prompt "hi"
+
+  # Local claude-code profile, claude runs against your project:
+  agentproc --profile ./hub/claude-code/profile.yaml \\
+            --prompt "explain this codebase" \\
+            --cwd /path/to/your/project
+
+  # Prompt from stdin:
+  cat prompt.txt | agentproc --profile prof.yaml --stdin
 """)
 
 
@@ -261,56 +303,193 @@ def show_version() -> None:
 
 
 # ---------------------------------------------------------------------------
-# Main
+# Hub subcommand dispatcher
 # ---------------------------------------------------------------------------
 
-def main(argv: Optional[List[str]] = None) -> int:
-    if argv is None:
-        argv = sys.argv[1:]
+def _run_hub_subcommand(args: List[str]) -> int:
+    """Handle `agentproc hub <list|show|install|run> [args]`."""
+    from . import hub as hub_mod
+
+    if not args or args[0] in ("-h", "--help"):
+        _show_hub_help()
+        return 0
+
+    sub = args[0]
+    rest = args[1:]
 
-    parser = build_parser()
-    opts = parser.parse_args(argv)
+    # Any subcommand with --help/-h shows the hub help uniformly.
+    if "--help" in rest or "-h" in rest:
+        _show_hub_help()
+        return 0
+
+    # Common flag
+    refresh = "--refresh" in rest
+
+    # Separate hub-level flags from runner-level flags and positional args.
+    # In the `hub run` context, `-p` means `--prompt` (the profile name is
+    # positional, not a path), so normalize it before handing off to argparse.
+    positional: List[str] = []
+    runner_args: List[str] = []
+    takes_value = {"--prompt", "-p", "--session", "--session-name", "--from",
+                   "--cwd", "--env", "--timeout"}
+    boolean_flags = {"--no-stream", "--verbose", "--quiet", "--raw", "--stdin"}
+    i = 0
+    while i < len(rest):
+        a = rest[i]
+        if a in ("--refresh", "-h", "--help"):
+            i += 1
+            continue
+        if a in takes_value:
+            runner_args.append("--prompt" if a == "-p" else a)
+            if i + 1 < len(rest):
+                runner_args.append(rest[i + 1])
+                i += 2
+            else:
+                i += 1
+            continue
+        if a in boolean_flags:
+            runner_args.append(a)
+            i += 1
+            continue
+        if a.startswith("-"):
+            sys.stderr.write(f"error: unknown option: {a}\n\n")
+            _show_hub_help()
+            return 2
+        positional.append(a)
+        i += 1
 
-    if opts.help:
-        show_help()
+    def _log(msg: str) -> None:
+        sys.stderr.write(msg + "\n")
+
+    if sub == "list":
+        profiles = hub_mod.list_profiles(on_log=_log)
+        sys.stdout.write("Available profiles in the official hub:\n\n")
+        for p in profiles:
+            sys.stdout.write(
+                f"  {p['name']:<15} {p['tested']:<12} {p['description'][:60]}\n"
+            )
+        sys.stdout.write('\nRun `agentproc hub run <name> -p "hi"` to use one.\n')
         return 0
-    if opts.version:
-        show_version()
+
+    if sub == "show":
+        if not positional:
+            sys.stderr.write("error: hub show requires a profile name\n")
+            return 2
+        readme = hub_mod.show_readme(positional[0], refresh=refresh, on_log=_log)
+        sys.stdout.write(readme)
+        if not readme.endswith("\n"):
+            sys.stdout.write("\n")
+        return 0
+
+    if sub == "install":
+        if not positional:
+            sys.stderr.write("error: hub install requires a profile name\n")
+            return 2
+        dest = hub_mod.install_profile(positional[0], Path.cwd(), refresh=refresh, on_log=_log)
+        # Tell the user exactly what they got and how to run it next.
+        rel_profile = os.path.relpath(str(dest / "profile.yaml"), str(Path.cwd()))
+        sys.stderr.write("\n")
+        sys.stderr.write(f"Next: edit {rel_profile} if you want, then run:\n")
+        sys.stderr.write(
+            f'  agentproc --profile {rel_profile} --prompt "hi" --cwd <your-project>\n'
+        )
         return 0
 
-    if not opts.profile:
-        sys.stderr.write("error: --profile is required\n\n")
-        show_help()
+    if sub == "run":
+        if not positional:
+            sys.stderr.write("error: hub run requires a profile name\n")
+            return 2
+        profile_name = positional[0]
+        cache_dir = hub_mod.fetch_profile(profile_name, refresh=refresh, on_log=_log)
+        profile_path = str(cache_dir / "profile.yaml")
+
+        # Parse the runner-level flags we separated out above.
+        parser = build_parser()
+        opts = parser.parse_args(runner_args)
+
+        if not opts.prompt and not opts.stdin:
+            sys.stderr.write("error: hub run requires --prompt <text> or --stdin\n")
+            return 2
+
+        # hub run uses the user's current directory as the agent's cwd when
+        # --cwd is not given. Matches the hub docs and the right default for
+        # AI-CLI profiles where the agent should operate on the user's project.
+        if not opts.cwd:
+            opts.cwd = str(Path.cwd())
+
+        return _run_agent_with_profile(profile_path, opts)
+
+    sys.stderr.write(f"error: unknown hub subcommand: {sub}\n\n")
+    _show_hub_help()
+    return 2
+
+
+def _show_hub_help() -> None:
+    sys.stdout.write("""agentproc hub — manage profiles from the official Hub
+
+Usage:
+  agentproc hub list                       List all profiles in the hub
+  agentproc hub show <name>                Show a profile's README
+  agentproc hub install <name>             Copy a profile to the current directory
+  agentproc hub run <name> [run-options]   Fetch (if needed) and run a profile
+
+Hub run options (same as the regular --profile runner):
+  -p, --prompt <text>          User message (or use --stdin)
+  --cwd <path>                 Override profile.cwd (default: current dir)
+  --env KEY=VALUE              Extra env var (repeatable)
+  --session <id>               Previous session id for multi-turn
+  --timeout <secs>             Override profile.timeout_secs
+  --no-stream                  Disable streaming
+  --verbose / --quiet          Protocol line visibility (default: verbose)
+  --stdin                      Read prompt from stdin
+
+Common options:
+  --refresh                    Force re-fetch from GitHub (ignore cache)
+  -h, --help                   Show this help
+
+Examples:
+  agentproc hub list
+  agentproc hub run echo-agent -p "hello"
+  cd ~/projects/my-app && agentproc hub run claude-code -p "explain this" --env ANTHROPIC_API_KEY=$KEY
+  agentproc hub show codex
+  agentproc hub install agy
+
+Profiles are cached at ~/.agentproc/cache/hub/<name>/ (24h TTL).
+""")
+
+
+def _run_agent_with_profile(profile_path: str, opts) -> int:
+    """Shared runner logic for both --profile path and hub run path."""
+    profile_dir = str(Path(profile_path).resolve().parent)
+    try:
+        yaml_text = Path(profile_path).resolve().read_text(encoding="utf-8")
+        profile_raw = parse_yaml(yaml_text)
+    except FileNotFoundError:
+        sys.stderr.write(f"error: profile not found: {profile_path}\n")
+        return 2
+    except Exception as e:
+        sys.stderr.write(f"error: failed to parse profile {profile_path}: {e}\n")
         return 2
 
+    # Read prompt.
     prompt = opts.prompt
     if opts.stdin:
         try:
             prompt = sys.stdin.read().rstrip("\n")
         except KeyboardInterrupt:
-            return EXIT_ERROR
+            return 1
     if prompt is None:
         sys.stderr.write("error: --prompt (or --stdin) is required\n")
         return 2
 
     extra_env: Dict[str, str] = {}
-    for kv in opts.env:
+    for kv in opts.env or []:
         eq = kv.find("=")
         if eq < 0:
             sys.stderr.write(f"error: --env expects KEY=VALUE, got: {kv}\n")
             return 2
         extra_env[kv[:eq]] = kv[eq + 1:]
 
-    try:
-        yaml_text = Path(opts.profile).resolve().read_text(encoding="utf-8")
-        profile_raw = parse_yaml(yaml_text)
-    except FileNotFoundError:
-        sys.stderr.write(f"error: profile not found: {opts.profile}\n")
-        return 2
-    except Exception as e:
-        sys.stderr.write(f"error: failed to parse profile {opts.profile}: {e}\n")
-        return 2
-
     streaming = False if opts.no_stream else None
 
     if opts.raw:
@@ -323,6 +502,7 @@ def main(argv: Optional[List[str]] = None) -> int:
                 from_user=opts.from_user,
                 streaming=streaming,
                 cwd=opts.cwd,
+                profile_dir=profile_dir,
                 extra_env=extra_env,
                 timeout_secs=opts.timeout,
             ),
@@ -343,6 +523,7 @@ def main(argv: Optional[List[str]] = None) -> int:
             from_user=opts.from_user,
             streaming=streaming,
             cwd=opts.cwd,
+            profile_dir=profile_dir,
             extra_env=extra_env,
             timeout_secs=opts.timeout,
             on_partial=lambda t: verbose and sys.stderr.write(
@@ -360,14 +541,64 @@ def main(argv: Optional[List[str]] = None) -> int:
         sys.stdout.write(r.reply)
         if not r.reply.endswith("\n"):
             sys.stdout.write("\n")
-
     if r.session_id:
         sys.stderr.write(f"agentproc:session:{r.session_id}\n")
     if r.error:
         sys.stderr.write(f"agentproc:error:{r.error}\n")
-
     return 0 if r.exit_code == 0 else 1
 
 
+# ---------------------------------------------------------------------------
+# Main
+# ---------------------------------------------------------------------------
+
+def main(argv: Optional[List[str]] = None) -> int:
+    if argv is None:
+        argv = sys.argv[1:]
+
+    try:
+        # `agentproc hub <subcommand>` — defer to hub dispatcher.
+        if argv and argv[0] == "hub":
+            return _run_hub_subcommand(argv[1:])
+
+        parser = build_parser()
+        opts = parser.parse_args(argv)
+
+        if opts.help:
+            show_help()
+            return 0
+        if opts.version:
+            show_version()
+            return 0
+
+        if not opts.profile:
+            sys.stderr.write("error: --profile is required\n\n")
+            show_help()
+            return 2
+
+        return _run_agent_with_profile(opts.profile, opts)
+    except KeyboardInterrupt:
+        return 130
+    except Exception as e:
+        # Friendly handling for known hub errors: print the message + hint,
+        # never a raw stack trace.
+        from .hub import HubError
+        if isinstance(e, HubError):
+            sys.stderr.write(f"error: {e}\n")
+            if e.hint:
+                sys.stderr.write(f"\n{e.hint}\n")
+            return 1
+        # Network errors that slipped through unwrapped.
+        msg = str(e)
+        if any(s in msg for s in ("fetch failed", "ENOTFOUND", "ECONNREFUSED", "ECONNRESET", "urlopen error")):
+            sys.stderr.write(f"error: network error talking to GitHub: {msg}\n")
+            sys.stderr.write("\nThis is usually transient. Re-run the command, or run against a local checkout:\n")
+            sys.stderr.write('  agentproc --profile ./hub/<name>/profile.yaml --prompt "hi"\n')
+            return 1
+        # Everything else: surface the message without dumping a traceback.
+        sys.stderr.write(f"error: {msg}\n")
+        return 1
+
+
 if __name__ == "__main__":
     sys.exit(main())