openclacky 0.9.28 → 0.9.30

data/lib/clacky/default_skills/new/SKILL.md

@@ -43,9 +43,10 @@ Before running the setup script, check if current directory is empty:
 - If user declines, abort and suggest creating project in an empty directory
 
 ### 2. Run Setup Script
-Execute the create_rails_project.sh script in current directory:
+Execute the `create_rails_project.sh` script (see Supporting Files below) in current directory.
+Use the exact absolute path shown in the Supporting Files section:
 ```bash
-<clacky_skills_path>/new/scripts/create_rails_project.sh
+<absolute path to create_rails_project.sh from Supporting Files>
 ```
 
 The script will automatically:
@@ -74,7 +75,114 @@ The script will automatically:
 - Script completes successfully
 - Project is ready to run
 
-### 3. Start Development Server
+### 3. Cloud Project Init
+After the setup script completes, initialize the cloud project binding.
+
+**Goal**: Create a cloud project on the Clacky platform, then inject the returned
+`categorized_config` (auth/email/llm/stripe credentials) into the local development
+environment so the app can use platform services out of the box.
+
+#### 3.1 Check existing binding
+Check if `.clacky/openclacky.yml` already exists:
+```bash
+ls .clacky/openclacky.yml 2>/dev/null && cat .clacky/openclacky.yml || echo "NOT_FOUND"
+```
+
+If it exists, ask the user:
+```
+A cloud project binding already exists:
+  Project: <project_name> (<project_id>)
+
+Do you want to reuse this binding? (y/n)
+```
+- **Yes** → skip to step 3.5 (files already written, no need to re-create)
+- **No** → continue to 3.2
+
+#### 3.2 Run the cloud project init script
+Use the `cloud_project_init.sh` script from Supporting Files.
+Run it with safe_shell from the project directory (no arguments needed — it auto-reads `~/.clacky/clacky_cloud.yml`):
+
+```bash
+bash <absolute_path_to_cloud_project_init.sh>
+```
+
+The script outputs a single JSON line. Capture the full output.
+
+**If the output contains `"success":false`** → soft-fail:
+```
+⚠️  Cloud project creation failed: <error value from JSON>
+    Skipping cloud init. You can link a project later with /deploy.
+```
+Then skip to Step 4.
+
+**If the output contains `"success":true`** → parse the JSON and extract:
+- `project_id` — the cloud project UUID
+- `project_name` — the project name
+- `categorized_config` — nested object with auth/email/llm/stripe keys
+
+The `categorized_config` looks like:
+```json
+{
+  "auth":   { "CLACKY_AUTH_CLIENT_ID": "...", "CLACKY_AUTH_CLIENT_SECRET": "...", "CLACKY_AUTH_HOST": "..." },
+  "email":  { "CLACKY_EMAIL_API_KEY": "...", "CLACKY_EMAIL_SMTP_ADDRESS": "...", "CLACKY_EMAIL_SMTP_DOMAIN": "...", "CLACKY_EMAIL_SMTP_PORT": 25, "CLACKY_EMAIL_SMTP_USERNAME": "..." },
+  "llm":    { "CLACKY_LLM_API_KEY": "...", "CLACKY_LLM_BASE_URL": "..." },
+  "stripe": { "CLACKY_STRIPE_PUBLISHABLE_KEY": "...", "CLACKY_STRIPE_SECRET_KEY": "...", "CLACKY_STRIPE_WEBHOOK_SECRET": "..." }
+}
+```
+
+#### 3.3 Write `.clacky/openclacky.yml`
+Create the directory and write the binding file (no sensitive data — safe to commit):
+```bash
+mkdir -p .clacky
+```
+Then use the `write` tool to create `.clacky/openclacky.yml`:
+```yaml
+# .clacky/openclacky.yml
+# Committed to git. No sensitive data. Shared across team.
+project_id: "<project_id from JSON>"
+project_name: "<project_name from JSON>"
+```
+
+#### 3.4 Update `config/application.yml`
+Read the current `config/application.yml` first, then **prepend** a clearly-marked block at the very top of the file.
+Use the `write` tool to rewrite the file with the cloud config block inserted before the existing content:
+```yaml
+# --- Auto-generated by clacky /new (Cloud project: <project_name>) ---
+CLACKY_AUTH_CLIENT_ID: "<value>"
+CLACKY_AUTH_CLIENT_SECRET: "<value>"
+CLACKY_AUTH_HOST: "<value>"
+CLACKY_EMAIL_API_KEY: "<value>"
+CLACKY_EMAIL_SMTP_ADDRESS: "<value>"
+CLACKY_EMAIL_SMTP_DOMAIN: "<value>"
+CLACKY_EMAIL_SMTP_PORT: "<value>"
+CLACKY_EMAIL_SMTP_USERNAME: "<value>"
+CLACKY_LLM_API_KEY: "<value>"
+CLACKY_LLM_BASE_URL: "<value>"
+CLACKY_STRIPE_PUBLISHABLE_KEY: "<value>"
+CLACKY_STRIPE_SECRET_KEY: "<value>"
+CLACKY_STRIPE_WEBHOOK_SECRET: "<value>"
+
+# --- (original content below) ---
+<original file content>
+```
+Only include keys present in the JSON response.
+
+#### 3.5 Git commit
+Commit the cloud project binding file.
+Note: `config/application.yml` is gitignored (it contains secrets) — do NOT try to add it.
+```bash
+git add .clacky/openclacky.yml
+git commit -m "Initialize cloud project binding"
+```
+
+Print a success summary:
+```
+✅ Cloud project initialized!
+   Project: <project_name> (<project_id>)
+   Config written to: config/application.yml
+```
+
+### 4. Start Development Server
 After the script completes, use the run_project tool to start the server:
 ```
 run_project(action: "start")
@@ -100,6 +208,8 @@ What would you like to develop next?
 - Node.js < 22 → Script installs automatically (macOS/Ubuntu)
 - PostgreSQL missing → Script installs automatically (macOS/Ubuntu)
 - bin/setup fails → Show error, suggest running `./bin/setup` manually
+- Cloud project creation fails → Soft-fail with warning, continue to start server
+- workspace_key missing → Ask user interactively; skip cloud init if user declines
 - run_project fails → Check logs with `run_project(action: "output")` and verify database status
 
 ## Example Interaction
@@ -112,5 +222,7 @@ Response:
 4. Checking environment dependencies...
 5. Installing project dependencies...
 6. Project setup complete!
-7. Starting development server with run_project...
-8. ✨ Server running! Visit http://localhost:3000
+7. Initializing cloud project binding...
+8. ✅ Cloud project created and config injected into config/application.yml!
+9. Starting development server with run_project...
+10. ✨ Server running! Visit http://localhost:3000

data/lib/clacky/default_skills/new/scripts/cloud_project_init.sh

@@ -0,0 +1,74 @@
+#!/bin/bash
+# Cloud Project Init Script
+# Connects the local Rails project to the Clacky cloud platform.
+#
+# Usage: cloud_project_init.sh [project_name] [workspace_key] [base_url]
+#   - project_name:  defaults to current directory name
+#   - workspace_key: defaults to value in ~/.clacky/clacky_cloud.yml
+#   - base_url:      defaults to https://api.clacky.ai
+#
+# Outputs a JSON result on stdout:
+#   { "success": true,  "project_id": "...", "project_name": "..." }
+#   { "success": false, "error": "..." }
+
+set -e
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+GEM_LIB_DIR="$( cd "$SCRIPT_DIR/../../../.." && pwd )"
+
+PROJECT_NAME="${1:-$(basename "$PWD")}"
+WORKSPACE_KEY="${2:-}"
+BASE_URL="${3:-}"
+
+# --- Load workspace_key from clacky_cloud.yml if not provided ---
+if [ -z "$WORKSPACE_KEY" ]; then
+  PLATFORM_YML="$HOME/.clacky/clacky_cloud.yml"
+  if [ -f "$PLATFORM_YML" ]; then
+    WORKSPACE_KEY=$(ruby -e "require 'yaml'; y = YAML.safe_load(File.read('$PLATFORM_YML')); print y['workspace_key'].to_s.strip" 2>/dev/null || true)
+  fi
+fi
+
+if [ -z "$BASE_URL" ]; then
+  PLATFORM_YML="$HOME/.clacky/clacky_cloud.yml"
+  if [ -f "$PLATFORM_YML" ]; then
+    BASE_URL=$(ruby -e "require 'yaml'; y = YAML.safe_load(File.read('$PLATFORM_YML')); print y['base_url'].to_s.strip" 2>/dev/null || true)
+  fi
+  BASE_URL="${BASE_URL:-https://api.clacky.ai}"
+fi
+
+if [ -z "$WORKSPACE_KEY" ]; then
+  echo '{"success":false,"error":"No workspace_key found. Please set it in ~/.clacky/clacky_cloud.yml or pass as argument."}'
+  exit 0
+fi
+
+# --- Call the API via Ruby one-liner using the gem's CloudProjectClient ---
+RUBY_SCRIPT=$(cat <<'RUBY'
+require_relative ENV['GEM_LIB_DIR'] + '/clacky/cloud_project_client'
+require 'json'
+
+workspace_key = ENV['WORKSPACE_KEY']
+base_url      = ENV['BASE_URL']
+project_name  = ENV['PROJECT_NAME']
+
+client = Clacky::CloudProjectClient.new(workspace_key, base_url: base_url)
+result = client.create_project(name: project_name)
+
+if result[:success]
+  project = result[:project]
+  puts JSON.generate({
+    success: true,
+    project_id:   project['id'],
+    project_name: project['name'],
+    categorized_config: project['categorized_config'] || {}
+  })
+else
+  puts JSON.generate({ success: false, error: result[:error] })
+end
+RUBY
+)
+
+GEM_LIB_DIR="$GEM_LIB_DIR" \
+WORKSPACE_KEY="$WORKSPACE_KEY" \
+BASE_URL="$BASE_URL" \
+PROJECT_NAME="$PROJECT_NAME" \
+ruby -e "$RUBY_SCRIPT"

data/lib/clacky/default_skills/new/scripts/create_rails_project.sh

@@ -85,6 +85,35 @@ clone_template() {
     print_success "Git repository initialized"
 }
 
+# Add x86_64-linux platform to Gemfile.lock for Railway deployment
+# Railway always builds on x86_64-linux; local dev (macOS/Windows) may not include it.
+prepare_linux_platform() {
+    print_step "Preparing Gemfile.lock for Linux deployment (Railway)..."
+
+    if [ ! -f "Gemfile.lock" ]; then
+        print_warning "Gemfile.lock not found yet — skipping platform prep (will be handled at deploy time)"
+        return 0
+    fi
+
+    # Idempotent: skip if already present
+    if grep -q "x86_64-linux" Gemfile.lock; then
+        print_success "x86_64-linux platform already present in Gemfile.lock"
+        return 0
+    fi
+
+    if command -v bundle > /dev/null 2>&1; then
+        if bundle lock --add-platform x86_64-linux > /dev/null 2>&1; then
+            git add Gemfile.lock > /dev/null 2>&1
+            git commit -m "chore: add x86_64-linux platform for Railway deployment" > /dev/null 2>&1
+            print_success "Added x86_64-linux platform to Gemfile.lock"
+        else
+            print_warning "Could not add Linux platform to Gemfile.lock (will be handled at deploy time)"
+        fi
+    else
+        print_warning "bundler not found — skipping platform prep (will be handled at deploy time)"
+    fi
+}
+
 # Check and install environment dependencies
 check_environment() {
     print_step "Checking environment dependencies..."
@@ -157,6 +186,9 @@ main() {
         exit 1
     fi
 
+    # Prepare Gemfile.lock for Railway Linux deployment (idempotent)
+    prepare_linux_platform
+
     # Project is ready
     echo ""
     echo "╔═══════════════════════════════════════════════════════════╗"