gfclaw 2.2.0 → 2.3.0

package/bin/cli.js

@@ -268,6 +268,31 @@ async function getGeminiApiKey(rl) {
     logWarn("Gemini API keys typically start with 'AIza'. Make sure you copied the full key.");
   }
 
+  // Validate key by calling Gemini API
+  logInfo("Validating API key...");
+  try {
+    const result = execSync(
+      `curl -s "https://generativelanguage.googleapis.com/v1beta/models?key=${geminiKey}" 2>&1`,
+      { timeout: 15000 }
+    ).toString();
+
+    const parsed = JSON.parse(result);
+    if (parsed.error) {
+      logError(`API key validation failed: ${parsed.error.message}`);
+      const proceed = await ask(rl, "Continue with this key anyway? (y/N): ");
+      if (proceed.toLowerCase() !== "y") {
+        return null;
+      }
+    } else if (parsed.models && parsed.models.length > 0) {
+      logSuccess(`API key valid (${parsed.models.length} models available)`);
+    } else {
+      logWarn("API key accepted but no models found. Billing may not be enabled.");
+    }
+  } catch (e) {
+    logWarn(`Could not validate API key: ${e.message}`);
+    logInfo("Continuing anyway — you can test the key later.");
+  }
+
   logSuccess("API key received");
   return geminiKey;
 }
@@ -798,12 +823,16 @@ ${c("bright", "Usage:")}
   npx gfclaw --status     Show current GFClaw setup
   npx gfclaw --reconfigure  Change photo, personality, or API key
   npx gfclaw --repair     Change allowed Telegram user
+  npx gfclaw --version     Show installed version
+  npx gfclaw --uninstall   Remove GFClaw from your system
 
 ${c("bright", "Aliases:")}
   --help, -h
   --status, -s
   --reconfigure, -c
   --repair, -r
