Merge PR #461: scripts remove hardcoded paths

Author: web3dev1337

GAP_ANALYSIS_2026-01-17.md

@@ -292,6 +292,8 @@ Week 10: Phase 4 + Final polish
 - [ ] `client/workspace-wizard.js` - Lines 25, 445
 - [ ] `client/greenfield-wizard.js` - Lines 18-19
 - [ ] `client/commander-panel.js` - Line 13
+- [x] `scripts/migrate-to-workspaces.js` - HyFire2 repo path now derives from `os.homedir()` / config (no hardcoded `/home/ab`)
+- [x] `scripts/orchestrator-startup.sh` - now uses script-relative repo path (no hardcoded `/home/ab`) and updates from `origin/main`
 
 ### New Test Files
 - [ ] `tests/unit/sessionManager.test.js`

scripts/migrate-to-workspaces.js

@@ -124,6 +124,9 @@ async function ensureDirectories(basePath) {
 }
 
 function createHyFire2Workspace(oldConfig) {
+  const fallbackPath = path.join(os.homedir(), 'HyFire2');
+  const candidatePath = oldConfig?.worktrees?.basePath || oldConfig?.worktrees?.masterPath || oldConfig?.worktrees?.path || null;
+  const resolvedPath = candidatePath ? path.resolve(String(candidatePath)) : fallbackPath;
   return {
     id: 'hyfire2',
     name: 'HyFire 2',
@@ -133,7 +136,7 @@ function createHyFire2Workspace(oldConfig) {
     access: 'team',
 
     repository: {
-      path: '/home/ab/HyFire2',
+      path: resolvedPath,
       masterBranch: 'master',
       remote: 'https://github.com/web3dev1337/hyfire2'
     },
@@ -412,4 +415,4 @@ async function createExampleWorkspaces(basePath) {
 }
 
 // Run migration
-migrateToWorkspaces();
+migrateToWorkspaces();

scripts/orchestrator-startup.sh

@@ -9,7 +9,7 @@ YELLOW='\033[1;33m'
 RED='\033[0;31m'
 NC='\033[0m'
 
-ORCHESTRATOR_DIR="/home/ab/GitHub/tools/automation/claude-orchestrator/claude-orchestrator-dev"
+ORCHESTRATOR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 export ORCHESTRATOR_PORT="${ORCHESTRATOR_PORT:-4000}"
 CLIENT_PORT=2080
 
@@ -41,14 +41,14 @@ cd "$ORCHESTRATOR_DIR" || {
 # Optional: Update to latest (can be disabled with --no-update flag)
 if [[ "$1" != "--no-update" ]]; then
   echo -e "${BLUE}📥 Checking for updates...${NC}"
-  git fetch origin feature/multi-workspace-system >/dev/null 2>&1 || true
-
+  git fetch origin main >/dev/null 2>&1 || true
+  
   LOCAL=$(git rev-parse HEAD 2>/dev/null || echo "unknown")
-  REMOTE=$(git rev-parse origin/feature/multi-workspace-system 2>/dev/null || echo "unknown")
-
+  REMOTE=$(git rev-parse origin/main 2>/dev/null || echo "unknown")
+  
   if [ "$LOCAL" != "$REMOTE" ] && [ "$REMOTE" != "unknown" ]; then
     echo -e "${BLUE}⬇️ Pulling updates...${NC}"
-    git pull origin feature/multi-workspace-system 2>/dev/null || echo -e "${YELLOW}⚠ Could not pull (offline?)${NC}"
+    git pull --ff-only origin main 2>/dev/null || echo -e "${YELLOW}⚠ Could not pull (offline?)${NC}"
 
     # Update dependencies if package.json changed
     if git diff --name-only HEAD~1..HEAD 2>/dev/null | grep -q package.json; then