@smilintux/skcapstone 0.6.1 → 0.6.3

package/scripts/sk-agent-picker.sh

@@ -0,0 +1,237 @@
+#!/usr/bin/env bash
+# sk-agent-picker.sh — Sovereign agent picker for AI coding tools
+#
+# Source this file in ~/.bashrc or ~/.zshrc.  It wraps `claude`, `codex`
+# (OpenAI Codex CLI), and `opencode` with an agent-aware launcher that
+# shows a numbered menu when multiple SK agents are configured.
+#
+# Also provides `skswitch` — a fast way to change the active agent for
+# the current shell session (updates SKAGENT + legacy vars in one shot).
+#
+# Behaviour:
+#   - Zero agents found       → launch tool normally (no SK home yet)
+#   - Exactly one agent       → use it silently, no prompt
+#   - Multiple agents         → numbered menu, default highlighted with →
+#   - SKAGENT is set          → honour it, skip menu entirely
+#   - Pass --agent <name>     → skip menu, use that agent directly
+#   - Any other args          → forwarded to the underlying tool unchanged
+#
+# Usage:
+#   claude                        # picker if multiple agents
+#   claude --agent lumina         # direct launch
+#   SKAGENT=opus claude           # env override
+#   skswitch lumina               # change active agent for this shell
+#   skswitch                      # interactive picker
+#   codex                         # same picker logic
+#   opencode                      # same picker logic
+#
+# Source in shell config:
+#   source ~/.skenv/share/skcapstone/sk-agent-picker.sh
+# Dev install:
+#   source ~/clawd/skcapstone-repos/skcapstone/scripts/sk-agent-picker.sh
+
+# ---------------------------------------------------------------------------
+# Core picker — returns chosen agent name on stdout, menu on stderr
+# ---------------------------------------------------------------------------
+_sk_pick_agent() {
+    local agents_dir="${SKCAPSTONE_HOME:-$HOME/.skcapstone}/agents"
+    local -a agents=()
+
+    if [[ -d "$agents_dir" ]]; then
+        while IFS= read -r entry; do
+            local name
+            name=$(basename "$entry")
+            # Skip template dirs, dotfiles, and non-directory entries
+            if [[ -d "$entry" && "$name" != *-template && "$name" != .* && "$name" != *.* ]]; then
+                agents+=("$name")
+            fi
+        done < <(find "$agents_dir" -mindepth 1 -maxdepth 1 -type d | sort)
+    fi
+
+    local count="${#agents[@]}"
+
+    if [[ $count -eq 0 ]]; then
+        echo ""; return 0
+    fi
+
+    if [[ $count -eq 1 ]]; then
+        echo "${agents[0]}"; return 0
+    fi
+
+    # Validate SKAGENT against actual agent list.
+    # If it's set but not in the list (stale env), fall back to first agent.
+    local env_agent="${SKAGENT:-${SKCAPSTONE_AGENT:-}}"
+    local default="${agents[0]}"
+    for agent in "${agents[@]}"; do
+        if [[ "$agent" == "$env_agent" ]]; then
+            default="$agent"
+            break
+        fi
+    done
+
+    # Multi-agent menu
+    echo "" >&2
+    echo "  ╔══════════════════════════════════╗" >&2
+    echo "  ║   SKCapstone — Choose an Agent   ║" >&2
+    echo "  ╚══════════════════════════════════╝" >&2
+    echo "" >&2
+
+    local i=1
+    for agent in "${agents[@]}"; do
+        local marker="  "
+        if [[ "$agent" == "$default" ]]; then
+            marker="→ "
+        fi
+        printf "  %s%2d)  %s\n" "$marker" "$i" "$agent" >&2
+        (( i++ ))
+    done
+
+    echo "" >&2
+    printf "  Agent [1-%d, Enter = %s]: " "$count" "$default" >&2
+
+    local choice
+    read -r choice </dev/tty
+
+    # Empty → use default
+    if [[ -z "$choice" ]]; then
+        echo "$default"; return 0
+    fi
+
+    # Numeric
+    if [[ "$choice" =~ ^[0-9]+$ ]] && (( choice >= 1 && choice <= count )); then
+        echo "${agents[$((choice - 1))]}"; return 0
+    fi
+
+    # Name typed directly
+    for agent in "${agents[@]}"; do
+        if [[ "$agent" == "$choice" ]]; then
+            echo "$agent"; return 0
+        fi
+    done
+
+    # Invalid — use list-validated default (not stale env), re-show options
+    printf "\n  ⚠  Unknown agent '%s'. Valid agents:\n" "$choice" >&2
+    for agent in "${agents[@]}"; do
+        printf "       %s\n" "$agent" >&2
+    done
+    printf "  Using default: %s\n\n" "$default" >&2
+    echo "$default"
+}
+
+# ---------------------------------------------------------------------------
+# Generic launcher used by all wrappers
+# ---------------------------------------------------------------------------
+_sk_launch() {
+    local tool="$1"; shift         # the underlying binary (claude / codex / opencode)
+    local extra_flags="$1"; shift  # tool-specific flags always appended (pass "" if none)
+    # remaining args collected below after parsing --agent
+
+    # Parse --agent <name> / --agent=<name> out of args first.
+    # SK_NO_PICKER=1 skips the menu entirely (for scripted/CI use).
+    local agent=""
+    local -a passthrough=()
+    local skip_next=0
+
+    for arg in "$@"; do
+        if [[ $skip_next -eq 1 ]]; then
+            agent="$arg"; skip_next=0; continue
+        fi
+        case "$arg" in
+            --agent)        skip_next=1 ;;
+            --agent=*)      agent="${arg#--agent=}" ;;
+            *)              passthrough+=("$arg") ;;
+        esac
+    done
+
+    # --agent flag given → skip picker
+    # SK_NO_PICKER=1 → skip picker (scripted/CI use)
+    if [[ -z "$agent" && "${SK_NO_PICKER:-0}" != "1" ]]; then
+        agent=$(_sk_pick_agent)
+    fi
+
+    # Fallback: if picker returned empty (0 agents), just use SKAGENT
+    # or launch bare if that's also unset.
+    if [[ -z "$agent" ]]; then
+        agent="${SKAGENT:-${SKCAPSTONE_AGENT:-}}"
+    fi
+
+    if [[ -n "$agent" ]]; then
+        printf "  ▶ Starting %s as agent: %s\n\n" "$tool" "$agent" >&2
+        if [[ -n "$extra_flags" ]]; then
+            SKAGENT="$agent" SKCAPSTONE_AGENT="$agent" SKMEMORY_AGENT="$agent" command "$tool" $extra_flags "${passthrough[@]}"
+        else
+            SKAGENT="$agent" SKCAPSTONE_AGENT="$agent" SKMEMORY_AGENT="$agent" command "$tool" "${passthrough[@]}"
+        fi
+    else
+        if [[ -n "$extra_flags" ]]; then
+            command "$tool" $extra_flags "${passthrough[@]}"
+        else
+            command "$tool" "${passthrough[@]}"
+        fi
+    fi
+}
+
+# ---------------------------------------------------------------------------
+# skswitch — change the active agent for the current shell session
+# ---------------------------------------------------------------------------
+function skswitch {
+    local agent="$1"
+
+    if [[ -z "$agent" ]]; then
+        # No argument — show interactive picker
+        agent=$(_sk_pick_agent)
+        if [[ -z "$agent" ]]; then
+            echo "No agents found in ${SKCAPSTONE_HOME:-$HOME/.skcapstone}/agents/" >&2
+            return 1
+        fi
+    fi
+
+    # Validate agent directory exists
+    local agent_dir="${SKCAPSTONE_HOME:-$HOME/.skcapstone}/agents/$agent"
+    if [[ ! -d "$agent_dir" ]]; then
+        echo "Agent not found: $agent" >&2
+        echo "Available agents:" >&2
+        local agents_dir="${SKCAPSTONE_HOME:-$HOME/.skcapstone}/agents"
+        if [[ -d "$agents_dir" ]]; then
+            find "$agents_dir" -mindepth 1 -maxdepth 1 -type d ! -name '*-template' ! -name '.*' -printf '  %f\n' | sort >&2
+        fi
+        return 1
+    fi
+
+    export SKAGENT="$agent"
+    export SKCAPSTONE_AGENT="$agent"
+    export SKMEMORY_AGENT="$agent"
+    echo "Switched to agent: $agent"
+}
+
+# ---------------------------------------------------------------------------
+# Per-tool wrapper functions
+# Must unalias first — an active alias with the same name causes bash to
+# expand it during function-definition parsing, producing a syntax error.
+# ---------------------------------------------------------------------------
+unalias claude   2>/dev/null || true
+unalias codex    2>/dev/null || true
+unalias opencode 2>/dev/null || true
+
+# claude (Claude Code CLI)
+function claude {
+    _sk_launch claude "--dangerously-skip-permissions" "$@"
+}
+
+# codex (OpenAI Codex CLI — https://github.com/openai/codex)
+function codex {
+    _sk_launch codex "--full-auto" "$@"
+}
+
+# opencode (opencode.ai)
+function opencode {
+    _sk_launch opencode "" "$@"
+}
+
+# Export so sub-shells (tmux panes, etc.) inherit the functions
+export -f _sk_pick_agent 2>/dev/null || true
+export -f _sk_launch     2>/dev/null || true
+export -f skswitch       2>/dev/null || true
+export -f claude         2>/dev/null || true
+export -f codex          2>/dev/null || true
+export -f opencode       2>/dev/null || true