+  --version, -v
+  --uninstall, -u
 `);
 }
 
@@ -1080,6 +1109,179 @@ async function reconfigureApiKey(rl) {
   logSuccess(`API key saved to: ${OPENCLAW_ENV}`);
 }
 
+// --uninstall
+async function runUninstall() {
+  if (!fs.existsSync(OPENCLAW_CONFIG)) {
+    logError("GFClaw is not installed (no OpenClaw config found)");
+    logInfo(`Expected: ${OPENCLAW_CONFIG}`);
+    process.exit(1);
+  }
+
+  const config = readJsonFile(OPENCLAW_CONFIG);
+  if (!config) {
+    logError("Failed to parse OpenClaw config");
+    process.exit(1);
+  }
+
+  const agent = findGfclawAgent(config);
+  if (!agent) {
+    logError("No GFClaw agent found in config");
+    logInfo("Nothing to uninstall.");
+    process.exit(1);
+  }
+
+  const agentId = agent.id;
+  const workspace = agent.workspace || path.join(OPENCLAW_DIR, `workspace-${agentId}`);
+  const accountName = findGfclawAccountName(config, agentId);
+
+  console.log(`
+${c("bright", "GFClaw Uninstall")}
+${c("cyan", "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━")}
+
+${c("cyan", "Will remove:")}
+  • Skill directory: ${SKILL_DEST}
+  • Agent entry: ${c("bright", agentId)}${accountName ? `\n  • Telegram account: ${c("bright", accountName)}` : ""}
+  • Binding: ${agentId} ↔ telegram${accountName ? "/" + accountName : ""}
+  • Skill config entry: ${SKILL_NAME}
+  • SELFIE-SKILL.md from workspace
+  • GFClaw persona section from SOUL.md
+
+${c("yellow", "Will preserve:")}
+  • Workspace data (journal, reminders): ${workspace}
+  • GEMINI_API_KEY in .env
+`);
+
+  const rl = createPrompt();
+
+  try {
+    const confirm = await ask(rl, "This will remove GFClaw from your system. Continue? (y/N): ");
+    if (confirm.toLowerCase() !== "y") {
+      log("\nAborted. No changes made.");
+      rl.close();
+      return;
+    }
+
+    log("");
+    let removed = [];
+
+    // 1. Remove skill directory
+    if (fs.existsSync(SKILL_DEST)) {
+      fs.rmSync(SKILL_DEST, { recursive: true, force: true });
+      logSuccess(`Removed skill directory: ${SKILL_DEST}`);
+      removed.push("skill directory");
+    }
+
+    // 2. Remove agent entry from config.agents.list
+    if (config.agents && config.agents.list) {
+      const before = config.agents.list.length;
+      config.agents.list = config.agents.list.filter((a) => a.id !== agentId);
+      if (config.agents.list.length < before) {
+        logSuccess(`Removed agent entry: ${agentId}`);
+        removed.push("agent entry");
+      }
+    }
+
+    // 3. Remove telegram account
+    if (accountName && config.channels && config.channels.telegram && config.channels.telegram.accounts) {
+      if (config.channels.telegram.accounts[accountName]) {
+        delete config.channels.telegram.accounts[accountName];
+        logSuccess(`Removed Telegram account: ${accountName}`);
+        removed.push("telegram account");
+      }
+    }
+
+    // 4. Remove binding
+    if (config.bindings) {
+      const before = config.bindings.length;
+      config.bindings = config.bindings.filter(
+        (b) => !(b.agentId === agentId && b.match && b.match.channel === "telegram")
+      );
+      if (config.bindings.length < before) {
+        logSuccess(`Removed binding: ${agentId} ↔ telegram`);
+        removed.push("binding");
+      }
+    }
+
+    // 5. Remove skill entry from config.skills.entries
+    if (config.skills && config.skills.entries && config.skills.entries[SKILL_NAME]) {
+      delete config.skills.entries[SKILL_NAME];
+      logSuccess(`Removed skill config entry: ${SKILL_NAME}`);
+      removed.push("skill config");
+    }
+
+    // 6. Remove SELFIE-SKILL.md from main workspace
+    const selfieSkillMain = path.join(OPENCLAW_WORKSPACE, "SELFIE-SKILL.md");
+    if (fs.existsSync(selfieSkillMain)) {
+      fs.unlinkSync(selfieSkillMain);
+      logSuccess(`Removed: ${selfieSkillMain}`);
+      removed.push("SELFIE-SKILL.md (main workspace)");
+    }
+
+    // Also remove from agent workspace if different
+    if (workspace !== OPENCLAW_WORKSPACE) {
+      const selfieSkillAgent = path.join(workspace, "SELFIE-SKILL.md");
+      if (fs.existsSync(selfieSkillAgent)) {
+        fs.unlinkSync(selfieSkillAgent);
+        logSuccess(`Removed: ${selfieSkillAgent}`);
+        removed.push("SELFIE-SKILL.md (agent workspace)");
+      }
+    }
+
+    // 7. Remove GFClaw persona section from SOUL.md
+    if (fs.existsSync(SOUL_MD)) {
+      let soulContent = fs.readFileSync(SOUL_MD, "utf8");
+      const gfclawPattern = /\n## GFClaw[\s\S]*?(?=\n## |\n# |$)/;
+      if (gfclawPattern.test(soulContent)) {
+        soulContent = soulContent.replace(gfclawPattern, "");
+        fs.writeFileSync(SOUL_MD, soulContent);
+        logSuccess(`Removed GFClaw section from: ${SOUL_MD}`);
+        removed.push("SOUL.md persona section");
+      }
+    }
+
+    // Also clean agent workspace SOUL.md if different
+    if (workspace !== OPENCLAW_WORKSPACE) {
+      const agentSoul = path.join(workspace, "SOUL.md");
+      if (fs.existsSync(agentSoul)) {
+        let agentSoulContent = fs.readFileSync(agentSoul, "utf8");
+        const gfclawPattern = /\n## GFClaw[\s\S]*?(?=\n## |\n# |$)/;
+        if (gfclawPattern.test(agentSoulContent)) {
+          agentSoulContent = agentSoulContent.replace(gfclawPattern, "");
+          fs.writeFileSync(agentSoul, agentSoulContent);
+          logSuccess(`Removed GFClaw section from: ${agentSoul}`);
+          removed.push("SOUL.md persona section (agent workspace)");
+        }
+      }
+    }
+
+    // 8. Save updated config
+    writeJsonFile(OPENCLAW_CONFIG, config);
+    logSuccess(`Config saved: ${OPENCLAW_CONFIG}`);
+
+    // 9. Print summary
+    console.log(`
+${c("green", "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━")}
+${c("bright", "  GFClaw has been removed.")}
+${c("green", "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━")}
+
+${c("cyan", "Removed:")} ${removed.join(", ")}
+`);
+
+    logWarn(`Note: Your workspace data (journal, reminders) was preserved at: ${workspace}`);
+    logWarn(`Note: GEMINI_API_KEY in .env was preserved (may be used by other tools)`);
+
+    log("");
+    logInfo("Restart OpenClaw for changes to take effect:");
+    log(`  ${c("bright", "systemctl --user restart openclaw-gateway.service")}`);
+    log("");
+
+    rl.close();
+  } catch (error) {
+    logError(`Uninstall failed: ${error.message}`);
+    rl.close();
+    process.exit(1);
+  }
+}
 // --repair
 async function runRepair() {
   if (!fs.existsSync(OPENCLAW_CONFIG)) {
@@ -1231,6 +1433,11 @@ if (flag === "--help" || flag === "-h") {
   runReconfigure();
 } else if (flag === "--repair" || flag === "-r") {
   runRepair();
+} else if (flag === "--version" || flag === "-v") {
+  const pkg = require(path.join(PACKAGE_ROOT, "package.json"));
+  console.log(`gfclaw v${pkg.version}`);
+} else if (flag === "--uninstall" || flag === "-u") {
+  runUninstall();
 } else {
   main();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gfclaw",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "AI virtual girlfriend agent for OpenClaw — selfies, journal, reminders, and more",
   "bin": {
     "gfclaw": "./bin/cli.js"

package/skill/SKILL.md

@@ -76,15 +76,38 @@ These skills are handled entirely through SOUL.md behavior instructions:
 
 ## Technical Details
 
-- Selfie images generated via Google Gemini (`gemini-2.5-flash-image`)
+- Selfie images generated via Google Gemini (default: `gemini-2.5-flash-image`, configurable via `GEMINI_MODEL` env var)
 - Default reference image: `~/.openclaw/skills/gfclaw-selfie/assets/gfclaw.png`
 - Custom reference: agent sets `GFCLAW_REFERENCE_IMAGE` env var
 - Journal entries stored in `workspace/journal/` directory
 - Reminders stored in `workspace/reminders.json`
 - Images auto-deleted after sending (no disk waste)
+- Debug mode: set `GFCLAW_DEBUG=1` for verbose logging in selfie script
+- Rate limiting: 30-second cooldown between selfie generations
 
 ## Important Notes
 
 - **Do NOT save images to /tmp** — the message tool cannot access files outside the workspace
 - **Do NOT manually call curl or the Gemini API** — use the scripts
 - **Do NOT try to read files outside the agent workspace** — use script paths directly
+
+## CLI Management
+
+```bash
+npx gfclaw               # Install / reconfigure GFClaw
+npx gfclaw --status      # Check installation status
+npx gfclaw --reconfigure # Change settings
+npx gfclaw --repair      # Fix broken installation
+npx gfclaw --version     # Show installed version
+npx gfclaw --uninstall   # Clean removal from system
+```
+
+## Environment Variables
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `GEMINI_API_KEY` | (required) | Google Gemini API key |
+| `GEMINI_MODEL` | `gemini-2.5-flash-image` | Gemini model for image generation |
+| `GFCLAW_DEBUG` | `0` | Set to `1` for verbose logging |
+| `GFCLAW_REFERENCE_IMAGE` | default asset | Custom reference photo path |
+| `GFCLAW_PERSONALITY` | (from personality.txt) | Personality traits override |

package/skill/scripts/gfclaw-selfie.sh

@@ -37,6 +37,17 @@ if [ -z "${GEMINI_API_KEY:-}" ]; then
     exit 1
 fi
 
+# Configurable model (override with GEMINI_MODEL env var)
+GEMINI_MODEL="${GEMINI_MODEL:-gemini-2.5-flash-image}"
+
+# Debug mode
+DEBUG="${GFCLAW_DEBUG:-0}"
+debug_log() {
+    if [ "$DEBUG" = "1" ]; then
+        echo -e "${YELLOW}[DEBUG]${NC} $1"
+    fi
+}
+
 # Check for jq
 if ! command -v jq &> /dev/null; then
     log_error "jq is required but not installed"
@@ -123,6 +134,23 @@ fi
 log_info "Mode: $MODE"
 log_info "Editing reference image with prompt: $EDIT_PROMPT"
 
+debug_log "EDIT_PROMPT: $EDIT_PROMPT"
+
+# Rate limiting: minimum 30 seconds between selfie calls
+COOLDOWN_FILE="/tmp/gfclaw-cooldown.lock"
+COOLDOWN_SECS=30
+if [ -f "$COOLDOWN_FILE" ]; then
+    LAST_RUN=$(cat "$COOLDOWN_FILE" 2>/dev/null || echo 0)
+    NOW=$(date +%s)
+    ELAPSED=$((NOW - LAST_RUN))
+    if [ "$ELAPSED" -lt "$COOLDOWN_SECS" ]; then
+        REMAINING=$((COOLDOWN_SECS - ELAPSED))
+        log_warn "Cooldown active. Please wait ${REMAINING}s before generating another selfie."
+        exit 1
+    fi
+fi
+date +%s > "$COOLDOWN_FILE"
+
 # Build JSON payload using python3 (avoids argument list too long for base64)
 TMPFILE=$(mktemp /tmp/gemini-req-XXXXXX.json)
 # Save output image in MAIN workspace (CLI uses main agent context, fs.workspaceOnly blocks other paths)
@@ -131,35 +159,55 @@ mkdir -p "$OUTPUT_DIR"
 OUTPUT_IMAGE="${OUTPUT_DIR}/selfie-$$.png"
 trap "rm -f '$TMPFILE' '$OUTPUT_IMAGE'" EXIT
 
-python3 -c "
+python3 - "$REFERENCE_IMAGE" "$EDIT_PROMPT" "$TMPFILE" <<'PYEOF'
 import base64, json, sys
 
-with open('$REFERENCE_IMAGE', 'rb') as f:
+ref_image = sys.argv[1]
+edit_prompt = sys.argv[2]
+tmp_file = sys.argv[3]
+
+with open(ref_image, 'rb') as f:
     img_b64 = base64.b64encode(f.read()).decode()
 
 payload = {
     'contents': [{
         'parts': [
-            {'text': $(echo "$EDIT_PROMPT" | python3 -c "import json,sys; print(json.dumps(sys.stdin.read().strip()))")},
+            {'text': edit_prompt},
             {'inline_data': {'mime_type': 'image/png', 'data': img_b64}}
         ]
     }],
     'generationConfig': {'responseModalities': ['IMAGE']}
 }
 
-with open('$TMPFILE', 'w') as f:
+with open(tmp_file, 'w') as f:
     json.dump(payload, f)
-"
+PYEOF
 
 log_info "Sending request to Gemini..."
 
-# Call Gemini API
-RESPONSE=$(curl -s -X POST \
-    "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.5-flash-image:generateContent" \
-    -H "x-goog-api-key: $GEMINI_API_KEY" \
-    -H "Content-Type: application/json" \
-    -d @"$TMPFILE")
+# Call Gemini API with retry logic
+GEMINI_URL="https://generativelanguage.googleapis.com/v1beta/models/${GEMINI_MODEL}:generateContent"
+debug_log "Gemini API URL: $GEMINI_URL"
+MAX_RETRIES=3
+RETRY_DELAY=2
+RESPONSE=""
+for ATTEMPT in $(seq 1 $MAX_RETRIES); do
+    RESPONSE=$(curl -s -X POST \
+        "$GEMINI_URL" \
+        -H "x-goog-api-key: $GEMINI_API_KEY" \
+        -H "Content-Type: application/json" \
+        -d @"$TMPFILE") && break
+    if [ "$ATTEMPT" -lt "$MAX_RETRIES" ]; then
+        log_warn "API call failed (attempt $ATTEMPT/$MAX_RETRIES). Retrying in ${RETRY_DELAY}s..."
+        sleep "$RETRY_DELAY"
+    else
+        log_error "API call failed after $MAX_RETRIES attempts."
+        exit 1
+    fi
+done
 
+debug_log "Response size: ${#RESPONSE} chars"
+debug_log "Response (first 500 chars): ${RESPONSE:0:500}"
 # Check for errors
 ERROR_MSG=$(echo "$RESPONSE" | jq -r '.error.message // empty')
 if [ -n "$ERROR_MSG" ]; then