scpl-updated-mcp-server 1.0.4 → 1.0.6

package/SCPL_REFERENCE.md

@@ -0,0 +1,504 @@
+# ScPL Language Reference
+
+ScPL (Shortcut Programming Language) lets you write Apple Shortcuts as text code instead of dragging blocks.
+
+## Basic Syntax
+
+```scpl
+ActionName "argument1" "argument2"
+ActionName argument=value anotherArg=value
+```
+
+## Variables
+
+Three types with `type:name` syntax:
+
+| Type | Syntax | Description |
+|------|--------|-------------|
+| Named | `v:MyVar` | Set with SetVariable |
+| Magic | `mv:MyVar` | Auto-created with `->` arrow |
+| Special | `s:Name` | Built-in system variables |
+
+### Special Variables
+- `s:ShortcutInput` - Input to the shortcut
+- `s:Clipboard` - Current clipboard contents
+- `s:CurrentDate` - Current date/time
+- `s:AskWhenRun` - Prompt user at runtime
+- `s:ActionInput` - Input to current action
+
+### Setting Variables
+
+```scpl
+# Named variable (creates SetVariable action)
+Text "Hello" -> v:MyText
+# or
+SetVariable v:MyText
+
+# Magic variable (no action created, just reference)
+Text "Hello" -> mv:MyMagic
+
+# Pre-assignment style
+mv:Result = Text "Hello"
+```
+
+### Using Variables in Text
+
+```scpl
+Text "The value is \(v:MyVariable)"
+Text "Clipboard: \(s:Clipboard)"
+```
+
+## Flow Control
+
+### If/Otherwise/End If
+
+```scpl
+Text "test"
+If Equals "test"
+    ShowResult "Match!"
+Otherwise
+    ShowResult "No match"
+End If
+```
+
+### Repeat
+
+```scpl
+Repeat 5
+    ShowResult "Loop iteration"
+End Repeat
+```
+
+### Repeat with Each
+
+```scpl
+RepeatWithEach [item1, item2, item3]
+    ShowResult "Processing: \(mv:RepeatItem)"
+End RepeatWithEach
+```
+
+### Choose from Menu
+
+```scpl
+ChooseFromMenu "Pick one" ["Option A", "Option B"]
+Case "Option A"
+    ShowResult "You picked A"
+Case "Option B"
+    ShowResult "You picked B"
+End Menu
+```
+
+## Field Types
+
+### Text Fields
+```scpl
+Text "Single line"
+Text
+| Multiline text
+| Second line
+| With variable: \(v:Name)
+```
+
+### Numbers
+```scpl
+Number 42
+Number 3.14
+Number -100
+```
+
+### Booleans
+```scpl
+SetWifi true
+SetBluetooth false
+```
+
+### Lists
+```scpl
+List ["item1", "item2", "item3"]
+# or
+List
+| Item 1
+| Item 2
+```
+
+### Dictionaries
+```scpl
+Dictionary {
+    key: "value"
+    number: 42
+    nested: {inner: "data"}
+}
+# Quotes and commas optional
+```
+
+## Variable Aggrandizements
+
+Access properties of variables:
+
+```scpl
+# Get dictionary key
+v:MyDict{as:Dictionary,key:myKey}
+# Shorthand
+v:MyDict:myKey
+
+# Get property
+v:Contact{as:Contact,get:Email}
+```
+
+## Actions Inside Actions
+
+Inline actions in parentheses:
+
+```scpl
+Text "Number is \(Number 42)"
+If Equals (Text "compare value")
+    ShowResult "Match"
+End If
+```
+
+## Comments
+
+```scpl
+# This is a comment
+// Also a comment
+-- Also works
+```
+
+---
+
+# Common Actions
+
+## Text & Display
+
+```scpl
+Text "Your text here"
+ShowResult "Display this"
+ShowAlert title="Title" message="Body text"
+ShowNotification title="Hey" body="Message"
+```
+
+## Clipboard
+
+```scpl
+GetClipboard
+SetClipboard "New content"
+# or with variable
+Text "Copy this" -> mv:Content
+SetClipboard mv:Content
+```
+
+## Variables
+
+```scpl
+SetVariable v:Name
+GetVariable v:Name
+AddToVariable v:List
+```
+
+## Lists & Dictionaries
+
+```scpl
+List ["a", "b", "c"]
+GetItemFromList "First Item"
+GetItemFromList "Last Item"
+GetItemFromList "Random Item"
+Count "Items"
+
+Dictionary {key: "value"}
+GetDictionaryValue key="mykey"
+SetDictionaryValue key="mykey" value="newvalue"
+```
+
+## Math
+
+```scpl
+Number 10
+Calculate "+" 5
+Calculate "*" 2
+Calculate "/" 4
+RoundNumber "Normal"
+RandomNumber min=1 max=100
+```
+
+## Dates
+
+```scpl
+Date "tomorrow at 9am"
+FormatDate "short"
+AdjustDate "1 week"
+GetTimeBetweenDates unit="Days"
+```
+
+## Files
+
+```scpl
+GetFile service="iCloud Drive" filepath="/path/to/file"
+SaveFile destinationpath="/save/here"
+GetFolderContents
+DeleteFiles immediately=true
+```
+
+## Web
+
+```scpl
+URL "https://example.com"
+GetContentsOfURL
+ExpandURL
+GetComponentOfURL component="Host"
+```
+
+---
+
+# macOS Tahoe Actions (New)
+
+## Apple Intelligence (Apple Silicon only)
+
+```scpl
+# Ask AI model
+AskLLM model="Apple Intelligence" prompt="Summarize this text"
+AskLLM model="ChatGPT" prompt="Explain quantum computing"
+
+# Image generation
+GenerateImage prompt="A sunset over mountains" style="Illustration"
+```
+
+## AI Assistants
+
+```scpl
+# ChatGPT (requires app)
+AskChatGPT prompt="Help me write an email"
+OpenChatGPTVoiceMode
+
+# Claude (requires app)
+AskClaude message="Analyze this code"
+```
+
+## Shell Scripts
+
+```scpl
+# Bash script
+RunShellScript shell="/bin/bash" script="echo Hello World"
+
+# Zsh with input
+GetClipboard
+RunShellScript shell="/bin/zsh" script="cat | wc -w"
+
+# AppleScript
+RunAppleScript script="display dialog \"Hello!\""
+
+# JavaScript for Automation
+RunJavaScriptForAutomation script="Application('Finder').selection()"
+```
+
+## File Operations
+
+```scpl
+# Get file by path
+File path="~/Documents/myfile.txt"
+
+# Rename
+RenameFile name="newname.txt"
+
+# Move
+MoveFile destination="~/Desktop/"
+
+# Reveal in Finder
+RevealInFinder
+
+# Select file (prompt)
+SelectFile
+
+# Get folder contents
+GetFolderContents path="~/Documents"
+
+# Get Finder selection
+GetSelectedFiles
+```
+
+## System
+
+```scpl
+# Dark/Light mode
+SetAppearance "Dark"
+SetAppearance "Light"
+
+# Screenshots
+TakeScreenshot
+
+# Lock screen
+LockScreen
+
+# On-screen OCR
+GetOnScreenContent
+```
+
+## Clock & Timers
+
+```scpl
+StartStopwatch
+StopStopwatch
+CreateAlarm time="7:00 AM" label="Wake up"
+StartTimer minutes=25
+```
+
+## Voice Memos
+
+```scpl
+CreateRecording
+PlayRecording
+```
+
+---
+
+# Complete Workflow Examples
+
+## Morning Routine
+
+```scpl
+# Turn off dark mode
+SetAppearance "Light"
+
+# Check weather
+GetCurrentWeather -> mv:Weather
+Text "Good morning! Today's weather: \(mv:Weather)"
+ShowNotification title="Morning" body=mv:Text
+
+# Open calendar
+OpenApp "Calendar"
+```
+
+## Clipboard AI Enhancement
+
+```scpl
+GetClipboard -> mv:Original
+AskLLM model="Apple Intelligence" prompt="Improve this text for clarity: \(mv:Original)"
+SetClipboard
+ShowAlert title="Done" message="Improved text copied!"
+```
+
+## Pomodoro Timer with Logging
+
+```scpl
+# Start work session
+ShowNotification title="Pomodoro" body="25 minute focus session started"
+StartTimer minutes=25
+
+# Log session
+Date -> mv:StartTime
+Text "Work session started at \(mv:StartTime)" -> mv:Log
+AppendToFile path="~/Documents/pomodoro-log.txt" text=mv:Log
+```
+
+## Screenshot with AI Description
+
+```scpl
+TakeScreenshot -> mv:Screenshot
+AskLLM model="Apple Intelligence" prompt="Describe what's in this image"
+SetVariable v:Description
+
+# Save with description
+Text "Screenshot: \(v:Description)"
+ShowResult
+```
+
+## DevOps Status Check
+
+```scpl
+RunShellScript shell="/bin/zsh" script="git status --short" -> mv:GitStatus
+RunShellScript shell="/bin/zsh" script="docker ps --format 'table {{.Names}}\t{{.Status}}'" -> mv:Docker
+
+Text
+| Git Status:
+| \(mv:GitStatus)
+|
+| Docker Containers:
+| \(mv:Docker)
+
+ShowResult
+```
+
+## File Organizer
+
+```scpl
+GetSelectedFiles -> mv:Files
+RepeatWithEach mv:Files
+    GetDetailsOfFiles detail="File Extension" -> mv:Ext
+
+    If Equals "pdf"
+        MoveFile destination="~/Documents/PDFs/"
+    Otherwise
+        If Equals "jpg"
+            MoveFile destination="~/Pictures/"
+        End If
+    End If
+End RepeatWithEach
+
+ShowNotification title="Done" body="Files organized!"
+```
+
+## Quick Note from Voice
+
+```scpl
+DictateText -> mv:Spoken
+AskLLM model="Apple Intelligence" prompt="Clean up and format: \(mv:Spoken)"
+SetVariable v:CleanedNote
+
+CreateNote title="Voice Note" body=v:CleanedNote
+ShowNotification title="Saved" body="Voice note created"
+```
+
+---
+
+# Tips & Common Patterns
+
+## Error Handling Pattern
+```scpl
+GetFile path="~/file.txt" errorIfNotFound=false -> mv:File
+Count
+If Equals 0
+    ShowAlert title="Error" message="File not found"
+    ExitShortcut
+End If
+# Continue with file...
+```
+
+## User Input Validation
+```scpl
+AskForInput prompt="Enter a number" -> mv:Input
+If "is not" "Number"
+    ShowAlert title="Error" message="Please enter a valid number"
+    ExitShortcut
+End If
+```
+
+## Chaining API Calls
+```scpl
+URL "https://api.example.com/data"
+GetContentsOfURL -> mv:Response
+GetDictionaryValue key="items"
+RepeatWithEach
+    # Process each item
+End RepeatWithEach
+```
+
+---
+
+# Quick Reference
+
+| Task | ScPL Code |
+|------|-----------|
+| Show text | `ShowResult "Hello"` |
+| Get clipboard | `GetClipboard` |
+| Set clipboard | `SetClipboard "text"` |
+| User input | `AskForInput prompt="Question"` |
+| Run shell | `RunShellScript shell="/bin/zsh" script="cmd"` |
+| AI prompt | `AskLLM model="Apple Intelligence" prompt="..."` |
+| Variable | `Text "x" -> v:Name` then `\(v:Name)` |
+| Magic var | `Text "x" -> mv:Name` then `mv:Name` |
+| Condition | `If Equals "value"` ... `End If` |
+| Loop | `Repeat 5` ... `End Repeat` |
+| Menu | `ChooseFromMenu "title" [options]` ... `End Menu` |
+
+---
+
+**493 total actions available.** Use `list_actions` tool to search by category or keyword.

