tlc-claude-code 1.1.0 → 1.2.0

package/.gitattributes

@@ -1,2 +1,3 @@
-# Force LF line endings for shell scripts
+# Force LF line endings for shell scripts and node binaries
 *.sh text eol=lf
+bin/*.js text eol=lf

package/bin/install.js

@@ -30,6 +30,7 @@ const VERSION = require('../package.json').version;
 const COMMANDS = [
   // Core workflow
   'tlc.md',
+  'sync.md',
   'new-project.md',
   'init.md',
   'import-project.md',

package/bin/rebuild.js

@@ -1,109 +1,109 @@
-#!/usr/bin/env node
-
-/**
- * TLC Rebuild - Trigger full Docker rebuild
- * Usage: tlc rebuild
- */
-
-const { spawn } = require('child_process');
-const path = require('path');
-const fs = require('fs');
-
-// Find TLC installation directory
-function findTlcDir() {
-  const isWSL = process.platform === 'linux' && fs.existsSync('/mnt/c');
-
-  // Check common locations (adjust for WSL)
-  const locations = [
-    path.join(__dirname, '..'),  // Where this script lives (most reliable)
-  ];
-
-  if (isWSL) {
-    locations.push('/mnt/c/Code/TLC');
-    locations.push(path.join(require('os').homedir(), 'Code', 'TLC'));
-  } else {
-    locations.push('C:\\Code\\TLC');
-    locations.push(path.join(require('os').homedir(), 'Code', 'TLC'));
-  }
-
-  // Check npm global
-  try {
-    const { execSync } = require('child_process');
-    const globalRoot = execSync('npm root -g', { encoding: 'utf-8' }).trim();
-    locations.push(path.join(globalRoot, 'tlc-claude-code'));
-  } catch (e) {
-    // Ignore
-  }
-
-  for (const loc of locations) {
-    if (fs.existsSync(path.join(loc, 'docker-compose.dev.yml'))) {
-      return loc;
-    }
-  }
-
-  return null;
-}
-
-// Get project name from current directory
-function getProjectName() {
-  const projectDir = process.cwd();
-  return path.basename(projectDir).toLowerCase().replace(/[^a-z0-9]/g, '');
-}
-
-async function main() {
-  console.log('');
-  console.log('  TLC Rebuild');
-  console.log('  ===========');
-  console.log('');
-
-  const tlcDir = findTlcDir();
-  if (!tlcDir) {
-    console.error('  [ERROR] Could not find TLC installation');
-    console.error('  Make sure docker-compose.dev.yml exists');
-    process.exit(1);
-  }
-
-  const projectName = getProjectName();
-  const composePath = path.join(tlcDir, 'docker-compose.dev.yml');
-
-  console.log(`  TLC Dir: ${tlcDir}`);
-  console.log(`  Project: ${projectName}`);
-  console.log('');
-
-  // Set environment variables
-  process.env.PROJECT_DIR = process.cwd();
-  process.env.COMPOSE_PROJECT_NAME = projectName;
-
-  console.log('  [1/2] Stopping containers...');
-
-  // Run docker-compose down
-  const down = spawn('docker-compose', ['-f', composePath, 'down'], {
-    stdio: 'inherit',
-    shell: true,
-    env: process.env
-  });
-
-  down.on('close', (code) => {
-    if (code !== 0) {
-      console.error('  [ERROR] Failed to stop containers');
-      process.exit(1);
-    }
-
-    console.log('');
-    console.log('  [2/2] Rebuilding and starting...');
-    console.log('');
-
-    // Run docker-compose up --build
-    const up = spawn('docker-compose', ['-f', composePath, 'up', '--build'], {
-      stdio: 'inherit',
-      shell: true,
-      env: process.env
-    });
-
-    up.on('close', (upCode) => {
-      process.exit(upCode || 0);
-    });
-  });
-}
-
-main();
+#!/usr/bin/env node
+
+/**
+ * TLC Rebuild - Trigger full Docker rebuild
+ * Usage: tlc rebuild
+ */
+
+const { spawn } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+
+// Find TLC installation directory
+function findTlcDir() {
+  const isWSL = process.platform === 'linux' && fs.existsSync('/mnt/c');
+
+  // Check common locations (adjust for WSL)
+  const locations = [
+    path.join(__dirname, '..'),  // Where this script lives (most reliable)
+  ];
+
+  if (isWSL) {
+    locations.push('/mnt/c/Code/TLC');
+    locations.push(path.join(require('os').homedir(), 'Code', 'TLC'));
+  } else {
+    locations.push('C:\\Code\\TLC');
+    locations.push(path.join(require('os').homedir(), 'Code', 'TLC'));
+  }
+
+  // Check npm global
+  try {
+    const { execSync } = require('child_process');
+    const globalRoot = execSync('npm root -g', { encoding: 'utf-8' }).trim();
+    locations.push(path.join(globalRoot, 'tlc-claude-code'));
+  } catch (e) {
+    // Ignore
+  }
+
+  for (const loc of locations) {
+    if (fs.existsSync(path.join(loc, 'docker-compose.dev.yml'))) {
+      return loc;
+    }
+  }
+
+  return null;
+}
+
+// Get project name from current directory
+function getProjectName() {
+  const projectDir = process.cwd();
+  return path.basename(projectDir).toLowerCase().replace(/[^a-z0-9]/g, '');
+}
+
+async function main() {
+  console.log('');
+  console.log('  TLC Rebuild');
+  console.log('  ===========');
+  console.log('');
+
+  const tlcDir = findTlcDir();
+  if (!tlcDir) {
+    console.error('  [ERROR] Could not find TLC installation');
+    console.error('  Make sure docker-compose.dev.yml exists');
+    process.exit(1);
+  }
+
+  const projectName = getProjectName();
+  const composePath = path.join(tlcDir, 'docker-compose.dev.yml');
+
+  console.log(`  TLC Dir: ${tlcDir}`);
+  console.log(`  Project: ${projectName}`);
+  console.log('');
+
+  // Set environment variables
+  process.env.PROJECT_DIR = process.cwd();
+  process.env.COMPOSE_PROJECT_NAME = projectName;
+
+  console.log('  [1/2] Stopping containers...');
+
+  // Run docker-compose down
+  const down = spawn('docker-compose', ['-f', composePath, 'down'], {
+    stdio: 'inherit',
+    shell: true,
+    env: process.env
+  });
+
+  down.on('close', (code) => {
+    if (code !== 0) {
+      console.error('  [ERROR] Failed to stop containers');
+      process.exit(1);
+    }
+
+    console.log('');
+    console.log('  [2/2] Rebuilding and starting...');
+    console.log('');
+
+    // Run docker-compose up --build
+    const up = spawn('docker-compose', ['-f', composePath, 'up', '--build'], {
+      stdio: 'inherit',
+      shell: true,
+      env: process.env
+    });
+
+    up.on('close', (upCode) => {
+      process.exit(upCode || 0);
+    });
+  });
+}
+
+main();

