Compare commits
1 Commits
fix/issue-
...
fix/issue-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
798bee0f79 |
@@ -41,11 +41,6 @@ mask_sensitive_vars() {
|
||||
echo "$line"
|
||||
}
|
||||
|
||||
strip_ansi_codes() {
|
||||
local line="${1:-}"
|
||||
echo "$line" | sed 's/\x1b\[[0-9;]*m//g' | sed 's/\x1b\[[0-9;]*[a-zA-Z]//g'
|
||||
}
|
||||
|
||||
load_agent_env() {
|
||||
local agent_type="${1:-base}"
|
||||
local env_file="$ENV_DIR/${agent_type}.env"
|
||||
|
||||
@@ -1,6 +1,40 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
source "$SCRIPT_DIR/kugetsu-config.sh"
|
||||
|
||||
log() {
|
||||
local level="${1:-}"
|
||||
local component="${2:-}"
|
||||
local message="${3:-}"
|
||||
local timestamp
|
||||
timestamp=$(date -Iseconds)
|
||||
|
||||
case "$level" in
|
||||
info|warn|error|debug) ;;
|
||||
*)
|
||||
echo "Error: log level must be info|warn|error|debug" >&2
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ -z "$message" ]; then
|
||||
message="$component"
|
||||
component="${level}"
|
||||
level="info"
|
||||
fi
|
||||
|
||||
local masked
|
||||
masked=$(mask_sensitive_vars "$message")
|
||||
echo "[$timestamp] $level $component $masked"
|
||||
}
|
||||
|
||||
log_debug() { log "debug" "$1" "${2:-}"; }
|
||||
log_info() { log "info" "$1" "${2:-}"; }
|
||||
log_warn() { log "warn" "$1" "${2:-}"; }
|
||||
log_error() { log "error" "$1" "${2:-}"; }
|
||||
|
||||
cmd_logs() {
|
||||
local count="${1:-10}"
|
||||
|
||||
@@ -24,9 +58,7 @@ cmd_logs() {
|
||||
echo ""
|
||||
echo "--- $log ---"
|
||||
tail -20 "$LOGS_DIR/$log" | while read line; do
|
||||
line=$(strip_ansi_codes "$line")
|
||||
line=$(mask_sensitive_vars "$line")
|
||||
echo " $line"
|
||||
echo " $(mask_sensitive_vars "$line")"
|
||||
done
|
||||
fi
|
||||
done
|
||||
|
||||
@@ -225,10 +225,7 @@ cmd_delegate() {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
local msg_file="$LOGS_DIR/msg-$new_session.txt"
|
||||
printf '%s' "$message" > "$msg_file"
|
||||
nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '@$msg_file' --session '$new_session'" >> "$log_file" 2>&1 &
|
||||
rm -f "$msg_file"
|
||||
nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '$message' --session '$new_session'" >> "$log_file" 2>&1 &
|
||||
echo "Delegated to new session (logged to $(basename "$log_file"))"
|
||||
}
|
||||
|
||||
@@ -241,22 +238,20 @@ create_session() {
|
||||
fi
|
||||
|
||||
local before_json=$(opencode session list --format=json 2>/dev/null)
|
||||
local before_set=$(echo "$before_json" | python3 -c "import sys,json; sessions=json.load(sys.stdin); print('|'.join(s['id'] for s in sessions))" 2>/dev/null || echo "|")
|
||||
local before_ids=$(echo "$before_json" | python3 -c "import sys,json; sessions=json.load(sys.stdin); print(' '.join(s['id'] for s in sessions))" 2>/dev/null || echo "")
|
||||
|
||||
opencode run --fork --session "$base_session" "new session" >/dev/null 2>&1
|
||||
|
||||
sleep 1
|
||||
opencode run --fork --session "$base_session" "new session" 2>/dev/null
|
||||
|
||||
local after_json=$(opencode session list --format=json 2>/dev/null)
|
||||
local after_sessions=$(echo "$after_json" | python3 -c "import sys,json; sessions=json.load(sys.stdin); [print(s['id']) for s in sessions]" 2>/dev/null || true)
|
||||
local after_ids=$(echo "$after_json" | python3 -c "import sys,json; sessions=json.load(sys.stdin); print(' '.join(s['id'] for s in sessions))" 2>/dev/null || echo "")
|
||||
|
||||
local new_session_id=""
|
||||
while IFS= read -r sess; do
|
||||
if [[ -n "$sess" ]] && [[ ! "$before_set" =~ \|${sess}\| ]]; then
|
||||
for sess in $after_ids; do
|
||||
if [[ ! " $before_ids " =~ " $sess " ]] && [[ "$sess" != "$base_session" ]]; then
|
||||
new_session_id="$sess"
|
||||
break
|
||||
fi
|
||||
done <<< "$after_sessions"
|
||||
done
|
||||
|
||||
echo "$new_session_id"
|
||||
}
|
||||
@@ -378,10 +373,7 @@ cmd_start() {
|
||||
load_agent_env "dev"
|
||||
|
||||
cd "$worktree_path"
|
||||
local sanitized_id=$(echo "$new_session_id" | sed 's/[^a-zA-Z0-9_-]/_/g')
|
||||
local msg_file="$worktree_path/.kugetsu-msg.txt"
|
||||
printf '%s' "$dev_message" > "$msg_file"
|
||||
nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '@$msg_file' --session '$new_session_id'" >> "$LOGS_DIR/dev-$sanitized_id.log" 2>&1 &
|
||||
nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '$dev_message' --session '$new_session_id'" >> "$LOGS_DIR/dev-$new_session_id.log" 2>&1 &
|
||||
|
||||
echo "Session started for '$issue_ref': $new_session_id"
|
||||
echo "Worktree: $worktree_path"
|
||||
@@ -398,7 +390,7 @@ cmd_continue() {
|
||||
if [ -z "$session_name" ]; then
|
||||
session_name="$arg"
|
||||
else
|
||||
message="${message}${message:+ }${arg}"
|
||||
message="$arg"
|
||||
fi
|
||||
done
|
||||
|
||||
@@ -444,10 +436,7 @@ cmd_continue() {
|
||||
fi
|
||||
|
||||
cd "$worktree_path"
|
||||
local sanitized_id=$(echo "$opencode_session_id" | sed 's/[^a-zA-Z0-9_-]/_/g')
|
||||
local msg_file="$worktree_path/.kugetsu-msg.txt"
|
||||
printf '%s' "$message" > "$msg_file"
|
||||
nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '@$msg_file' --session '$opencode_session_id'" >> "$LOGS_DIR/dev-$sanitized_id.log" 2>&1 &
|
||||
nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '$message' --session '$opencode_session_id'" >> "$LOGS_DIR/dev-$opencode_session_id.log" 2>&1 &
|
||||
}
|
||||
|
||||
cmd_list() {
|
||||
|
||||
Reference in New Issue
Block a user