package/index.js

@@ -10,7 +10,7 @@ import {
 } from "@modelcontextprotocol/sdk/types.js";
 import pkg from "scpl-macos-updated";
 const { convert } = pkg;
-import { writeFileSync, readFileSync, existsSync, mkdirSync } from "fs";
+import { writeFileSync, readFileSync, existsSync, mkdirSync, appendFileSync } from "fs";
 import { join, dirname } from "path";
 import { homedir } from "os";
 import { fileURLToPath } from "url";
@@ -29,20 +29,31 @@ USAGE:
   npx scpl-updated-mcp-server [OPTIONS]
 
 OPTIONS:
-  --setup                    Auto-install for Claude Code
+  --setup                    Auto-install for Claude Code (CLI)
+  --setup-desktop            Auto-install for Claude Desktop (GUI app)
   --setup-codex              Auto-install for OpenAI Codex CLI (~/.codex)
   --setup-codex=<dir>        Auto-install for Codex forks with custom directory
   --help, -h                 Show this help message
 
+You can combine multiple flags to set up multiple tools at once:
+  npx scpl-updated-mcp-server --setup --setup-desktop --setup-codex
+
 EXAMPLES:
+  # Claude Code (CLI) only
   npx scpl-updated-mcp-server --setup
+
+  # Claude Desktop (GUI app) only
+  npx scpl-updated-mcp-server --setup-desktop
+
+  # Codex only
   npx scpl-updated-mcp-server --setup-codex
