fix: use ${GITEA_TOKEN:-} to handle unset token

With set -u, expanding $GITEA_TOKEN fails if not set. Changed to ${GITEA_TOKEN:-} to provide empty default. This fixes the issue where cmd_start appears to succeed but agent never runs.
fix: cmd_destroy unbound variable $2
2026-04-06 09:42:37 +00:00 · 2026-04-06 09:24:47 +00:00 · 2026-04-06 11:19:52 +02:00 · 2026-04-06 09:14:37 +00:00 · 2026-04-06 10:46:09 +02:00 · 2026-04-06 08:44:29 +00:00
3 changed files with 13 additions and 7 deletions
--- a/skills/kugetsu/scripts/kugetsu-config.sh
+++ b/skills/kugetsu/scripts/kugetsu-config.sh
@@ -53,5 +53,9 @@ load_agent_env() {
        set -a
        source "$ENV_DIR/default.env"
        set +a
+    elif [ -f "$ENV_DIR/pm-agent.env" ]; then
+        set -a
+        source "$ENV_DIR/pm-agent.env"
+        set +a
    fi
 }
--- a/skills/kugetsu/scripts/kugetsu-queue-daemon.sh
+++ b/skills/kugetsu/scripts/kugetsu-queue-daemon.sh
@@ -109,7 +109,7 @@ process_task() {

    source "$SCRIPT_DIR/kugetsu-session.sh"

-    if worktree_exists "$issue_ref" "$HOME/.kugetsu-worktrees" || [ -f "$SESSIONS_DIR/$(issue_ref_to_filename "$issue_ref").json" ]; then
+    if worktree_exists "$issue_ref" "$WORKTREES_DIR" || [ -f "$SESSIONS_DIR/$(issue_ref_to_filename "$issue_ref").json" ]; then
        log_file="$LOGS_DIR/delegate-$(date +%s).log"
        if cmd_continue "$issue_ref" "$message" >> "$log_file" 2>&1; then
            sleep 1
--- a/skills/kugetsu/scripts/kugetsu-session.sh
+++ b/skills/kugetsu/scripts/kugetsu-session.sh
@@ -194,8 +194,8 @@ cmd_delegate() {
    
    mkdir -p "$LOGS_DIR"
    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 &
-    disown
+    load_agent_env "pm-agent"
+    nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '$message' --continue --session '$pm_session'" >> "$log_file" 2>&1 &
    echo "Delegated to PM agent (logged to $(basename "$log_file"))"
 }

@@ -313,7 +313,8 @@ cmd_start() {
    
    load_agent_env "dev"
    
-    (cd "$worktree_path" && nohup sh -c "GITEA_TOKEN='$GITEA_TOKEN' opencode run '$dev_message' --continue --session '$new_session_id'" >> "$LOGS_DIR/dev-$new_session_id.log" 2>&1 &) && disown
+    cd "$worktree_path"
+    nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '$dev_message' --continue --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"
@@ -367,9 +368,10 @@ cmd_continue() {
    fi
    
    if [ -n "$worktree_path" ] && [ -d "$worktree_path" ]; then
-        (cd "$worktree_path" && nohup sh -c "GITEA_TOKEN='$GITEA_TOKEN' opencode run '$message' --continue --session '$opencode_session_id'" >> "$LOGS_DIR/dev-$opencode_session_id.log" 2>&1 &) && disown
+        cd "$worktree_path"
+        nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '$message' --continue --session '$opencode_session_id'" >> "$LOGS_DIR/dev-$opencode_session_id.log" 2>&1 &
    else
-        nohup sh -c "GITEA_TOKEN='$GITEA_TOKEN' opencode run '$message' --continue --session '$opencode_session_id'" >> "$LOGS_DIR/dev-$opencode_session_id.log" 2>&1 & && disown
+        nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '$message' --continue --session '$opencode_session_id'" >> "$LOGS_DIR/dev-$opencode_session_id.log" 2>&1 &
    fi
 }

@@ -521,7 +523,7 @@ cmd_destroy() {
    local target="${1:-}"
    local force=false
    
-    if [ "$2" = "-y" ]; then
+    if [ "${2:-}" = "-y" ]; then
        force=true
    fi
Author	SHA1	Message	Date
shokollm	1a8c64c0a8	fix: use ${GITEA_TOKEN:-} to handle unset token With set -u, expanding $GITEA_TOKEN fails if not set. Changed to ${GITEA_TOKEN:-} to provide empty default. This fixes the issue where cmd_start appears to succeed but agent never runs.	2026-04-06 09:42:37 +00:00
shokollm	fd79bfa3ea	fix: cmd_destroy unbound variable $2 With set -u, using $2 without default causes error when called without arguments.	2026-04-06 09:24:47 +00:00
shoko	119c9b8fd9	Merge pull request 'fix: daemon worktree path and agent forking issues' (#191 ) from fix/issue-daemon-worktree-path-fix into main	2026-04-06 11:19:52 +02:00
shokollm	7f7f8b1085	fix: multiple issues with queue daemon and agent forking 1. daemon: use $WORKTREES_DIR instead of $HOME/.kugetsu-worktrees - Worktrees are created in ~/.kugetsu/worktrees but daemon was checking ~/.kugetsu-worktrees - This caused cmd_start to be called when cmd_continue should have been 2. load_agent_env: add fallback to pm-agent.env - When dev.env and default.env don't exist, fallback to pm-agent.env - Ensures GITEA_TOKEN is available 3. Remove '&& disown' pattern that causes 'no such job' errors - nohup already makes process immune to SIGHUP - disown was causing errors because job context was lost	2026-04-06 09:14:37 +00:00
shoko	1a523a805a	Merge pull request 'fix: syntax error in cmd_continue line 372 (issue #189 )' (#190 ) from fix/issue-syntax-error-372 into main	2026-04-06 10:46:09 +02:00
shokollm	6aa84a35b9	fix: syntax error in cmd_continue line 372 (issue #189 ) Wrap nohup command in subshell to fix '&& disown' syntax error	2026-04-06 08:44:29 +00:00
shoko	6e2841bbda	Merge pull request 'fix: cmd_start and cmd_continue now fork dev agent to work on task (issue #187 )' (#188 ) from fix/issue-187-start-forks-agent into main	2026-04-06 10:13:42 +02:00
shoko	383f538438	Merge pull request 'fix: worktree created in wrong directory (issue #185 )' (#186 ) from fix/issue-185-worktree-wrong-directory into main	2026-04-06 07:33:02 +02:00
shoko	3a2095861f	Merge pull request 'fix: destroy --base -y fails with 'target is required' (issue #183 )' (#184 ) from fix/issue-183-destroy-base-requires-target into main	2026-04-06 06:16:30 +02:00
shoko	4f2a04e0b4	Merge pull request 'fix: get_repo_url() strips user/org from path (issue #181 )' (#182 ) from fix/issue-181-get-repo-url-strips-user-org into main	2026-04-06 06:07:46 +02:00