package/bin/server.js

@@ -1,16 +1,16 @@
-#!/usr/bin/env node
-
-const path = require('path');
-const { spawn } = require('child_process');
-
-// Run the server from the parent directory
-const serverPath = path.join(__dirname, '..', 'server', 'index.js');
-
-const child = spawn('node', [serverPath], {
-  stdio: 'inherit',
-  cwd: process.cwd()
-});
-
-child.on('exit', (code) => {
-  process.exit(code || 0);
-});
+#!/usr/bin/env node
+
+const path = require('path');
+const { spawn } = require('child_process');
+
+// Run the server from the parent directory
+const serverPath = path.join(__dirname, '..', 'server', 'index.js');
+
+const child = spawn('node', [serverPath], {
+  stdio: 'inherit',
+  cwd: process.cwd()
+});
+
+child.on('exit', (code) => {
+  process.exit(code || 0);
+});

package/bin/setup.js

@@ -1,42 +1,42 @@
-#!/usr/bin/env node
-
-const path = require('path');
-const { spawn } = require('child_process');
-const fs = require('fs');
-
-const setupScript = path.join(__dirname, '..', 'server', 'setup.sh');
-
-// Check if running on Windows without WSL
-if (process.platform === 'win32') {
-  console.log('\n[TLC] Windows detected');
-  console.log('[TLC] Please install Docker Desktop from: https://www.docker.com/products/docker-desktop');
-  console.log('[TLC] After installation, TLC will automatically use Docker for databases.\n');
-  process.exit(0);
-}
-
-// Check if setup script exists
-if (!fs.existsSync(setupScript)) {
-  console.error('[TLC] Setup script not found:', setupScript);
-  process.exit(1);
-}
-
-console.log('\n[TLC] Running TLC server setup...');
-console.log('[TLC] This will install Docker and other requirements.');
-console.log('[TLC] You may be prompted for your sudo password.\n');
-
-// Run the setup script with sudo
-const child = spawn('sudo', ['bash', setupScript], {
-  stdio: 'inherit',
-  cwd: process.cwd()
-});
-
-child.on('exit', (code) => {
-  if (code === 0) {
-    console.log('\n[TLC] Setup completed successfully!');
-    console.log('[TLC] Please log out and log back in for Docker permissions to take effect.');
-    console.log('[TLC] Then run: tlc-server\n');
-  } else {
-    console.error('\n[TLC] Setup failed with code:', code);
-  }
-  process.exit(code || 0);
-});
+#!/usr/bin/env node
+
+const path = require('path');
+const { spawn } = require('child_process');
+const fs = require('fs');
+
+const setupScript = path.join(__dirname, '..', 'server', 'setup.sh');
+
+// Check if running on Windows without WSL
+if (process.platform === 'win32') {
+  console.log('\n[TLC] Windows detected');
+  console.log('[TLC] Please install Docker Desktop from: https://www.docker.com/products/docker-desktop');
+  console.log('[TLC] After installation, TLC will automatically use Docker for databases.\n');
+  process.exit(0);
+}
+
+// Check if setup script exists
+if (!fs.existsSync(setupScript)) {
+  console.error('[TLC] Setup script not found:', setupScript);
+  process.exit(1);
+}
+
+console.log('\n[TLC] Running TLC server setup...');
+console.log('[TLC] This will install Docker and other requirements.');
+console.log('[TLC] You may be prompted for your sudo password.\n');
+
+// Run the setup script with sudo
+const child = spawn('sudo', ['bash', setupScript], {
+  stdio: 'inherit',
+  cwd: process.cwd()
+});
+
+child.on('exit', (code) => {
+  if (code === 0) {
+    console.log('\n[TLC] Setup completed successfully!');
+    console.log('[TLC] Please log out and log back in for Docker permissions to take effect.');
+    console.log('[TLC] Then run: tlc-server\n');
+  } else {
+    console.error('\n[TLC] Setup failed with code:', code);
+  }
+  process.exit(code || 0);
+});