-  npx scpl-updated-mcp-server --setup-codex=~/.code
-  npx scpl-updated-mcp-server --setup-codex=/path/to/code_config
 
-For Codex forks like just-every/code that use CODE_HOME or CODEX_HOME:
+  # Custom Codex directory (just-every/code, etc.)
   npx scpl-updated-mcp-server --setup-codex=$CODE_HOME
 
+  # All Claude + Codex tools at once
+  npx scpl-updated-mcp-server --setup --setup-desktop --setup-codex
+
 After setup, restart your AI coding tool and ask:
   "Create a shortcut that starts a timer and plays a sound"
 `);
@@ -50,303 +61,324 @@ After setup, restart your AI coding tool and ask:
 }
 
 // ============================================================================
-// CODEX SETUP: Run with --setup-codex or --setup-codex=<dir>
+// SETUP FUNCTIONS
 // ============================================================================
-const codexArg = process.argv.find(arg => arg.startsWith("--setup-codex"));
-if (codexArg) {
-  // Check for custom directory: --setup-codex=/path/to/dir or --setup-codex=~/custom
-  let codexDir = join(homedir(), ".codex"); // default
 
-  if (codexArg.includes("=")) {
-    let customDir = codexArg.split("=")[1];
-    // Expand ~ to home directory
-    if (customDir.startsWith("~")) {
-      customDir = customDir.replace("~", homedir());
-    }
-    codexDir = customDir;
-  }
+function setupClaudeCode() {
+  console.log("═══════════════════════════════════════════════════════════════");
+  console.log("🚀 Setting up ScPL Shortcuts for Claude Code...");
+  console.log("═══════════════════════════════════════════════════════════════\n");
 
-  console.log(`🚀 Setting up ScPL Shortcuts for Codex at ${codexDir}...\n`);
-
-  const codexConfigPath = join(codexDir, "config.toml");
-  const skillDir = join(codexDir, "skills", "scpl-shortcuts");
+  const claudeJsonPath = join(homedir(), ".claude.json");
+  const pluginsDir = join(homedir(), ".claude", "plugins", "local", "scpl-shortcuts");
+  const installedPluginsPath = join(homedir(), ".claude", "plugins", "installed_plugins.json");
 
-  // Step 1: Add MCP server to config.toml
-  console.log(`📝 Step 1: Adding MCP server to ${codexConfigPath}...`);
+  // Step 1: Add MCP server to ~/.claude.json
+  console.log("📝 Step 1: Adding MCP server to ~/.claude.json...");
   try {
-    let config = "";
-    if (existsSync(codexConfigPath)) {
-      config = readFileSync(codexConfigPath, "utf-8");
+    let claudeConfig = {};
+    if (existsSync(claudeJsonPath)) {
+      claudeConfig = JSON.parse(readFileSync(claudeJsonPath, "utf-8"));
     }
 
-    // Check if already configured
-    if (config.includes('[mcp_servers."scpl-shortcuts"]') || config.includes('[mcp_servers.scpl-shortcuts]')) {
+    if (!claudeConfig.mcpServers) {
+      claudeConfig.mcpServers = {};
+    }
+
+    if (claudeConfig.mcpServers["scpl-shortcuts"]) {
       console.log("   ⏭️  Already configured, skipping...\n");
     } else {
-      const tomlBlock = `
-[mcp_servers.scpl-shortcuts]
-command = "npx"
-args = ["-y", "scpl-updated-mcp-server"]
-startup_timeout_sec = 60.0
-`;
-      writeFileSync(codexConfigPath, config + tomlBlock);
+      claudeConfig.mcpServers["scpl-shortcuts"] = {
+        type: "stdio",
+        command: "npx",
+        args: ["-y", "scpl-updated-mcp-server"]
+      };
+      writeFileSync(claudeJsonPath, JSON.stringify(claudeConfig, null, 2));
       console.log("   ✅ MCP server added!\n");
     }
   } catch (error) {
-    console.error("   ❌ Failed to update config:", error.message);
-    console.log("   Add this to ~/.codex/config.toml manually:");
-    console.log(`
-[mcp_servers.scpl-shortcuts]
-command = "npx"
-args = ["-y", "scpl-updated-mcp-server"]
-startup_timeout_sec = 60.0
-`);
+    console.error("   ❌ Failed:", error.message, "\n");
   }
 
-  // Step 2: Install skill
-  console.log(`📁 Step 2: Installing skill to ${skillDir}...`);
+  // Step 2: Create plugin directory and files
+  console.log("📁 Step 2: Installing plugin files...");
   try {
-    mkdirSync(skillDir, { recursive: true });
+    mkdirSync(join(pluginsDir, "skills"), { recursive: true });
 
-    const skillContent = `---
-name: scpl-shortcuts
-description: Create macOS Shortcuts using natural language. Use when users want to create, generate, or build Apple Shortcuts. Converts requests to ScPL code and generates .shortcut files.
-metadata:
-  short-description: Create macOS Shortcuts with AI
+    const pluginJson = {
+      name: "scpl-shortcuts",
+      version: "1.0.0",
+      description: "Create macOS Shortcuts using natural language and ScPL",
+      skills: [
+        {
+          name: "create-shortcut",
+          description: "Create a macOS Shortcut using natural language.",
+          path: "skills/create-shortcut.md"
+        }
+      ]
+    };
+    writeFileSync(join(pluginsDir, "plugin.json"), JSON.stringify(pluginJson, null, 2));
+
+    // Read comprehensive ScPL reference
+    const refPath = join(__dirname, "SCPL_REFERENCE.md");
+    let skillContent = "";
+    if (existsSync(refPath)) {
+      const reference = readFileSync(refPath, "utf-8");
+      skillContent = `---
+description: Create macOS Shortcuts using natural language with ScPL.
+tags: [shortcuts, automation, macos, scpl, apple-intelligence]
 ---
 
 # ScPL Shortcuts Skill
 
-Create macOS Shortcuts using natural language with 493 available actions.
-
-## MCP Tools Available
-
-You have access to the \`scpl-shortcuts\` MCP server with these tools:
-
-| Tool | Description |
-|------|-------------|
-| \`create_shortcut\` | Generate a .shortcut file from ScPL code |
-| \`validate_scpl\` | Check if ScPL code is valid before creating |
-| \`list_actions\` | Search available actions by category or keyword |
+You have access to the ScPL MCP server with **493 actions**.
 
-## ScPL Syntax
+## Available Tools
+- \`create_shortcut\` - Convert ScPL code to .shortcut file
+- \`validate_scpl\` - Check syntax without creating file
+- \`list_actions\` - Search available actions by category/keyword
 
-ScPL is line-based. Each line is an action. Parameters use \`key=value\` or \`key="value"\`.
+${reference}
+`;
+    } else {
+      // Fallback minimal skill if reference not found
+      skillContent = `---
+description: Create macOS Shortcuts using natural language.
+tags: [shortcuts, automation, macos, scpl]
+---
 
-\`\`\`scpl
-# Comments start with #
-Text "Hello World"
-ShowResult
+# Create Shortcut Skill
 
-# Variables
-Text "some value"
-SetVariable v:myVar
-ShowResult v:myVar
+You have access to the ScPL MCP server with 493 actions.
+Tools: create_shortcut, validate_scpl, list_actions
 
-# AI actions
-AskLLM model="Apple Intelligence" prompt="Summarize this"
-AskChatGPT prompt="Explain this"
-\`\`\`
+Basic syntax: \`ActionName "arg"\` or \`ActionName param=value\`
+Variables: \`v:Named\`, \`mv:Magic\`, \`s:Special\`
+Flow: \`If\`/\`End If\`, \`Repeat\`/\`End Repeat\`
+`;
+    }
+    writeFileSync(join(pluginsDir, "skills", "create-shortcut.md"), skillContent);
+    console.log("   ✅ Plugin files created!\n");
+  } catch (error) {
+    console.error("   ❌ Failed:", error.message, "\n");
+  }
 
