agentk8 1.0.4 → 1.0.5

package/lib/core.sh

@@ -8,7 +8,7 @@ set -euo pipefail
 # CONSTANTS
 # =============================================================================
 
-AGENTK_VERSION="1.0.4"
+AGENTK_VERSION="1.0.5"
 AGENTK_ROOT="${AGENTK_ROOT:-$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)}"
 AGENTK_WORKSPACE="${AGENTK_ROOT}/workspace"
 CLAUDE_KNOWLEDGE_CUTOFF="2024-04"

package/lib/spawn.sh

@@ -235,15 +235,86 @@ spawn_agent_interactive() {
 
     log_info "Starting interactive session with agent: $agent"
 
-    # Run claude interactively
+    # Run claude with JSON output to capture tokens
+    local output_file
+    output_file=$(mktemp)
+
     if [[ -n "$initial_prompt" ]]; then
-        claude --system-prompt "$prompt_file" "$initial_prompt"
+        # Run with --print to get non-interactive output with token info
+        if claude --print --output-format json --system-prompt "$prompt_file" "$initial_prompt" > "$output_file" 2>&1; then
+            # Parse and display response
+            _parse_and_display_response "$output_file"
+        else
+            # Fallback: show raw output on error
+            cat "$output_file"
+        fi
     else
+        # Interactive mode - can't easily capture tokens, run normally
         claude --system-prompt "$prompt_file"
     fi
 
     # Cleanup
-    rm -f "$prompt_file"
+    rm -f "$prompt_file" "$output_file"
+}
+
+# Parse JSON response and extract tokens
+_parse_and_display_response() {
+    local output_file="$1"
+
+    # Check if output is valid JSON
+    if jq -e . "$output_file" >/dev/null 2>&1; then
+        # Extract the response text - handle different JSON structures
+        local response
+        response=$(jq -r '
+            if .result then .result
+            elif .content then
+                if type == "array" then .[].text
+                else .content
+                end
+            elif .text then .text
+            else .
+            end
+        ' "$output_file" 2>/dev/null)
+
+        # Extract token counts - check various possible locations
+        local input_tokens output_tokens total_tokens
+        input_tokens=$(jq -r '
+            .usage.input_tokens //
+            .inputTokens //
+            .stats.input_tokens //
+            0
+        ' "$output_file" 2>/dev/null)
+        output_tokens=$(jq -r '
+            .usage.output_tokens //
+            .outputTokens //
+            .stats.output_tokens //
+            0
+        ' "$output_file" 2>/dev/null)
+
+        # Handle null values
+        [[ "$input_tokens" == "null" || -z "$input_tokens" ]] && input_tokens=0
+        [[ "$output_tokens" == "null" || -z "$output_tokens" ]] && output_tokens=0
+
+        total_tokens=$((input_tokens + output_tokens))
+
+        # Update session token count via file
+        if [[ $total_tokens -gt 0 ]] && [[ -n "${_TOKEN_FILE:-}" ]]; then
+            local current
+            current=$(cat "$_TOKEN_FILE" 2>/dev/null || echo "0")
+            echo "$((current + total_tokens))" > "$_TOKEN_FILE"
+        fi
+
+        # Display the response
+        echo "$response"
+
+        # Show token info in dim text
+        if [[ $total_tokens -gt 0 ]]; then
+            printf "\n${DIM}↑ %d tokens (in: %d, out: %d)${RESET}\n" "$total_tokens" "$input_tokens" "$output_tokens"
+        fi
+    else
+        # Not JSON, display as-is (probably an error or plain text)
+        cat "$output_file"
+    fi
 }
 
 # =============================================================================

package/lib/ui.sh

@@ -518,14 +518,36 @@ print_info() {
 # SESSION STATS & TOKEN TRACKING
 # =============================================================================
 
+# Token tracking file (persists across subshells)
+_TOKEN_FILE=""
+
 init_session_stats() {
     _SESSION_START_TIME=$(date +%s)
     _SESSION_TOKENS=0
+    # Create token tracking file (export for subshells)
+    export _TOKEN_FILE="${AGENTK_WORKSPACE:-.}/.session_tokens"
+    echo "0" > "$_TOKEN_FILE"
 }
 
 add_tokens() {
     local tokens="${1:-0}"
-    _SESSION_TOKENS=$((_SESSION_TOKENS + tokens))
+    if [[ -n "$_TOKEN_FILE" ]] && [[ -f "$_TOKEN_FILE" ]]; then
+        local current
+        current=$(cat "$_TOKEN_FILE" 2>/dev/null || echo "0")
+        local new_total=$((current + tokens))
+        echo "$new_total" > "$_TOKEN_FILE"
+        _SESSION_TOKENS=$new_total
+    else
+        _SESSION_TOKENS=$((_SESSION_TOKENS + tokens))
+    fi
+}
+
+get_session_tokens() {
+    if [[ -n "$_TOKEN_FILE" ]] && [[ -f "$_TOKEN_FILE" ]]; then
+        cat "$_TOKEN_FILE" 2>/dev/null || echo "0"
+    else
+        echo "${_SESSION_TOKENS:-0}"
+    fi
 }
 
 format_tokens() {
@@ -553,12 +575,17 @@ print_session_stats() {
         fi
     fi
 
+    local total_tokens
+    total_tokens=$(get_session_tokens)
     local tokens_display
-    tokens_display=$(format_tokens "${_SESSION_TOKENS:-0}")
+    tokens_display=$(format_tokens "$total_tokens")
 
     echo
     print_divider "─"
     printf "${DIM}Session: %s │ Tokens: ↑ %s${RESET}\n" "$elapsed" "$tokens_display"
+
+    # Cleanup token file
+    [[ -n "$_TOKEN_FILE" ]] && rm -f "$_TOKEN_FILE" 2>/dev/null
 }
 
 print_status_line() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentk8",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Multi-Agent Claude Code Terminal Suite - Orchestrate multiple Claude agents for software development and ML research",
   "keywords": [
     "claude",