golem-cc 0.1.8 → 0.1.10

package/bin/golem

@@ -236,34 +236,45 @@ Spec file format (save to specs/{topic-name}.md):
 
 Keep responses concise. Ask one question at a time."
 
-    # Load agent prompt if available
-    if [[ -f ".golem/agents/spec-builder.md" ]]; then
-        spec_prompt=$(sed '1,/^---$/d' .golem/agents/spec-builder.md | sed '1,/^---$/d')
-    fi
+    local tmp_err=$(mktemp)
+    trap "rm -f $tmp_err" EXIT
+
+    # Helper to run claude and handle errors
+    run_claude() {
+        local output
+        local exit_code
 
-    local tmp_file=$(mktemp)
-    trap "rm -f $tmp_file" EXIT
+        output=$(claude "$@" 2>"$tmp_err")
+        exit_code=$?
 
-    # Get initial response with session ID
-    claude -p \
-        --dangerously-skip-permissions \
-        --output-format json \
-        --append-system-prompt "$spec_prompt" \
-        "Start the spec-building conversation. Ask what I'm building." \
-        > "$tmp_file" 2>/dev/null
+        if [[ $exit_code -ne 0 ]] || grep -q "API Error" "$tmp_err" 2>/dev/null; then
+            local err_msg=$(cat "$tmp_err")
+            if [[ "$err_msg" == *"tool_use"* ]] || [[ "$err_msg" == *"invalid_request_error"* ]]; then
+                echo ""
+                echo -e "${YELLOW}Session corrupted. Starting fresh...${NC}"
+                echo ""
+                return 1
+            else
+                echo -e "${RED}Error: $err_msg${NC}"
+                return 1
+            fi
+        fi
 
-    local session_id=$(jq -r '.session_id // empty' "$tmp_file" 2>/dev/null)
-    local response=$(jq -r '.result // empty' "$tmp_file" 2>/dev/null)
+        echo "$output"
+        return 0
+    }
 
-    if [[ -z "$session_id" ]]; then
-        echo -e "${RED}Failed to start session. Make sure Claude CLI is working.${NC}"
+    # First message - starts a new session
+    echo -e "${CYAN}Claude:${NC}"
+    if ! run_claude -p --dangerously-skip-permissions --append-system-prompt "$spec_prompt" \
+        "Start the spec-building conversation. Ask what I'm building."; then
+        echo -e "${RED}Failed to start session${NC}"
         return 1
     fi
-
-    echo -e "${CYAN}Claude:${NC} $response"
     echo ""
 
     # Conversation loop
+    local restart_needed=false
     while true; do
         echo -ne "${GREEN}You:${NC} "
         read -r user_input
@@ -276,17 +287,27 @@ Keep responses concise. Ask one question at a time."
             break
         }
 
-        # Continue conversation with session ID
-        claude -p \
-            --dangerously-skip-permissions \
-            --output-format json \
-            --resume "$session_id" \
-            "$user_input" \
-            > "$tmp_file" 2>/dev/null
-
-        response=$(jq -r '.result // empty' "$tmp_file" 2>/dev/null)
         echo ""
-        echo -e "${CYAN}Claude:${NC} $response"
+        echo -e "${CYAN}Claude:${NC}"
+        if ! run_claude -p --continue --dangerously-skip-permissions "$user_input"; then
+            # Session error - offer to restart
+            echo -e "${YELLOW}Would you like to start a new session? (y/n)${NC} "
+            read -r restart_choice
+            if [[ "$restart_choice" == "y" ]]; then
+                echo ""
+                echo -e "${BLUE}Starting new session...${NC}"
+                echo -e "${DIM}Paste your previous context to continue where you left off.${NC}"
+                echo ""
+                echo -e "${CYAN}Claude:${NC}"
+                if ! run_claude -p --dangerously-skip-permissions --append-system-prompt "$spec_prompt" \
+                    "Start the spec-building conversation. Ask what I'm building."; then
+                    echo -e "${RED}Failed to start new session${NC}"
+                    return 1
+                fi
+            else
+                echo -e "${DIM}Type 'done' to exit or try again${NC}"
+            fi
+        fi
         echo ""
     done
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "golem-cc",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Autonomous coding loop with Claude - structured specs, ralph loop execution, code simplification",
   "bin": {
     "golem-cc": "./bin/install.cjs"