-## Popular Actions by Category
+  // Step 3: Register plugin
+  console.log("📋 Step 3: Registering plugin...");
+  try {
+    let installedPlugins = { version: 2, plugins: {} };
+    if (existsSync(installedPluginsPath)) {
+      installedPlugins = JSON.parse(readFileSync(installedPluginsPath, "utf-8"));
+    }
 
-**AI**: AskLLM, AskChatGPT, AskClaude
-**Clock**: StartStopwatch, StopStopwatch, CreateAlarm
-**Voice Memos**: CreateRecording, PlayRecording
-**System**: SetDarkMode, TakeScreenshot, LockScreen
-**Files**: GetFile, SaveFile, RenameFile, RevealInFinder
-**Scripting**: RunShellScript, RunAppleScript, RunJavaScriptForAutomation
-**Clipboard**: GetClipboard, SetClipboard
+    if (installedPlugins.plugins["scpl-shortcuts@local"]) {
+      console.log("   ⏭️  Already registered, skipping...\n");
+    } else {
+      installedPlugins.plugins["scpl-shortcuts@local"] = [
+        {
+          scope: "user",
+          installPath: pluginsDir,
+          version: "1.0.0",
+          installedAt: new Date().toISOString(),
+          lastUpdated: new Date().toISOString(),
+          isLocal: true
+        }
+      ];
+      writeFileSync(installedPluginsPath, JSON.stringify(installedPlugins, null, 2));
+      console.log("   ✅ Plugin registered!\n");
+    }
+  } catch (error) {
+    console.error("   ❌ Failed:", error.message, "\n");
+  }
 
-## Workflow
+  console.log("✅ Claude Code setup complete!\n");
+}
 