package/bin/tlc.js

@@ -1,49 +1,49 @@
-#!/usr/bin/env node
-
-/**
- * TLC CLI - Simple entry point
- *
- * Usage:
- *   tlc           - Install TLC slash commands to Claude Code
- *   tlc init      - Add Docker dev launcher (tlc-start.bat) to project
- */
-
-const args = process.argv.slice(2);
-const command = args[0];
-
-switch (command) {
-  case 'init':
-    require('./init.js');
-    break;
-  case 'rebuild':
-    require('./rebuild.js');
-    break;
-  case 'help':
-  case '--help':
-  case '-h':
-    console.log(`
-  TLC - Test Led Coding
-
-  Usage:
-    tlc              Install TLC slash commands to Claude Code
-    tlc init         Add Docker launcher to your project
-    tlc rebuild      Stop, rebuild, and restart Docker containers
-
-  Options:
-    --global, -g     Install commands globally (~/.claude/commands)
-    --local, -l      Install commands locally (./.claude/commands)
-
-  After 'tlc init':
-    Double-click tlc-start.bat to launch Docker dev environment:
-    - Dashboard:  http://localhost:3147
-    - App:        http://localhost:5000
-    - DB Admin:   http://localhost:8080
-    - Database:   localhost:5433
-
-  Requires: Docker Desktop (https://docker.com/products/docker-desktop)
-`);
-    break;
-  default:
-    // No subcommand = run install.js (the original behavior)
-    require('./install.js');
-}
+#!/usr/bin/env node
+
+/**
+ * TLC CLI - Simple entry point
+ *
+ * Usage:
+ *   tlc           - Install TLC slash commands to Claude Code
+ *   tlc init      - Add Docker dev launcher (tlc-start.bat) to project
+ */
+
+const args = process.argv.slice(2);
+const command = args[0];
+
+switch (command) {
+  case 'init':
+    require('./init.js');
+    break;
+  case 'rebuild':
+    require('./rebuild.js');
+    break;
+  case 'help':
+  case '--help':
+  case '-h':
+    console.log(`
+  TLC - Test Led Coding
+
+  Usage:
+    tlc              Install TLC slash commands to Claude Code
+    tlc init         Add Docker launcher to your project
+    tlc rebuild      Stop, rebuild, and restart Docker containers
+
+  Options:
+    --global, -g     Install commands globally (~/.claude/commands)
+    --local, -l      Install commands locally (./.claude/commands)
+
+  After 'tlc init':
+    Double-click tlc-start.bat to launch Docker dev environment:
+    - Dashboard:  http://localhost:3147
+    - App:        http://localhost:5000
+    - DB Admin:   http://localhost:8080
+    - Database:   localhost:5433
+
+  Requires: Docker Desktop (https://docker.com/products/docker-desktop)
+`);
+    break;
+  default:
+    // No subcommand = run install.js (the original behavior)
+    require('./install.js');
+}

