Merge pull request #523 from xmtplabs/release/1.1.0-promote

Release 1.1.0: promote dev to main

Author: yewreeka

.claude/agents/swiftui-specialist.md

@@ -54,7 +54,7 @@ Button(action: { /* action */ }) {
 ## Design System
 
 The project uses custom colors and components:
-- Colors: `colorBackgroundPrimary`, `colorTextPrimary`, `colorBubble`, etc.
+- Colors: `colorBackgroundSurfaceless`, `colorTextPrimary`, `colorBubble`, etc.
 - Components: `AvatarView`, shared views in `Convos/Shared Views/`
 - Check `Convos/Design System/` for design tokens
 

.claude/commands/build.md

@@ -34,14 +34,15 @@ Build, launch in simulator, and notify when running:
 
 1. Check if `.claude/.simulator_id` file exists in the project root
    - If yes, read the simulator ID from it (this is the session's dedicated simulator)
-   - If no, check if `.convos-task` file exists:
-     - If yes, read `SIMULATOR_NAME` from it and find its UUID in the simulator list
-     - If the simulator doesn't exist yet, suggest running `/setup` first
-   - If neither file exists, select a new simulator (see below)
+   - If no, try to find or create the session's simulator:
+     a. Check if `.convos-task` file exists → read `SIMULATOR_NAME` from it
+     b. Otherwise derive from branch: run `git branch --show-current`, sanitize (replace `/` and special chars with `-`, lowercase), prefix with `convos-` (e.g., `jarod/push-notifications` → `convos-jarod-push-notifications`)
+     c. Look for that simulator in the list — if it exists, use it
+     d. If it doesn't exist, suggest running `/setup` first
 
 2. Call `mcp__XcodeBuildMCP__list_sims` to get all available simulators
 
-3. Select a simulator that is NOT already booted:
+3. If no dedicated simulator was found or created, select a simulator that is NOT already booted:
    - Look for iOS 26.0 simulators (latest OS)
    - Find simulators that do NOT have `[Booted]` next to them
    - Prefer iPhone models in this order: iPhone 17 Pro, iPhone 17 Pro Max, iPhone Air, iPhone 17

.claude/commands/setup.md

@@ -1,49 +1,69 @@
 # Setup
 
-Initialize the Claude Code session for a convos-task worktree.
+Initialize the Claude Code session for any branch or worktree — creates a dedicated simulator and configures build defaults.
 
 ## Purpose
 
-This command sets up the iOS simulator and XcodeBuildMCP session defaults when working in a `convos-task` worktree. It ensures the session has a dedicated simulator for builds and testing.
+This command sets up an iOS simulator and XcodeBuildMCP session defaults so `/build` and `/build --run` work correctly. It works in any context:
+- **convos-task worktrees**: Uses the task config from `.convos-task`
+- **Regular branches**: Derives the simulator name from the current git branch
+- **Main repo**: Works on any branch, no special setup required
 
 ## When to Run
 
+- At the start of any new session when working on a feature branch
 - Automatically suggested at session start when `.convos-task` file exists
 - Can be run manually anytime to reset or verify the setup
 
 ## Instructions
 
-### Step 1: Check for Task Configuration
+### Step 1: Determine Simulator Name
 
-1. Read the `.convos-task` file in the project root
-2. If it doesn't exist, inform the user this isn't a convos-task worktree and exit
-3. Extract `TASK_NAME` and `SIMULATOR_NAME` from the file
+Check for configuration in this order:
 
-### Step 2: Create Simulator if Needed
+1. **`.convos-task` file exists**: Read `TASK_NAME` and `SIMULATOR_NAME` from it
+2. **No `.convos-task` file**: Derive from the current git branch:
+   - Run `git branch --show-current` to get the branch name
+   - Sanitize the branch name: replace `/` and special characters with `-`, lowercase it
+   - Simulator name: `convos-<sanitized-branch-name>`
+   - Example: branch `jarod/push-notifications` → simulator `convos-jarod-push-notifications`
+   - Special case: if on `main` or `master`, use `convos-main`
+
+### Step 2: Run Project Setup
+
+Run `Scripts/setup.sh` with `CI=true` to install dependencies without modifying git hooks or Xcode defaults:
+
+```bash
+CI=true Scripts/setup.sh
+```
+
+This ensures SwiftLint, SwiftFormat, and other dependencies are installed.
+
+### Step 3: Create Simulator if Needed
 
 1. Use `mcp__XcodeBuildMCP__list_sims` to check if the simulator already exists
 2. If the simulator doesn't exist:
    - Find a base iPhone simulator to clone from (prefer iPhone 17 Pro, iPhone 17 Pro Max, or latest available)
    - Use bash to clone it: `xcrun simctl clone "BASE_SIM_NAME" "SIMULATOR_NAME"`
 3. Get the simulator's UUID from the list
 
-### Step 3: Set XcodeBuildMCP Session Defaults
+### Step 4: Set XcodeBuildMCP Session Defaults
 
 Call `mcp__XcodeBuildMCP__session-set-defaults` with:
-- `simulatorName`: The task's simulator name (e.g., "convos-my-feature")
+- `simulatorName`: The simulator name (e.g., "convos-push-notifications")
 - `projectPath`: Path to `Convos.xcodeproj`
 - `scheme`: "Convos (Dev)" (default scheme)
 - `useLatestOS`: true
 
-### Step 4: Save Simulator ID for Session
+### Step 5: Save Simulator ID for Session
 
 Write the simulator UUID to `.claude/.simulator_id` for use by `/build` command.
 
-### Step 5: Report Setup Complete
+### Step 6: Report Setup Complete
 
 Inform the user:
 ```
-✅ Session setup complete for task: TASK_NAME
+✅ Session setup complete
 
 📱 Simulator: SIMULATOR_NAME (UUID)
 🔧 XcodeBuildMCP defaults configured
@@ -53,31 +73,46 @@ Inform the user:
 Ready to build! Use /build or /build --run
 ```
 
-## Example Flow
+## Example Flows
 
+**In a convos-task worktree:**
 ```
 User: /setup
-Claude: Checking for task configuration...
-        Found .convos-task: TASK_NAME=push-notifications, SIMULATOR_NAME=convos-push-notifications
+Claude: Found .convos-task: TASK_NAME=push-notifications, SIMULATOR_NAME=convos-push-notifications
+        Running Scripts/setup.sh...
+        ✅ All dependencies installed
+        Simulator convos-push-notifications exists (A1B2C3D4-...)
+        Setting XcodeBuildMCP defaults...
+
+        ✅ Session setup complete
 
-        Checking if simulator exists...
-        Simulator not found, creating from iPhone 17 Pro...
-        Created simulator: convos-push-notifications (A1B2C3D4-...)
+        📱 Simulator: convos-push-notifications (A1B2C3D4-...)
+        🔧 XcodeBuildMCP defaults configured
+        📁 Project: Convos.xcodeproj
+        🎯 Scheme: Convos (Dev)
+```
 
-        Setting XcodeBuildMCP session defaults...
+**On a regular branch (no .convos-task):**
+```
+User: /setup
+Claude: No .convos-task found. Deriving from branch name...
+        Branch: jarod/retry-errors → Simulator: convos-jarod-retry-errors
+        Running Scripts/setup.sh...
+        ✅ All dependencies installed
+        Cloning iPhone 17 Pro → convos-jarod-retry-errors...
+        Created simulator: convos-jarod-retry-errors (E5F6G7H8-...)
+        Setting XcodeBuildMCP defaults...
 
-        ✅ Session setup complete for task: push-notifications
+        ✅ Session setup complete
 
-        📱 Simulator: convos-push-notifications
+        📱 Simulator: convos-jarod-retry-errors (E5F6G7H8-...)
         🔧 XcodeBuildMCP defaults configured
         📁 Project: Convos.xcodeproj
         🎯 Scheme: Convos (Dev)
-
-        Ready to build! Use /build or /build --run
 ```
 
 ## Error Handling
 
-- If `.convos-task` doesn't exist: "This directory doesn't have a task configuration. Run `convos-task new <name>` to create a task."
 - If simulator creation fails: Show the error and suggest checking available simulators with `xcrun simctl list devices`
 - If no base simulator found: "No iPhone simulator found to clone. Install iOS Simulator runtimes in Xcode."
+- If `Scripts/setup.sh` fails: Show the error output and suggest running it manually

.claude/settings.local.json

@@ -0,0 +1,24 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(xcpretty:*)",
+      "Bash(gt submit:*)",
+      "Bash(timeout 60 swift test:*)",
+      "Bash(git add:*)",
+      "mcp__graphite__run_gt_cmd",
+      "Bash(git merge:*)",
+      "Bash(gt add:*)",
+      "Bash(gt continue:*)",
+      "Bash(gt log:*)"
+    ]
+  },
+  "enableAllProjectMcpServers": true,
+  "enabledMcpjsonServers": [
+    "XcodeBuildMCP",
+    "ios-simulator",
+    "xmtp-docs",
+    "graphite",
+    "notion",
+    "linear"
+  ]
+}