-1. User describes what shortcut they want
-2. Use \`list_actions\` if you need to find specific actions
-3. Write ScPL code for the shortcut
-4. Use \`validate_scpl\` to check syntax
-5. Use \`create_shortcut\` to generate the .shortcut file
-6. Tell user to install via Shortcut Source Helper from RoutineHub
+function setupClaudeDesktop() {
+  console.log("═══════════════════════════════════════════════════════════════");
+  console.log("🚀 Setting up ScPL Shortcuts for Claude Desktop...");
+  console.log("═══════════════════════════════════════════════════════════════\n");
+
+  // Determine config path based on OS
+  let configPath;
+  const platform = process.platform;
+  if (platform === "darwin") {
+    configPath = join(homedir(), "Library", "Application Support", "Claude", "claude_desktop_config.json");
+  } else if (platform === "win32") {
+    configPath = join(process.env.APPDATA || "", "Claude", "claude_desktop_config.json");
+  } else {
+    configPath = join(homedir(), ".config", "Claude", "claude_desktop_config.json");
+  }
 
-## Example: Timer with Notification
+  console.log(`📝 Adding MCP server to ${configPath}...`);
+  try {
+    // Ensure directory exists
+    mkdirSync(dirname(configPath), { recursive: true });
 
-\`\`\`scpl
-# Start a 25-minute Pomodoro timer
-StartTimer minutes=25
-ShowAlert title="Timer Started" message="Focus for 25 minutes!"
-\`\`\`
+    let config = {};
+    if (existsSync(configPath)) {
+      config = JSON.parse(readFileSync(configPath, "utf-8"));
+    }
 
-## Example: Clipboard AI Enhancement
+    if (!config.mcpServers) {
+      config.mcpServers = {};
+    }
 
-\`\`\`scpl
-GetClipboard
-SetVariable v:text
-AskChatGPT prompt="Improve this text: \\(v:text)"
-SetClipboard
-ShowAlert title="Done" message="Improved text copied!"
-\`\`\`
-`;
-    writeFileSync(join(skillDir, "SKILL.md"), skillContent);
-    console.log("   ✅ Skill installed!\n");
+    if (config.mcpServers["scpl-shortcuts"]) {
+      console.log("   ⏭️  Already configured, skipping...\n");
+    } else {
+      config.mcpServers["scpl-shortcuts"] = {
+        command: "npx",
+        args: ["-y", "scpl-updated-mcp-server"]
+      };
+      writeFileSync(configPath, JSON.stringify(config, null, 2));
+      console.log("   ✅ MCP server added!\n");
+    }
   } catch (error) {
-    console.error("   ❌ Failed to install skill:", error.message, "\n");
+    console.error("   ❌ Failed:", error.message, "\n");
   }
 
-  console.log("🎉 Setup complete! Restart Codex to use the shortcuts tools.\n");
-  console.log("Usage: Just ask Codex to create a shortcut!");
-  console.log('  Example: "Create a shortcut that starts a timer and plays a sound"\n');
-  process.exit(0);
+  console.log("✅ Claude Desktop setup complete!\n");
+  console.log("ℹ️  Note: Claude Desktop doesn't have plugins/skills.\n");
+  console.log("   The MCP tools (create_shortcut, validate_scpl, list_actions)");
+  console.log("   will be available, but Claude won't have the full ScPL reference");
+  console.log("   loaded as context. Consider using Claude Code for best results.\n");
 }
 