package/claim.md

@@ -24,15 +24,37 @@ else
 fi
 ```
 
-### Step 2: Sync Latest State
+### Step 2: Sync with Main Branch
 
-Pull latest changes to get current task claims:
+Get the configured trunk branch from `.tlc.json`:
 
 ```bash
-git pull --rebase
+mainBranch=$(jq -r '.git.mainBranch // "main"' .tlc.json 2>/dev/null || echo "main")
 ```
 
-If pull fails due to conflicts, abort and notify user to resolve manually.
+Rebase from trunk to minimize conflicts:
+
+```bash
+git fetch origin
+git rebase origin/$mainBranch
+```
+
+Output:
+```
+Syncing with main...
+  ↳ Rebased 2 commits from origin/main
+```
+
+If rebase fails due to conflicts:
+```
+⚠️ Rebase conflict detected.
+
+Your branch has diverged from main. Resolve conflicts first:
+  git rebase --continue   (after fixing conflicts)
+  git rebase --abort      (to cancel)
+
+Then run /tlc:claim again.
+```
 
 ### Step 3: Find Current Phase Plan
 

package/help.md

@@ -18,10 +18,11 @@ Launches the visual dashboard. Detects where you are, shows what's next.
 |---------|--------------|
 | `/tlc` | **Visual dashboard. Context-aware. Knows what to do next.** |
 
-### Setup
+### Setup & Sync
 
 | Command | What It Does |
 |---------|--------------|
+| `/tlc:sync` | **One command to rule them all.** First-time setup or post-rebase reconciliation |
 | `/tlc:new-project` | Start new project (discusses stack, creates roadmap) |
 | `/tlc:init` | Add TLC to existing code |
 | `/tlc:import-project` | Import multi-repo microservices architecture |
@@ -99,12 +100,15 @@ Launches the visual dashboard. Detects where you are, shows what's next.
 
 **Simple version:**
 ```
-/tlc                    <- just keep running this
+/tlc:sync               <- First time or after rebase
+/tlc                    <- Then just keep running this
 ```
 
 **Detailed version:**
 ```
-/tlc:new-project        New project
+/tlc:sync               First-time setup (all config in one go)
+    ↓                   Or: post-rebase reconciliation
+/tlc:new-project        New project (or /tlc:init for existing)
     ↓
 /tlc                    Guides you through each phase:
                         → discuss → plan → build → verify
