Compare commits
3 Commits
fix/issue-
...
fix/issue-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0f6a30f01c | ||
|
|
f39e39156a | ||
| deb18f1e32 |
@@ -310,12 +310,31 @@ get_pending_tasks() {
|
|||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
find "$QUEUE_ITEMS_DIR" -name "*.json" -type f 2>/dev/null | while read -r file; do
|
python3 -c "
|
||||||
local state=$(python3 -c "import json; print(json.load(open('$file')).get('state', ''))" 2>/dev/null || echo "")
|
import json
|
||||||
if [ "$state" = "pending" ]; then
|
import os
|
||||||
cat "$file"
|
import sys
|
||||||
fi
|
|
||||||
done | head -"$limit"
|
queue_dir = os.environ.get('QUEUE_ITEMS_DIR', '')
|
||||||
|
limit = int(sys.argv[1]) if len(sys.argv) > 1 else 10
|
||||||
|
|
||||||
|
items = []
|
||||||
|
if os.path.isdir(queue_dir):
|
||||||
|
for filename in os.listdir(queue_dir):
|
||||||
|
if filename.endswith('.json'):
|
||||||
|
filepath = os.path.join(queue_dir, filename)
|
||||||
|
try:
|
||||||
|
with open(filepath) as f:
|
||||||
|
data = json.load(f)
|
||||||
|
if data.get('state') == 'pending':
|
||||||
|
items.append(data)
|
||||||
|
if len(items) >= limit:
|
||||||
|
break
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
|
print(json.dumps(items))
|
||||||
|
" "$limit"
|
||||||
}
|
}
|
||||||
|
|
||||||
get_queue_stats() {
|
get_queue_stats() {
|
||||||
|
|||||||
@@ -146,95 +146,3 @@ filename_to_issue_ref() {
|
|||||||
local name="${filename%.json}"
|
local name="${filename%.json}"
|
||||||
echo "$name" | sed 's-\([0-9]*\)$-#\1-' | sed 's/-/\//g'
|
echo "$name" | sed 's-\([0-9]*\)$-#\1-' | sed 's/-/\//g'
|
||||||
}
|
}
|
||||||
|
|
||||||
# Add notification to notifications file
|
|
||||||
kugetsu_add_notification() {
|
|
||||||
local type="$1"
|
|
||||||
local message="$2"
|
|
||||||
local issue_ref="${3:-}"
|
|
||||||
local gitea_url="${4:-}"
|
|
||||||
|
|
||||||
mkdir -p "$(dirname "$NOTIFICATIONS_FILE")"
|
|
||||||
|
|
||||||
python3 << PYEOF
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
from datetime import datetime
|
|
||||||
|
|
||||||
notification = {
|
|
||||||
"type": "$type",
|
|
||||||
"message": "$message",
|
|
||||||
"issue_ref": "$issue_ref" if "$issue_ref" else None,
|
|
||||||
"gitea_url": "$gitea_url" if "$gitea_url" else None,
|
|
||||||
"timestamp": datetime.now().isoformat(),
|
|
||||||
"read": False
|
|
||||||
}
|
|
||||||
|
|
||||||
file_path = os.path.expanduser("$NOTIFICATIONS_FILE")
|
|
||||||
notifications = []
|
|
||||||
|
|
||||||
if os.path.exists(file_path):
|
|
||||||
try:
|
|
||||||
with open(file_path, 'r') as f:
|
|
||||||
notifications = json.load(f)
|
|
||||||
except:
|
|
||||||
notifications = []
|
|
||||||
|
|
||||||
notifications.append(notification)
|
|
||||||
|
|
||||||
with open(file_path, 'w') as f:
|
|
||||||
json.dump(notifications, f, indent=2)
|
|
||||||
|
|
||||||
print("Notification added")
|
|
||||||
PYEOF
|
|
||||||
}
|
|
||||||
|
|
||||||
# Update queue item state
|
|
||||||
update_queue_item_state() {
|
|
||||||
local queue_id="$1"
|
|
||||||
local new_state="$2"
|
|
||||||
local session_id="${3:-}"
|
|
||||||
local pid="${4:-}"
|
|
||||||
|
|
||||||
local item_file="$QUEUE_ITEMS_DIR/${queue_id}.json"
|
|
||||||
if [ ! -f "$item_file" ]; then
|
|
||||||
echo "Error: Queue item not found: $queue_id" >&2
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
python3 << PYEOF
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
from datetime import datetime
|
|
||||||
|
|
||||||
item_file = "$item_file"
|
|
||||||
new_state = "$new_state"
|
|
||||||
session_id = "$session_id"
|
|
||||||
pid = "$pid"
|
|
||||||
|
|
||||||
with open(item_file, 'r') as f:
|
|
||||||
item = json.load(f)
|
|
||||||
|
|
||||||
issue_ref = item.get('issue_ref', '')
|
|
||||||
|
|
||||||
item['state'] = new_state
|
|
||||||
|
|
||||||
if new_state == "notified":
|
|
||||||
item['notified_at'] = datetime.now().isoformat() + "Z"
|
|
||||||
if session_id:
|
|
||||||
item['opencode_session_id'] = session_id
|
|
||||||
if pid:
|
|
||||||
item['pid'] = int(pid) if pid.isdigit() else None
|
|
||||||
elif new_state == "completed":
|
|
||||||
item['completed_at'] = datetime.now().isoformat() + "Z"
|
|
||||||
os.system(f"kugetsu_add_notification 'task_completed' 'Task completed: {issue_ref}' '{issue_ref}'")
|
|
||||||
elif new_state == "error":
|
|
||||||
item['error'] = datetime.now().isoformat() + "Z"
|
|
||||||
os.system(f"kugetsu_add_notification 'task_error' 'Task error: {issue_ref}' '{issue_ref}'")
|
|
||||||
|
|
||||||
with open(item_file, 'w') as f:
|
|
||||||
json.dump(item, f, indent=2)
|
|
||||||
|
|
||||||
print(f"Updated $queue_id to state: $new_state")
|
|
||||||
PYEOF
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -8,10 +8,7 @@ source "$SCRIPT_DIR/kugetsu-index.sh"
|
|||||||
source "$SCRIPT_DIR/kugetsu-worktree.sh"
|
source "$SCRIPT_DIR/kugetsu-worktree.sh"
|
||||||
source "$SCRIPT_DIR/kugetsu-log.sh"
|
source "$SCRIPT_DIR/kugetsu-log.sh"
|
||||||
|
|
||||||
# Load GITEA_TOKEN from default.env
|
load_agent_env "pm-agent"
|
||||||
if [ -f "$HOME/.kugetsu/env/default.env" ]; then
|
|
||||||
source "$HOME/.kugetsu/env/default.env"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check if a notified task has completed (forked session ended or has new commits)
|
# Check if a notified task has completed (forked session ended or has new commits)
|
||||||
check_task_completion() {
|
check_task_completion() {
|
||||||
|
|||||||
@@ -1,13 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
# Source required modules for session management functions
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
||||||
source "$SCRIPT_DIR/kugetsu-config.sh"
|
|
||||||
source "$SCRIPT_DIR/kugetsu-index.sh"
|
|
||||||
source "$SCRIPT_DIR/kugetsu-worktree.sh"
|
|
||||||
source "$SCRIPT_DIR/kugetsu-log.sh"
|
|
||||||
|
|
||||||
count_active_dev_sessions() {
|
count_active_dev_sessions() {
|
||||||
local count=0
|
local count=0
|
||||||
if [ -d "$SESSIONS_DIR" ]; then
|
if [ -d "$SESSIONS_DIR" ]; then
|
||||||
@@ -160,12 +153,10 @@ cmd_delegate() {
|
|||||||
local issue_ref=$(extract_issue_ref_from_message "$message")
|
local issue_ref=$(extract_issue_ref_from_message "$message")
|
||||||
|
|
||||||
if [ -n "$issue_ref" ] && [[ "$issue_ref" =~ \#[0-9]+$ ]]; then
|
if [ -n "$issue_ref" ] && [[ "$issue_ref" =~ \#[0-9]+$ ]]; then
|
||||||
# Enqueue for daemon to process via cmd_start/cmd_continue
|
cmd_start "$issue_ref" "$message"
|
||||||
enqueue_task "$issue_ref" "$message"
|
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# No issue ref detected — delegate directly to PM agent (legacy path)
|
|
||||||
local pm_session=$(get_pm_agent_session_id)
|
local pm_session=$(get_pm_agent_session_id)
|
||||||
if [ -z "$pm_session" ] || [ "$pm_session" = "null" ] || [ "$pm_session" = "None" ]; then
|
if [ -z "$pm_session" ] || [ "$pm_session" = "null" ] || [ "$pm_session" = "None" ]; then
|
||||||
echo "Error: PM agent session not found. Run 'kugetsu init' first." >&2
|
echo "Error: PM agent session not found. Run 'kugetsu init' first." >&2
|
||||||
@@ -174,7 +165,7 @@ cmd_delegate() {
|
|||||||
|
|
||||||
mkdir -p "$LOGS_DIR"
|
mkdir -p "$LOGS_DIR"
|
||||||
local log_file="$LOGS_DIR/delegate-$(date +%s).log"
|
local log_file="$LOGS_DIR/delegate-$(date +%s).log"
|
||||||
nohup sh -c "GITEA_TOKEN='***' opencode run '$message' --continue --session '$pm_session' >> '$log_file' 2>&1" > /dev/null 2>&1 &
|
nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '$message' --continue --session '$pm_session' >> '$log_file' 2>&1" > /dev/null 2>&1 &
|
||||||
disown
|
disown
|
||||||
echo "Delegated to PM agent (logged to $(basename "$log_file"))"
|
echo "Delegated to PM agent (logged to $(basename "$log_file"))"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user