-// ============================================================================
-// CLAUDE CODE SETUP: Run with --setup to install everything automatically
-// ============================================================================
-if (process.argv.includes("--setup")) {
-  console.log("🚀 Setting up ScPL Shortcuts for Claude Code...\n");
+function setupCodex(codexDir) {
+  console.log("═══════════════════════════════════════════════════════════════");
+  console.log(`🚀 Setting up ScPL Shortcuts for Codex at ${codexDir}...`);
+  console.log("═══════════════════════════════════════════════════════════════\n");
 
-  const claudeJsonPath = join(homedir(), ".claude.json");
-  const pluginsDir = join(homedir(), ".claude", "plugins", "local", "scpl-shortcuts");
-  const installedPluginsPath = join(homedir(), ".claude", "plugins", "installed_plugins.json");
+  const codexConfigPath = join(codexDir, "config.toml");
+  const skillDir = join(codexDir, "skills", "scpl-shortcuts");
 
-  // Step 1: Add MCP server to ~/.claude.json
-  console.log("📝 Step 1: Adding MCP server to ~/.claude.json...");
+  // Step 1: Add MCP server to config.toml
+  console.log(`📝 Step 1: Adding MCP server to ${codexConfigPath}...`);
   try {
-    let claudeConfig = {};
-    if (existsSync(claudeJsonPath)) {
-      claudeConfig = JSON.parse(readFileSync(claudeJsonPath, "utf-8"));
+    let config = "";
+    if (existsSync(codexConfigPath)) {
+      config = readFileSync(codexConfigPath, "utf-8");
     }
 
-    if (!claudeConfig.mcpServers) {
-      claudeConfig.mcpServers = {};
+    if (config.includes('[mcp_servers."scpl-shortcuts"]') || config.includes('[mcp_servers.scpl-shortcuts]')) {
+      console.log("   ⏭️  Already configured, skipping...\n");
+    } else {
+      const tomlBlock = `
+[mcp_servers.scpl-shortcuts]
+command = "npx"
+args = ["-y", "scpl-updated-mcp-server"]
+startup_timeout_sec = 60.0
+`;
+      writeFileSync(codexConfigPath, config + tomlBlock);
+      console.log("   ✅ MCP server added!\n");
     }
-
-    claudeConfig.mcpServers["scpl-shortcuts"] = {
-      type: "stdio",
-      command: "npx",
-      args: ["-y", "scpl-updated-mcp-server"]
-    };
-
-    writeFileSync(claudeJsonPath, JSON.stringify(claudeConfig, null, 2));
-    console.log("   ✅ MCP server added!\n");
   } catch (error) {
-    console.error("   ❌ Failed to update ~/.claude.json:", error.message);
-    console.log("   You can manually add this to ~/.claude.json under mcpServers:");
-    console.log(`   "scpl-shortcuts": { "type": "stdio", "command": "npx", "args": ["-y", "scpl-updated-mcp-server"] }\n`);
+    console.error("   ❌ Failed:", error.message, "\n");
   }
 
-  // Step 2: Create plugin directory and files
-  console.log("📁 Step 2: Installing plugin files...");
+  // Step 2: Install skill
+  console.log(`📁 Step 2: Installing skill to ${skillDir}...`);
   try {
-    mkdirSync(join(pluginsDir, "skills"), { recursive: true });
-
-    // Write plugin.json
-    const pluginJson = {
-      name: "scpl-shortcuts",
-      version: "1.0.0",
-      description: "Create macOS Shortcuts using natural language and ScPL",
-      skills: [
-        {
-          name: "create-shortcut",
-          description: "Create a macOS Shortcut using natural language. Guides you through the process and generates a .shortcut file.",
-          path: "skills/create-shortcut.md"
-        }
-      ]
-    };
-    writeFileSync(join(pluginsDir, "plugin.json"), JSON.stringify(pluginJson, null, 2));
+    mkdirSync(skillDir, { recursive: true });
 
-    // Write skill file
-    const skillContent = `---
-description: Create macOS Shortcuts using natural language. Converts your request into ScPL code and generates a .shortcut file.
-tags: [shortcuts, automation, macos, scpl]
+    // Read comprehensive ScPL reference
+    const refPath = join(__dirname, "SCPL_REFERENCE.md");
+    let skillContent = "";
+    if (existsSync(refPath)) {
+      const reference = readFileSync(refPath, "utf-8");
+      skillContent = `---
+name: scpl-shortcuts
+description: Create macOS Shortcuts using natural language with ScPL.
+metadata:
+  short-description: Create macOS Shortcuts with AI
 ---
 
-# Create Shortcut Skill
+# ScPL Shortcuts Skill
 
-You have access to the ScPL MCP server with 493 actions for creating macOS Shortcuts.
+You have access to the ScPL MCP server with **493 actions**.
 
 ## Available Tools
+- \`create_shortcut\` - Convert ScPL code to .shortcut file
+- \`validate_scpl\` - Check syntax without creating file
+- \`list_actions\` - Search available actions by category/keyword
 
-1. **create_shortcut** - Generate a .shortcut file from ScPL code
-2. **validate_scpl** - Check if ScPL code is valid before creating
-3. **list_actions** - Search available actions by category or keyword
+${reference}
+`;
+    } else {
+      // Fallback minimal skill
+      skillContent = `---
+name: scpl-shortcuts
+description: Create macOS Shortcuts using natural language.
+metadata:
+  short-description: Create macOS Shortcuts with AI
+---
 
-## Popular Action Categories
+# ScPL Shortcuts Skill
 
-- **AI**: AskLLM (Apple Intelligence), AskChatGPT, AskClaude
-- **Clock**: StartStopwatch, CreateAlarm, GetCurrentTime
-- **Voice Memos**: CreateRecording, PlayRecording
-- **System**: SetDarkMode, TakeScreenshot, LockScreen
-- **Files**: GetFile, SaveFile, RenameFile, RevealInFinder
-- **Scripting**: RunShellScript, RunAppleScript
+493 actions available. Tools: create_shortcut, validate_scpl, list_actions
 
-## ScPL Syntax Examples
+Basic syntax: \`ActionName "arg"\` or \`ActionName param=value\`
+Variables: \`v:Named\`, \`mv:Magic\`, \`s:Special\`
+Flow: \`If\`/\`End If\`, \`Repeat\`/\`End Repeat\`
+`;
+    }
+    writeFileSync(join(skillDir, "SKILL.md"), skillContent);
+    console.log("   ✅ Skill installed!\n");
+  } catch (error) {
+    console.error("   ❌ Failed:", error.message, "\n");
+  }
 
-\`\`\`scpl
-# Simple notification
-ShowResult "Hello World!"
+  console.log(`✅ Codex setup complete for ${codexDir}!\n`);
+}
 
-# Use Apple Intelligence
-Text "Summarize this for me"
-AskLLM model="Apple Intelligence" prompt="Make it shorter"
-ShowResult
+// ============================================================================
+// PROCESS SETUP FLAGS
+// ============================================================================
 
-# Shell script
-RunShellScript shell="/bin/zsh" script="echo Hello"
-ShowResult
+let didSetup = false;
 
-# Variables
-Text "Hello"
-SetVariable v:greeting
-ShowResult v:greeting
-\`\`\`
+// Claude Code setup
+if (process.argv.includes("--setup")) {
+  setupClaudeCode();
+  didSetup = true;
+}
 
-## Workflow
+// Claude Desktop setup
+if (process.argv.includes("--setup-desktop")) {
+  setupClaudeDesktop();
+  didSetup = true;
+}
 
-1. User describes what they want
-2. Use \`list_actions\` if you need to find specific actions
-3. Write ScPL code for the shortcut
-4. Use \`validate_scpl\` to check syntax
-5. Use \`create_shortcut\` to generate the .shortcut file
-6. Tell user to drag the file onto Shortcut Source Helper to install
-`;
-    writeFileSync(join(pluginsDir, "skills", "create-shortcut.md"), skillContent);
-    console.log("   ✅ Plugin files created!\n");
-  } catch (error) {
-    console.error("   ❌ Failed to create plugin files:", error.message, "\n");
-  }
+// Codex setups (can have multiple --setup-codex and --setup-codex=<dir>)
+const codexArgs = process.argv.filter(arg => arg.startsWith("--setup-codex"));
+for (const codexArg of codexArgs) {
+  let codexDir = join(homedir(), ".codex"); // default
 
-  // Step 3: Register plugin in installed_plugins.json
-  console.log("📋 Step 3: Registering plugin...");
-  try {
-    let installedPlugins = { version: 2, plugins: {} };
-    if (existsSync(installedPluginsPath)) {
-      installedPlugins = JSON.parse(readFileSync(installedPluginsPath, "utf-8"));
+  if (codexArg.includes("=")) {
+    let customDir = codexArg.split("=")[1];
+    if (customDir.startsWith("~")) {
+      customDir = customDir.replace("~", homedir());
     }
-
-    installedPlugins.plugins["scpl-shortcuts@local"] = [
-      {
-        scope: "user",
-        installPath: pluginsDir,
-        version: "1.0.0",
-        installedAt: new Date().toISOString(),
-        lastUpdated: new Date().toISOString(),
-        isLocal: true
-      }
-    ];
-
-    writeFileSync(installedPluginsPath, JSON.stringify(installedPlugins, null, 2));
-    console.log("   ✅ Plugin registered!\n");
-  } catch (error) {
-    console.error("   ❌ Failed to register plugin:", error.message, "\n");
+    codexDir = customDir;
   }
 
-  console.log("🎉 Setup complete! Restart Claude Code to use the shortcuts tools.\n");
-  console.log("Usage: Just ask Claude to create a shortcut!");
-  console.log('  Example: "Create a shortcut that starts a timer and plays a sound"\n');
+  setupCodex(codexDir);
+  didSetup = true;
+}
+
+// Exit after setup(s)
+if (didSetup) {
+  console.log("═══════════════════════════════════════════════════════════════");
+  console.log("🎉 All setups complete! Restart your AI tool(s) to use shortcuts.");
+  console.log("═══════════════════════════════════════════════════════════════");
+  console.log('\nUsage: Just ask to create a shortcut!');
+  console.log('  Example: "Create a shortcut that starts a timer"\n');
   process.exit(0);
 }
 
 // ============================================================================
-// MCP SERVER
+// MCP SERVER (runs if no setup flags)
 // ============================================================================
 
 const server = new Server(
@@ -430,24 +462,21 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
     if (name === "create_shortcut") {
       const { scpl_code, output_name, output_dir } = args;
 
-      // Convert ScPL to shortcut
       const shortcutBuffer = convert(scpl_code, {
         makePlist: true,
         makeShortcut: true,
       });
 
-      // Determine output path (default to ~/Documents)
       const dir = output_dir || join(homedir(), "Documents");
       const outputPath = join(dir, `${output_name}.shortcut`);
 
-      // Write the file
       writeFileSync(outputPath, shortcutBuffer);
 
       return {
         content: [
           {
             type: "text",
-            text: `✅ Shortcut created successfully!\n\nPath: ${outputPath}\n\n📝 To install:\n1. Download "Shortcut Source Helper" from RoutineHub\n2. Drag ${output_name}.shortcut onto it\n3. Follow the prompts to sign and import\n\nThe shortcut will be added to your Shortcuts app!`,
+            text: `✅ Shortcut created!\n\nPath: ${outputPath}\n\nTo install: Drag onto Shortcut Source Helper from RoutineHub`,
           },
         ],
       };
@@ -457,69 +486,36 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       const { scpl_code } = args;
 
       try {
-        convert(scpl_code, {
-          makePlist: false,
-          makeShortcut: false,
-        });
-
-        return {
-          content: [
-            {
-              type: "text",
-              text: "✅ ScPL code is valid!",
-            },
-          ],
-        };
+        convert(scpl_code, { makePlist: false, makeShortcut: false });
+        return { content: [{ type: "text", text: "✅ ScPL code is valid!" }] };
       } catch (error) {
-        return {
-          content: [
-            {
-              type: "text",
-              text: `❌ ScPL validation failed:\n\n${error.message}`,
-            },
-          ],
-          isError: true,
-        };
+        return { content: [{ type: "text", text: `❌ Invalid: ${error.message}` }], isError: true };
       }
     }
 
     if (name === "list_actions") {
       const { category, search } = args || {};
 
-      // Embedded action list (top actions for quick reference)
       const topActions = {
-        // AI
         "is.workflow.actions.askllm": { Name: "Ask LLM", Category: "AI" },
         "is.workflow.actions.askchatgpt": { Name: "Ask ChatGPT", Category: "AI" },
         "com.anthropic.claudeforipad.AskClaudeIntentExtension": { Name: "Ask Claude", Category: "AI" },
-        // Clock
         "com.apple.clock.StartStopwatchIntent": { Name: "Start Stopwatch", Category: "Clock" },
         "com.apple.clock.StopStopwatchIntent": { Name: "Stop Stopwatch", Category: "Clock" },
         "com.apple.clock.CreateAlarmIntent": { Name: "Create Alarm", Category: "Clock" },
-        // Voice Memos
         "com.apple.VoiceMemos.CreateRecordingIntent": { Name: "Create Recording", Category: "Voice Memos" },
         "com.apple.VoiceMemos.PlayRecordingIntent": { Name: "Play Recording", Category: "Voice Memos" },
-        // System
         "is.workflow.actions.appearance": { Name: "Set Dark/Light Mode", Category: "System" },
         "is.workflow.actions.takescreenshot": { Name: "Take Screenshot", Category: "System" },
         "is.workflow.actions.lockscreen": { Name: "Lock Screen", Category: "System" },
-        // Scripting
         "is.workflow.actions.runshellscript": { Name: "Run Shell Script", Category: "Scripting" },
         "is.workflow.actions.runapplescript": { Name: "Run AppleScript", Category: "Scripting" },
         "is.workflow.actions.runjavascriptforautomation": { Name: "Run JavaScript", Category: "Scripting" },
-        // Files
         "is.workflow.actions.file.getfile": { Name: "Get File", Category: "Files" },
         "is.workflow.actions.file.savefile": { Name: "Save File", Category: "Files" },
-        "is.workflow.actions.file.renamefile": { Name: "Rename File", Category: "Files" },
-        "is.workflow.actions.file.revealfile": { Name: "Reveal in Finder", Category: "Files" },
-        // Text
-        "is.workflow.actions.gettext": { Name: "Get Text", Category: "Text" },
         "is.workflow.actions.showresult": { Name: "Show Result", Category: "Text" },
         "is.workflow.actions.alert": { Name: "Show Alert", Category: "Text" },
-        // Variables
         "is.workflow.actions.setvariable": { Name: "Set Variable", Category: "Variables" },
-        "is.workflow.actions.getvariable": { Name: "Get Variable", Category: "Variables" },
-        // Clipboard
         "is.workflow.actions.getclipboard": { Name: "Get Clipboard", Category: "Clipboard" },
         "is.workflow.actions.setclipboard": { Name: "Set Clipboard", Category: "Clipboard" },
       };
@@ -527,108 +523,36 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       let filtered = Object.entries(topActions);
 
       if (category) {
-        filtered = filtered.filter(
-          ([_, action]) => action.Category?.toLowerCase() === category.toLowerCase()
-        );
+        filtered = filtered.filter(([_, a]) => a.Category?.toLowerCase() === category.toLowerCase());
       }
-
       if (search) {
-        const searchLower = search.toLowerCase();
-        filtered = filtered.filter(
-          ([id, action]) =>
-            id.toLowerCase().includes(searchLower) ||
-            action.Name?.toLowerCase().includes(searchLower) ||
-            action.Category?.toLowerCase().includes(searchLower)
+        const s = search.toLowerCase();
+        filtered = filtered.filter(([id, a]) =>
+          id.toLowerCase().includes(s) || a.Name?.toLowerCase().includes(s)
         );
       }
 
-      const results = filtered
-        .map(([id, action]) => `• **${action.Name}** - \`${id}\` (${action.Category})`)
-        .join("\n");
-
-      return {
-        content: [
-          {
-            type: "text",
-            text: `Found ${filtered.length} actions:\n\n${results}\n\n💡 This is a subset of 493 total actions. For the full list, see: https://github.com/cavingraves/scpl-macos-updated`,
-          },
-        ],
-      };
+      const results = filtered.map(([id, a]) => `• **${a.Name}** - \`${id}\``).join("\n");
+      return { content: [{ type: "text", text: `${filtered.length} actions:\n\n${results}\n\n(493 total available)` }] };
     }
 
     throw new Error(`Unknown tool: ${name}`);
   } catch (error) {
-    return {
-      content: [
-        {
-          type: "text",
-          text: `Error: ${error.message}`,
-        },
-      ],
-      isError: true,
-    };
+    return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };
   }
 });
 
-// Resource handlers
 server.setRequestHandler(ListResourcesRequestSchema, async () => {
-  return {
-    resources: [
-      {
-        uri: "scpl://examples",
-        name: "ScPL Examples",
-        description: "Example shortcuts written in ScPL",
-        mimeType: "text/markdown",
-      },
-    ],
-  };
+  return { resources: [{ uri: "scpl://examples", name: "ScPL Examples", mimeType: "text/markdown" }] };
 });
 
 server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
-  const { uri } = request.params;
-
-  if (uri === "scpl://examples") {
-    const examples = `# ScPL Examples
-
-## Apple Intelligence
-\`\`\`scpl
-Text "Summarize this document"
-AskLLM model="Apple Intelligence" prompt="Make it concise"
-ShowResult
-\`\`\`
-
-## Timer with Sound
-\`\`\`scpl
-# Start a 5-minute timer
-StartTimer minutes=5
-ShowAlert title="Timer Started" message="5 minutes"
-\`\`\`
-
-## Shell Script
-\`\`\`scpl
-RunShellScript shell="/bin/zsh" script="echo Hello World"
-ShowResult
-\`\`\`
-
-## Clipboard Workflow
-\`\`\`scpl
-GetClipboard
-SetVariable v:text
-AskChatGPT prompt="Improve this: \\(v:text)"
-SetClipboard
-ShowAlert title="Done" message="Improved text copied!"
-\`\`\`
-`;
-
-    return {
-      contents: [{ uri, mimeType: "text/markdown", text: examples }],
-    };
+  if (request.params.uri === "scpl://examples") {
+    return { contents: [{ uri: "scpl://examples", mimeType: "text/markdown", text: "# Examples\n\n```scpl\nShowResult \"Hello!\"\n```" }] };
   }
-
-  throw new Error(`Unknown resource: ${uri}`);
+  throw new Error("Unknown resource");
 });
 
-// Start server
 async function main() {
   const transport = new StdioServerTransport();
   await server.connect(transport);

package/package.json

@@ -1,12 +1,17 @@
 {
   "name": "scpl-updated-mcp-server",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "AI-powered Apple Shortcuts creation with Claude Code! Generate macOS shortcuts using natural language. 493 actions available. MCP server for text-based shortcut programming. Vibe code your automation workflows.",
   "type": "module",
   "main": "index.js",
   "bin": {
     "scpl-updated-mcp-server": "index.js"
   },
+  "files": [
+    "index.js",
+    "SCPL_REFERENCE.md",
+    "README.md"
+  ],
   "scripts": {
     "start": "node index.js"
   },