@@ -112,6 +116,15 @@ Launches the visual dashboard. Detects where you are, shows what's next.
 /tlc:complete           Tag release
 ```
 
+**After rebasing:**
+```
+git rebase origin/main  TLC detects changes
+    ↓
+/tlc:sync               Reconcile incoming code
+    ↓
+/tlc                    Continue working
+```
+
 ---
 
 ## What `/tlc` Does

package/init.md

@@ -242,7 +242,48 @@ Tests are written BEFORE implementation, not after.
 
 If PROJECT.md exists, append the TLC section only.
 
-### 10. Report Summary
+### 10. Detect Main Branch
+
+Identify the trunk branch for rebasing and merges:
+
+```bash
+# Try to detect from git
+if git rev-parse --verify main >/dev/null 2>&1; then
+  detected="main"
+elif git rev-parse --verify master >/dev/null 2>&1; then
+  detected="master"
+elif git rev-parse --verify develop >/dev/null 2>&1; then
+  detected="develop"
+else
+  detected=$(git rev-parse --abbrev-ref HEAD)
+fi
+```
+
+Confirm with user:
+```
+Detected main branch: main
+
+Is this your trunk branch for merges? (Y/n/other):
+>
+
+If "other", prompt for branch name.
+```
+
+Add to `.tlc.json`:
+```json
+{
+  "git": {
+    "mainBranch": "main"
+  }
+}
+```
+
+This branch is used by:
+- `/tlc:claim` - rebases from this branch before claiming
+- `/tlc:build` - suggests merging back to this branch
+- PR reviews - compares against this branch
+
+### 11. Report Summary
 
 ```
 TLC initialized for [project name]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tlc-claude-code",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "TLC - Test Led Coding for Claude Code",
   "bin": {
     "tlc": "./bin/tlc.js",

package/plan.md

@@ -124,7 +124,55 @@ Create `.planning/phases/{N}-PLAN.md`:
 - Tests: ~{N} (estimated)
 ```
 
-### Step 5: Review Plan
+### Step 5: Detect File Overlaps (Parallel Safety)
+
+Analyze tasks for file conflicts to prevent merge issues:
+
+```
+Analyzing task dependencies...
+
+Files by task:
+  Task 1: src/db/schema.ts, src/db/migrations/001.sql
+  Task 2: src/api/users.ts, src/db/schema.ts  ← overlap!
+  Task 3: src/api/auth.ts
+  Task 4: src/api/users.ts  ← overlap with Task 2!
+```
+
+When overlaps detected, auto-sequence:
+
+```
+⚠️ File overlaps detected:
+
+  src/db/schema.ts → Task 1, Task 2
+  src/api/users.ts → Task 2, Task 4
+
+Restructuring for parallel safety:
+  Task 1: Create schema        [independent]
+  Task 2: Add user endpoints   [after: 1]  ← must wait for schema
+  Task 3: Add auth middleware  [independent]
+  Task 4: Add user validation  [after: 2]  ← must wait for endpoints
+
+Tasks 1 and 3 can be worked in parallel.
+Tasks 2 and 4 are sequential.
+```
+
+Add dependencies to PLAN.md:
+
+```markdown
+## Dependencies
+
+| Task | Depends On | Reason |
+|------|------------|--------|
+| 2 | 1 | Both modify src/db/schema.ts |
+| 4 | 2 | Both modify src/api/users.ts |
+
+**Parallel groups:**
+- Group A: Tasks 1, 3 (can work simultaneously)
+- Group B: Task 2 (after Group A)
+- Group C: Task 4 (after Task 2)
+```
+
+### Step 6: Review Plan
 
 Present plan summary:
 
@@ -144,7 +192,7 @@ Proceed with this plan? (Y/n)
 
 Allow refinement if needed.
 
-### Step 6: Save and Continue
+### Step 7: Save and Continue
 
 ```
 Plan saved to .planning/phases/{N}-PLAN.md