@profoundlogic/coderflow-server 0.7.9 → 0.8.1

package/dist/base-image/coder-git-credential-helper

@@ -197,6 +197,22 @@ fetch_from_server() {
     if [ "$http_code" != "200" ]; then
         debug_log "Server returned HTTP $http_code"
         debug_log "Response: $response"
+
+        # Surface actionable errors to the user via stderr
+        local error_code error_message
+        error_code=$(echo "$response" | jq -r '.error_code // empty' 2>/dev/null)
+        error_message=$(echo "$response" | jq -r '.message // empty' 2>/dev/null)
+
+        if [ "$error_code" = "oauth_token_expired" ]; then
+            echo "[coderflow] Git authentication has expired for this repository." >&2
+            echo "[coderflow] Please reconnect your Git account in Settings > Git Connections." >&2
+        elif [ "$error_code" = "user_not_connected" ]; then
+            echo "[coderflow] Git account not connected for this repository." >&2
+            echo "[coderflow] Please connect your account in Settings > Git Connections." >&2
+        elif [ -n "$error_message" ]; then
+            echo "[coderflow] Credential error: $error_message" >&2
+        fi
+
         return 1
     fi
 

package/dist/base-image/entrypoint.sh

@@ -51,6 +51,39 @@ log_success() {
     log "SUCCESS: $*"
 }
 
+write_task_status() {
+    local phase="$1"
+    local progress="$2"
+    local stage="${3:-}"
+    local error_message="${4:-}"
+
+    if [ -n "$stage" ] || [ -n "$error_message" ]; then
+        jq -n \
+            --argjson progress "$progress" \
+            --arg phase "$phase" \
+            --arg updated_at "$(date -Iseconds)" \
+            --arg stage "$stage" \
+            --arg error "$error_message" \
+            '{
+                progress: $progress,
+                phase: $phase,
+                updated_at: $updated_at
+            }
+            + (if $stage != "" then {stage: $stage} else {} end)
+            + (if $error != "" then {error: $error} else {} end)' > "$TASK_OUTPUT_DIR/.status"
+    else
+        jq -n \
+            --argjson progress "$progress" \
+            --arg phase "$phase" \
+            --arg updated_at "$(date -Iseconds)" \
+            '{
+                progress: $progress,
+                phase: $phase,
+                updated_at: $updated_at
+            }' > "$TASK_OUTPUT_DIR/.status"
+    fi
+}
+
 # Enhanced timing function with millisecond precision (only when DEBUG_TIMING is enabled)
 log_timing() {
     if [ "${DEBUG_TIMING:-false}" = "true" ]; then
@@ -170,6 +203,7 @@ update_repositories() {
 
     # Array to store background job PIDs
     declare -a update_pids=()
+    local failed_count=0
 
     # Process each repository using jq
     for index in $(seq 0 $((repo_count - 1))); do
@@ -178,6 +212,7 @@ update_repositories() {
 
         if [ -z "$repo_json" ] || [ "$repo_json" = "null" ]; then
             log_error "Invalid repository configuration at index $index" >&2
+            failed_count=$((failed_count + 1))
             continue
         fi
 
@@ -188,6 +223,7 @@ update_repositories() {
 
         if [ -z "$repo_name" ] || [ "$repo_name" = "null" ]; then
             log_error "Invalid repository configuration at index $index" >&2
+            failed_count=$((failed_count + 1))
             continue
         fi
 
@@ -384,7 +420,9 @@ update_repositories() {
             update_pids+=($!)
         else
             # Run immediately (sequential)
-            update_single_repo "$repo_name" "$repo_url" "$repo_branch" "$repo_path"
+            if ! update_single_repo "$repo_name" "$repo_url" "$repo_branch" "$repo_path"; then
+                failed_count=$((failed_count + 1))
+            fi
         fi
     done
 
@@ -393,7 +431,6 @@ update_repositories() {
         timing_checkpoint "update_repositories: Waiting for parallel updates"
         log "Waiting for ${#update_pids[@]} repository updates to complete..." >&2
 
-        local failed_count=0
         for pid in "${update_pids[@]}"; do
             if ! wait $pid; then
                 failed_count=$((failed_count + 1))
@@ -405,6 +442,11 @@ update_repositories() {
         fi
     fi
 
+    if [ $failed_count -gt 0 ]; then
+        timing_checkpoint "update_repositories: END (failed)"
+        return 1
+    fi
+
     log "Repository update complete" >&2
     timing_checkpoint "update_repositories: END (all repos complete)"
     return 0
@@ -673,6 +715,26 @@ REPO_EOF
     echo "$repos_changed_json"
 }
 
+write_init_failure_summary() {
+    local stage="$1"
+    local summary_file="$TASK_OUTPUT_DIR/summary.md"
+
+    if [ -s "$summary_file" ]; then
+        return 0
+    fi
+
+    cat <<SUMMARY_EOF > "$summary_file"
+Task ${TASK_ID} failed during initialization.
+
+- Task Type: ${TASK_TYPE}
+- Environment: ${ENVIRONMENT}
+- Stage: ${stage}
+- Next Step: Review log.txt for the specific initialization error.
+SUMMARY_EOF
+
+    log "Summary file created at $summary_file"
+}
+
 # Generate task.json metadata file
 generate_task_json() {
     local exit_code=$1
@@ -848,7 +910,13 @@ main() {
         REPO_UPDATE_PID=$!
         timing_checkpoint "main: Repository updates backgrounded (PID: $REPO_UPDATE_PID)"
     else
-        update_repositories
+        if ! update_repositories; then
+            log_error "Repository synchronization failed; aborting task execution"
+            write_task_status "InitFailed" "0" "repository_sync" "Repository synchronization failed; aborting task execution"
+            write_init_failure_summary "repository_sync"
+            generate_task_json 1 "repository_sync"
+            return 1
+        fi
         timing_checkpoint "main: Repository updates complete (synchronous)"
     fi
 
@@ -947,6 +1015,8 @@ main() {
         timing_checkpoint "main: Setup script skipped"
     elif ! run_setup_script; then
         log_error "Environment setup script failed; aborting task execution"
+        write_task_status "InitFailed" "0" "setup_script" "Environment setup script failed; aborting task execution"
+        write_init_failure_summary "setup_script"
         generate_task_json 1 "setup_script"
         return 1
     else
@@ -962,7 +1032,7 @@ main() {
     local exit_code=0
 
     # Update status to indicate initialization is complete
-    echo "{\"progress\": 0.01, \"phase\": \"Ready\", \"updated_at\": \"$(date -Iseconds)\"}" > "$TASK_OUTPUT_DIR/.status"
+    write_task_status "Ready" "0.01"
     timing_checkpoint "main: Status file written, ready for task execution"
 
     # If SETUP_ONLY mode, return here without executing tasks (for interactive containers)
@@ -973,7 +1043,7 @@ main() {
 
     # If STAGED_TASK mode, complete setup but skip agent execution (user will start later)
     if [ "${STAGED_TASK:-false}" = "true" ]; then
-        echo "{\"progress\": 0.01, \"phase\": \"Staged\", \"updated_at\": \"$(date -Iseconds)\"}" > "$TASK_OUTPUT_DIR/.status"
+        write_task_status "Staged" "0.01"
         log "Setup complete (STAGED_TASK mode), waiting for instructions"
         return 0
     fi

package/dist/base-image/sync-repos.sh

@@ -88,9 +88,38 @@ process_repo() {
     local files_detail=$(echo "$files_list" | jq -R -s -c 'split("\n") | map(select(length > 0)) | map({path: ., added: 0, deleted: 0})')
     [ -z "$files_detail" ] || [ "$files_detail" = "null" ] && files_detail='[]'
 
+    # Detect upstream divergence for the current branch when tracking is configured.
+    local upstream_ref
+    upstream_ref=$(git rev-parse --abbrev-ref --symbolic-full-name @{upstream} 2>/dev/null || true)
+    local upstream_status="no-upstream"
+    local upstream_behind=0
+    local upstream_ahead=0
+
+    if [ -n "$upstream_ref" ] && [ "$upstream_ref" != "@{upstream}" ]; then
+        upstream_status="up-to-date"
+        local upstream_remote="${upstream_ref%%/*}"
+
+        if [ -n "$upstream_remote" ]; then
+            git fetch "$upstream_remote" --quiet 2>/dev/null || true
+        fi
+
+        upstream_behind=$(git rev-list --count HEAD.."$upstream_ref" 2>/dev/null || echo "0")
+        upstream_ahead=$(git rev-list --count "$upstream_ref"..HEAD 2>/dev/null || echo "0")
+        upstream_behind=${upstream_behind:-0}
+        upstream_ahead=${upstream_ahead:-0}
+
+        if [ "$upstream_behind" -gt 0 ] && [ "$upstream_ahead" -gt 0 ]; then
+            upstream_status="diverged"
+        elif [ "$upstream_behind" -gt 0 ]; then
+            upstream_status="behind"
+        elif [ "$upstream_ahead" -gt 0 ]; then
+            upstream_status="ahead"
+        fi
+    fi
+
     # Write JSON result
     cat > "$output_file" <<EOF
-{"name":"$repo_name","path":"$repo_path","branch":"$current_branch","files_changed":$files_changed,"lines_added":$lines_added,"lines_deleted":$lines_deleted,"patch_file":"$patch_file","files":$files_detail}
+{"name":"$repo_name","path":"$repo_path","branch":"$current_branch","upstream_status":"$upstream_status","upstream_behind":$upstream_behind,"upstream_ahead":$upstream_ahead,"files_changed":$files_changed,"lines_added":$lines_added,"lines_deleted":$lines_deleted,"patch_file":"$patch_file","files":$files_detail}
 EOF
 }