package/scripts/telegram-catchup-all.sh

@@ -22,7 +22,8 @@ set -uo pipefail  # no -e: individual group failures shouldn't stop the batch
 SKENV="${HOME}/.skenv/bin"
 SKCAPSTONE="${SKENV}/skcapstone"
 CONFIG="${HOME}/.skcapstone/agents/lumina/config/telegram.yaml"
-export SKCAPSTONE_AGENT="${SKCAPSTONE_AGENT:-lumina}"
+export SKAGENT="${SKAGENT:-lumina}"
+export SKCAPSTONE_AGENT="${SKAGENT}"
 export PATH="${SKENV}:${PATH}"
 
 # Parse args

package/scripts/watch-anthropic-token.sh

@@ -36,9 +36,10 @@ sync_token() {
     local expires_in
     expires_in=$(python3 -c "import json,time; print(f'{(json.load(open(\"$CREDS\"))[\"claudeAiOauth\"][\"expiresAt\"]/1000 - time.time())/3600:.1f}h')" 2>/dev/null || echo "unknown")
 
-    # Read current token from OpenClaw
+    # Read current token from credentials file (track changes by comparing with last known)
+    local state_file="$HOME/.skcapstone/agents/lumina/logs/anthropic-token.last"
     local current_token
-    current_token=$(python3 -c "import json; print(json.load(open('$OPENCLAW_JSON'))['models']['providers']['anthropic']['apiKey'])" 2>/dev/null || echo "")
+    current_token=$(cat "$state_file" 2>/dev/null || echo "")
 
     if [ "$new_token" = "$current_token" ]; then
         log "Token unchanged (expires in $expires_in)"
@@ -47,20 +48,14 @@ sync_token() {
 
     log "Token changed! Syncing... (new token expires in $expires_in)"
 
-    # 1. Update openclaw.json
-    python3 << PYEOF
-import json
-with open('$OPENCLAW_JSON') as f:
-    cfg = json.load(f)
-if 'anthropic' in cfg.get('models', {}).get('providers', {}):
-    cfg['models']['providers']['anthropic']['apiKey'] = '$new_token'
-    with open('$OPENCLAW_JSON', 'w') as f:
-        json.dump(cfg, f, indent=2)
-        f.write('\n')
-PYEOF
-    log "Updated openclaw.json"
-
-    # 2. Update .env
+    # 1. Save new token to state file
+    echo "$new_token" > "$state_file"
+    log "State file updated"
+
+    # NOTE: anthropic provider removed from openclaw.json — all Claude models
+    # now route through claude-code proxy (port 18782). No openclaw.json update needed.
+
+    # 2. Update .env (kept for any scripts that source it)
     if grep -q "^ANTHROPIC_API_KEY=" "$OPENCLAW_ENV" 2>/dev/null; then
         sed -i "s|^ANTHROPIC_API_KEY=.*|ANTHROPIC_API_KEY=$new_token|" "$OPENCLAW_ENV"
     else
@@ -68,7 +63,7 @@ PYEOF
     fi
     log "Updated .env"
 
-    # 3. Update systemd override
+    # 3. Update systemd override (ANTHROPIC_API_KEY kept for claude-code-api server)
     if [ -f "$OVERRIDE_CONF" ]; then
         local nvidia_key
         nvidia_key=$(grep "NVIDIA_API_KEY=" "$OVERRIDE_CONF" 2>/dev/null | sed 's/.*NVIDIA_API_KEY=//' || true)

package/src/skcapstone/__init__.py

@@ -25,11 +25,38 @@ def _default_home() -> str:
     return os.path.expanduser("~/.skcapstone")
 
 
+def _detect_active_agent(root: str | None = None) -> str | None:
+    """Best-effort active agent discovery.
+
+    Resolution order:
+    1. Explicit SKCAPSTONE_AGENT environment variable
+    2. First non-template directory under ~/.skcapstone/agents
+
+    Returns:
+        The active agent name if one can be resolved, else None.
+    """
+    env_agent = (os.environ.get("SKAGENT") or os.environ.get("SKCAPSTONE_AGENT", "")).strip()
+    if env_agent:
+        return env_agent
+
+    base = Path(root or os.environ.get("SKCAPSTONE_HOME", _default_home())).expanduser()
+    agents_dir = base / "agents"
+    if not agents_dir.exists():
+        return None
+
+    candidates = sorted(
+        entry.name
+        for entry in agents_dir.iterdir()
+        if entry.is_dir() and not entry.name.endswith("-template")
+    )
+    return candidates[0] if candidates else None
+
+
 # Root of the skcapstone tree (shared infra lives here)
 AGENT_HOME = os.environ.get("SKCAPSTONE_HOME", _default_home())
 
 # Which agent this process is running as (set by daemon/connector)
-SKCAPSTONE_AGENT = os.environ.get("SKCAPSTONE_AGENT", "lumina")
+SKCAPSTONE_AGENT = _detect_active_agent() or ""
 
 # Default daemon port
 DEFAULT_PORT = int(os.environ.get("SKCAPSTONE_PORT", "9383"))
@@ -59,13 +86,18 @@ def agent_home(agent_name: str | None = None) -> Path:
     Returns:
         Path to the agent-specific home directory.
     """
-    name = agent_name or SKCAPSTONE_AGENT
+    name = agent_name or SKCAPSTONE_AGENT or _detect_active_agent()
     root = Path(AGENT_HOME).expanduser()
     if name:
         return root / "agents" / name
     return root
 
 
+def active_agent_name() -> str | None:
+    """Return the currently active agent name, if one can be resolved."""
+    return SKCAPSTONE_AGENT or _detect_active_agent()
+
+
 def shared_home() -> Path:
     """Return the shared root directory (~/.skcapstone/).
 

package/src/skcapstone/cli/__init__.py

@@ -19,7 +19,7 @@ from .. import __version__
 @click.group()
 @click.version_option(version=__version__, prog_name="skcapstone")
 @click.option(
-    "--agent", envvar="SKCAPSTONE_AGENT", default="",
+    "--agent", envvar="SKAGENT", default="",
     help="Agent name — resolves home to {root}/agents/{name}/",
 )
 @click.pass_context
@@ -91,6 +91,7 @@ from .skseed import register_skseed_commands
 from .service_cmd import register_service_commands
 from .telegram import register_telegram_commands
 from .joule_cmd import register_joule_commands
+from .alerts import register_alerts_commands
 
 register_setup_commands(main)
 register_shell_commands(main)
@@ -144,3 +145,4 @@ register_skseed_commands(main)
 register_service_commands(main)
 register_telegram_commands(main)
 register_joule_commands(main)
+register_alerts_commands(main)

package/src/skcapstone/cli/_common.py

@@ -58,6 +58,7 @@ def apply_agent_override(agent: str) -> None:
     """
     if agent:
         _pkg.SKCAPSTONE_AGENT = agent
+        os.environ["SKAGENT"] = agent
         os.environ["SKCAPSTONE_AGENT"] = agent
 
 

package/src/skcapstone/cli/context_cmd.py

@@ -6,7 +6,7 @@ from pathlib import Path
 
 import click
 
-from ._common import AGENT_HOME, console
+from ._common import AGENT_HOME, SKCAPSTONE_AGENT, console, resolve_agent_home
 
 
 def register_context_commands(main: click.Group) -> None:
@@ -22,7 +22,11 @@ def register_context_commands(main: click.Group) -> None:
         """
 
     @context.command("show")
-    @click.option("--home", default=AGENT_HOME, type=click.Path())
+    @click.option(
+        "--home",
+        default=str(resolve_agent_home(SKCAPSTONE_AGENT)),
+        type=click.Path(),
+    )
     @click.option(
         "--format",
         "fmt",
@@ -55,7 +59,11 @@ def register_context_commands(main: click.Group) -> None:
             click.echo(FORMATTERS[fmt](ctx))
 
     @context.command("generate")
-    @click.option("--home", default=AGENT_HOME, type=click.Path())
+    @click.option(
+        "--home",
+        default=str(resolve_agent_home(SKCAPSTONE_AGENT)),
+        type=click.Path(),
+    )
     @click.option("--memories", "-n", default=10, help="Max recent memories to include.")
     @click.option(
         "--target",
@@ -95,7 +103,11 @@ def register_context_commands(main: click.Group) -> None:
         console.print()
 
     @main.command("refresh-context")
-    @click.option("--home", default=AGENT_HOME, type=click.Path())
+    @click.option(
+        "--home",
+        default=str(resolve_agent_home(SKCAPSTONE_AGENT)),
+        type=click.Path(),
+    )
     @click.option("--memories", "-n", default=10, help="Max recent memories to embed.")
     @click.option(
         "--dest",

package/src/skcapstone/cli/daemon.py

@@ -140,7 +140,8 @@ def register_daemon_commands(main: click.Group) -> None:
         effective_port = _resolve_agent_port(agent, port)
 
         if agent:
-            # Propagate identity to child imports that read SKCAPSTONE_AGENT.
+            # Propagate identity to child imports that read SKAGENT.
+            os.environ["SKAGENT"] = agent
             os.environ["SKCAPSTONE_AGENT"] = agent
 
         if not home_path.exists():

package/src/skcapstone/cli/joule_cmd.py

@@ -439,7 +439,7 @@ def register_joule_commands(main: click.Group) -> None:
     @joule_group.command("dashboard")
     @click.option(
         "--agent", "-a", "agent_name", default=None,
-        help="Agent name (default: lumina).",
+        help="Agent name (default: current agent).",
     )
     def dashboard_cmd(agent_name: str | None):
         """Show a financial dashboard for an agent."""
@@ -451,7 +451,9 @@ def register_joule_commands(main: click.Group) -> None:
 
         from ..skjoule import JouleEngine, TransactionKind
 
-        agent_name = agent_name or "lumina"
+        from .. import active_agent_name
+
+        agent_name = agent_name or active_agent_name()
         engine = JouleEngine(home=Path(SHARED_ROOT).expanduser())
         wallet = engine.get_wallet(agent_name)
         balance = wallet.balance
@@ -624,4 +626,6 @@ def _resolve_agent(agent_name: str | None) -> str:
     if agent_name:
         return agent_name
     from .. import SKCAPSTONE_AGENT
-    return SKCAPSTONE_AGENT or "lumina"
+    from .. import active_agent_name
+
+    return SKCAPSTONE_AGENT or active_agent_name() or ""

package/src/skcapstone/cli/memory.py

@@ -423,7 +423,7 @@ def register_memory_commands(main: click.Group) -> None:
     @memory.command("rehydrate")
     @click.option("--home", default=AGENT_HOME, type=click.Path())
     @click.option("--agent", "-a", default=None,
-                  help="Agent name (default: SKCAPSTONE_AGENT or 'lumina').")
+                  help="Agent name (default: active agent).")
     @click.option("--febs-only", is_flag=True, help="Only ingest FEB files (trust rehydration).")
     @click.option("--memories-only", is_flag=True, help="Only ingest flat-file memories into backends.")
     @click.option("--force", is_flag=True, help="Re-ingest even if already in backend.")
@@ -439,7 +439,9 @@ def register_memory_commands(main: click.Group) -> None:
         import os
         from ..models import MemoryLayer
 
-        agent_name = agent or os.environ.get("SKCAPSTONE_AGENT", "lumina")
+        from .. import active_agent_name
+
+        agent_name = agent or os.environ.get("SKCAPSTONE_AGENT") or active_agent_name()
         home_path = Path(home).expanduser()
         agent_home = home_path / "agents" / agent_name
 

package/src/skcapstone/cli/register_cmd.py

@@ -1,7 +1,7 @@
 """Register command — auto-register SK* skills and MCP servers.
 
 Detects the user's environments (OpenClaw, Claude Code, Cursor, VS Code,
-OpenCode CLI, mcporter) and registers SKILL.md symlinks + MCP server entries.
+OpenCode CLI, Codex, mcporter) and registers SKILL.md symlinks + MCP server entries.
 
 Commands:
     skcapstone register              — register all SK* packages
@@ -49,7 +49,7 @@ def register_register_commands(main: click.Group) -> None:
         """Register all SK* skills and MCP servers in detected environments.
 
         Auto-detects your development environments (Claude Code, Cursor,
-        VS Code, OpenClaw, OpenCode, mcporter) and ensures all SK* skill
+        VS Code, OpenClaw, OpenCode, Codex, mcporter) and ensures all SK* skill
         manifests and MCP server entries are properly configured.
 
         Examples:
@@ -107,6 +107,7 @@ def register_register_commands(main: click.Group) -> None:
         table = Table(show_header=True, header_style="bold", box=None, padding=(0, 2))
         table.add_column("Package", style="cyan")
         table.add_column("Skill", style="dim")
+        table.add_column("Codex")
         table.add_column("MCP")
         table.add_column("OpenClaw Plugin")
 
@@ -143,6 +144,21 @@ def register_register_commands(main: click.Group) -> None:
             else:
                 mcp_str = str(mcp_info)
 
+            codex_info = pkg_result.get("codex_skill", {})
+            codex_action = codex_info.get("action", "")
+            if codex_action == "created":
+                codex_str = "[green]created[/]"
+            elif codex_action == "exists":
+                codex_str = "[dim]exists[/]"
+            elif codex_action == "dry-run":
+                codex_str = "[yellow]would create[/]"
+            elif codex_action == "error":
+                codex_str = f"[red]{codex_info.get('error', 'error')}[/]"
+            elif not codex_action:
+                codex_str = "[dim]—[/]"
+            else:
+                codex_str = f"[dim]{codex_action}[/]"
+
             plugin_action = pkg_result.get("openclaw_plugin", "")
             if plugin_action == "created":
                 plugin_str = "[green]created[/]"
@@ -157,7 +173,7 @@ def register_register_commands(main: click.Group) -> None:
             else:
                 plugin_str = f"[dim]{plugin_action}[/]"
 
-            table.add_row(name, skill_str, mcp_str, plugin_str)
+            table.add_row(name, skill_str, codex_str, mcp_str, plugin_str)
 
         console.print(table)
         console.print()

package/src/skcapstone/cli/session.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import json
 import sys
 from pathlib import Path
 
@@ -125,3 +126,27 @@ def register_session_commands(main: click.Group) -> None:
         for src, count in sorted(by_source.items(), key=lambda x: -x[1]):
             console.print(f"    {src}: {count}")
         console.print()
+
+    @session.command("briefing")
+    @click.option("--home", default=AGENT_HOME, type=click.Path())
+    @click.option(
+        "--format",
+        "fmt",
+        type=click.Choice(["text", "json"]),
+        default="text",
+        help="Output format (default: text).",
+    )
+    @click.option("--memories", "-n", default=10, help="Max recent memories to include.")
+    def session_briefing(home: str, fmt: str, memories: int):
+        """Show a native startup briefing for sovereign sessions.
+
+        Merges SKCapstone context with the current HammerTime legal/case
+        briefing when available, so any client can consume one startup payload.
+        """
+        from ..session_briefing import build_session_briefing, format_session_briefing_text
+
+        payload = build_session_briefing(Path(home).expanduser(), memory_limit=memories)
+        if fmt == "json":
+            click.echo(json.dumps(payload, indent=2, default=str))
+            return
+        click.echo(format_session_briefing_text(payload))