bit-office 1.0.3 → 1.1.0

package/dist/index.js

@@ -524,8 +524,8 @@ function getErrorMap() {
 
 // ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/helpers/parseUtil.js
 var makeIssue = (params) => {
-  const { data, path: path6, errorMaps, issueData } = params;
-  const fullPath = [...path6, ...issueData.path || []];
+  const { data, path: path10, errorMaps, issueData } = params;
+  const fullPath = [...path10, ...issueData.path || []];
   const fullIssue = {
     ...issueData,
     path: fullPath
@@ -641,11 +641,11 @@ var errorUtil;
 
 // ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/types.js
 var ParseInputLazyPath = class {
-  constructor(parent, value, path6, key) {
+  constructor(parent, value, path10, key) {
     this._cachedPath = [];
     this.parent = parent;
     this.data = value;
-    this._path = path6;
+    this._path = path10;
     this._key = key;
   }
   get path() {
@@ -4097,6 +4097,7 @@ var AgentStatusEnum = external_exports.enum([
 ]);
 var RiskLevelEnum = external_exports.enum(["low", "med", "high"]);
 var DecisionEnum = external_exports.enum(["yes", "no"]);
+var TeamPhaseEnum = external_exports.enum(["create", "design", "execute", "complete"]);
 
 // ../../packages/shared/src/commands.ts
 var RunTaskCommand = external_exports.object({
@@ -4142,13 +4143,16 @@ var OpenFileCommand = external_exports.object({
 });
 var CreateTeamCommand = external_exports.object({
   type: external_exports.literal("CREATE_TEAM"),
-  leadPresetIndex: external_exports.number(),
-  memberPresetIndices: external_exports.array(external_exports.number()),
+  leadId: external_exports.string(),
+  memberIds: external_exports.array(external_exports.string()),
   backends: external_exports.record(external_exports.string(), external_exports.string()).optional()
 });
 var ServePreviewCommand = external_exports.object({
   type: external_exports.literal("SERVE_PREVIEW"),
-  filePath: external_exports.string()
+  filePath: external_exports.string().optional(),
+  previewCmd: external_exports.string().optional(),
+  previewPort: external_exports.number().optional(),
+  cwd: external_exports.string().optional()
 });
 var StopTeamCommand = external_exports.object({
   type: external_exports.literal("STOP_TEAM")
@@ -4156,6 +4160,35 @@ var StopTeamCommand = external_exports.object({
 var FireTeamCommand = external_exports.object({
   type: external_exports.literal("FIRE_TEAM")
 });
+var KillExternalCommand = external_exports.object({
+  type: external_exports.literal("KILL_EXTERNAL"),
+  agentId: external_exports.string()
+});
+var ApprovePlanCommand = external_exports.object({
+  type: external_exports.literal("APPROVE_PLAN"),
+  agentId: external_exports.string()
+});
+var EndProjectCommand = external_exports.object({
+  type: external_exports.literal("END_PROJECT"),
+  agentId: external_exports.string()
+});
+var SaveAgentDefCommand = external_exports.object({
+  type: external_exports.literal("SAVE_AGENT_DEF"),
+  agent: external_exports.object({
+    id: external_exports.string(),
+    name: external_exports.string(),
+    role: external_exports.string(),
+    skills: external_exports.string(),
+    personality: external_exports.string(),
+    palette: external_exports.number(),
+    isBuiltin: external_exports.boolean(),
+    teamRole: external_exports.enum(["dev", "reviewer", "leader"])
+  })
+});
+var DeleteAgentDefCommand = external_exports.object({
+  type: external_exports.literal("DELETE_AGENT_DEF"),
+  agentDefId: external_exports.string()
+});
 var CommandSchema = external_exports.discriminatedUnion("type", [
   RunTaskCommand,
   ApprovalDecisionCommand,
@@ -4167,7 +4200,12 @@ var CommandSchema = external_exports.discriminatedUnion("type", [
   CreateTeamCommand,
   ServePreviewCommand,
   StopTeamCommand,
-  FireTeamCommand
+  FireTeamCommand,
+  KillExternalCommand,
+  ApprovePlanCommand,
+  EndProjectCommand,
+  SaveAgentDefCommand,
+  DeleteAgentDefCommand
 ]);
 
 // ../../packages/shared/src/events.ts
@@ -4199,6 +4237,10 @@ var ApprovalNeededEvent = external_exports.object({
   summary: external_exports.string(),
   riskLevel: RiskLevelEnum
 });
+var TokenUsage = external_exports.object({
+  inputTokens: external_exports.number(),
+  outputTokens: external_exports.number()
+});
 var TaskResultPayload = external_exports.object({
   summary: external_exports.string(),
   fullOutput: external_exports.string().optional(),
@@ -4207,7 +4249,12 @@ var TaskResultPayload = external_exports.object({
   testResult: external_exports.enum(["passed", "failed", "unknown"]),
   nextSuggestion: external_exports.string().optional(),
   previewUrl: external_exports.string().optional(),
-  previewPath: external_exports.string().optional()
+  previewPath: external_exports.string().optional(),
+  entryFile: external_exports.string().optional(),
+  projectDir: external_exports.string().optional(),
+  previewCmd: external_exports.string().optional(),
+  previewPort: external_exports.number().optional(),
+  tokenUsage: TokenUsage.optional()
 });
 var TaskDoneEvent = external_exports.object({
   type: external_exports.literal("TASK_DONE"),
@@ -4238,7 +4285,11 @@ var AgentCreatedEvent = external_exports.object({
   personality: external_exports.string().optional(),
   backend: external_exports.string().optional(),
   isTeamLead: external_exports.boolean().optional(),
-  teamId: external_exports.string().optional()
+  teamId: external_exports.string().optional(),
+  isExternal: external_exports.boolean().optional(),
+  pid: external_exports.number().optional(),
+  cwd: external_exports.string().optional(),
+  startedAt: external_exports.number().optional()
 });
 var AgentFiredEvent = external_exports.object({
   type: external_exports.literal("AGENT_FIRED"),
@@ -4268,6 +4319,31 @@ var TaskQueuedEvent = external_exports.object({
   prompt: external_exports.string(),
   position: external_exports.number()
 });
+var TokenUpdateEvent = external_exports.object({
+  type: external_exports.literal("TOKEN_UPDATE"),
+  agentId: external_exports.string(),
+  inputTokens: external_exports.number(),
+  outputTokens: external_exports.number()
+});
+var TeamPhaseEvent = external_exports.object({
+  type: external_exports.literal("TEAM_PHASE"),
+  teamId: external_exports.string(),
+  phase: TeamPhaseEnum,
+  leadAgentId: external_exports.string()
+});
+var AgentDefsEvent = external_exports.object({
+  type: external_exports.literal("AGENT_DEFS"),
+  agents: external_exports.array(external_exports.object({
+    id: external_exports.string(),
+    name: external_exports.string(),
+    role: external_exports.string(),
+    skills: external_exports.string(),
+    personality: external_exports.string(),
+    palette: external_exports.number(),
+    isBuiltin: external_exports.boolean(),
+    teamRole: external_exports.enum(["dev", "reviewer", "leader"])
+  }))
+});
 var GatewayEventSchema = external_exports.discriminatedUnion("type", [
   AgentStatusEvent,
   TaskStartedEvent,
@@ -4280,7 +4356,10 @@ var GatewayEventSchema = external_exports.discriminatedUnion("type", [
   AgentFiredEvent,
   TaskResultReturnedEvent,
   TeamChatEvent,
-  TaskQueuedEvent
+  TaskQueuedEvent,
+  TokenUpdateEvent,
+  TeamPhaseEvent,
+  AgentDefsEvent
 ]);
 
 // ../../packages/shared/src/presets.ts
@@ -4289,8 +4368,19 @@ var AGENT_PRESETS = [
   { palette: 1, name: "Mia", role: "Backend Dev", description: "APIs, database, server logic", personality: "You speak formally, professionally, in an organized and concise manner." },
   { palette: 2, name: "Leo", role: "Fullstack Dev", description: "End-to-end, frontend + backend", personality: "You are aggressive, action-first, always pursuing speed and efficiency." },
   { palette: 3, name: "Sophie", role: "Code Reviewer", description: "Review PRs, find bugs, quality", personality: "You teach patiently, explain the reasoning, and guide like a mentor." },
-  { palette: 4, name: "Yuki", role: "QA / Tester", description: "Quick smoke test, verify core works", personality: "You are extremely concise, no fluff, straight to the result. RULES: Only verify core functionality works (max 3-5 checks). Report PASS/FAIL per check with one line of evidence. Do NOT write unit tests or test files unless explicitly asked. Do NOT list improvements, suggestions, or nice-to-haves. Do NOT test edge cases. FORBIDDEN: Do NOT start any HTTP server. Do NOT use agent-browser or any browser automation tool. Do NOT install or run npx packages for testing. Only use file reading, static analysis, and simple CLI commands (like node --check) to verify code. End your report with exactly one line: VERDICT: PASS or VERDICT: FAIL. A FAIL means the feature doesn't start or crashes, not that something could be better." },
-  { palette: 5, name: "Marcus", role: "Architect", description: "System design, refactoring", personality: "You speak formally, professionally, in an organized and concise manner." }
+  { palette: 4, name: "Kai", role: "Game Dev", description: "Web games, PixiJS/Three.js/Canvas", personality: "You are enthusiastic, creative, and obsessive about game feel. You care deeply about smooth animations, tight controls, and the little details that make a game satisfying to play." },
+  { palette: 5, name: "Marcus", role: "Team Lead", description: "Creative direction, planning, delegation", personality: "You have strong product intuition and communicate with clarity and vision. You focus on the big picture, make decisive creative calls, and keep the team aligned.", isLeader: true }
+];
+var LEADER_PRESET_INDEX = AGENT_PRESETS.findIndex((p) => p.isLeader);
+
+// ../../packages/shared/src/agent-defs.ts
+var DEFAULT_AGENT_DEFS = [
+  { id: "alex", name: "Alex", role: "Frontend Dev", skills: "UI components, React/Next.js/CSS", personality: "You speak in a friendly, casual, encouraging, and natural tone.", palette: 0, isBuiltin: true, teamRole: "dev" },
+  { id: "mia", name: "Mia", role: "Backend Dev", skills: "APIs, database, server logic", personality: "You speak formally, professionally, in an organized and concise manner.", palette: 1, isBuiltin: true, teamRole: "dev" },
+  { id: "leo", name: "Leo", role: "Fullstack Dev", skills: "End-to-end, frontend + backend", personality: "You are aggressive, action-first, always pursuing speed and efficiency.", palette: 2, isBuiltin: true, teamRole: "dev" },
+  { id: "sophie", name: "Sophie", role: "Code Reviewer", skills: "Review PRs, find bugs, quality", personality: "You teach patiently, explain the reasoning, and guide like a mentor.", palette: 3, isBuiltin: true, teamRole: "reviewer" },
+  { id: "kai", name: "Kai", role: "Game Dev", skills: "Web games, PixiJS/Three.js/Canvas", personality: "You are enthusiastic, creative, and obsessive about game feel. You care deeply about smooth animations, tight controls, and the little details that make a game satisfying to play.", palette: 4, isBuiltin: true, teamRole: "dev" },
+  { id: "marcus", name: "Marcus", role: "Team Lead", skills: "Creative direction, planning, delegation", personality: "You have strong product intuition and communicate with clarity and vision. You focus on the big picture, make decisive creative calls, and keep the team aligned.", palette: 5, isBuiltin: true, teamRole: "leader" }
 ];
 
 // src/config.ts
@@ -4336,8 +4426,8 @@ function getOrCreateMachineId() {
 }
 function resolveWebDir() {
   if (process.env.WEB_DIR) return process.env.WEB_DIR;
-  const bundled = resolve(__dirname, "web/out");
-  if (existsSync(bundled)) return bundled;
+  const bundled = resolve(__dirname, "web");
+  if (existsSync(resolve(bundled, "index.html"))) return bundled;
   return resolve(__dirname, "../../web/out");
 }
 function resolveDefaultWorkspace() {
@@ -4356,7 +4446,12 @@ function buildConfig() {
   const saved = loadSavedConfig();
   return {
     machineId: getOrCreateMachineId(),
-    defaultWorkspace: process.env.WORKSPACE || resolveDefaultWorkspace(),
+    defaultWorkspace: (() => {
+      const envWs = process.env.WORKSPACE;
+      if (envWs && existsSync(envWs)) return envWs;
+      if (envWs) console.log(`[Config] WORKSPACE="${envWs}" does not exist, using default`);
+      return resolveDefaultWorkspace();
+    })(),
     wsPort: 9090,
     ablyApiKey: process.env.ABLY_API_KEY || saved.ablyApiKey || void 0,
     webDir: resolveWebDir(),
@@ -4647,8 +4742,8 @@ var PRESETS = [
   { name: "Mia", role: "Backend Dev", palette: 1, personality: "You speak formally, professionally, in an organized and concise manner." },
   { name: "Leo", role: "Fullstack Dev", palette: 2, personality: "You are aggressive, action-first, always pursuing speed and efficiency." },
   { name: "Sophie", role: "Code Reviewer", palette: 3, personality: "You teach patiently, explain the reasoning, and guide like a mentor." },
-  { name: "Yuki", role: "QA / Tester", palette: 4, personality: "You are extremely concise, no fluff, straight to the result." },
-  { name: "Marcus", role: "Architect", palette: 5, personality: "You speak formally, professionally, in an organized and concise manner." }
+  { name: "Kai", role: "Game Dev", palette: 4, personality: "You are enthusiastic, creative, and obsessive about game feel." },
+  { name: "Marcus", role: "Team Lead", palette: 5, personality: "You have strong product intuition and communicate with clarity and vision." }
 ];
 var botAgents = [];
 function formatEvent(event, agentId) {
@@ -4778,6 +4873,46 @@ import { createInterface } from "readline";
 
 // src/backends.ts
 import { execSync } from "child_process";
+import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2 } from "fs";
+import { homedir as homedir2 } from "os";
+import path from "path";
+var isRoot = process.getuid?.() === 0;
+function ensureClaudeSettingsForRoot() {
+  if (!isRoot) return;
+  const claudeDir = path.join(homedir2(), ".claude");
+  const settingsPath = path.join(claudeDir, "settings.json");
+  const requiredAllow = [
+    "Bash",
+    "Read",
+    "Write",
+    "Edit",
+    "MultiEdit",
+    "Glob",
+    "Grep",
+    "WebFetch",
+    "TodoRead",
+    "TodoWrite",
+    "Agent"
+  ];
+  try {
+    let settings = {};
+    if (existsSync2(settingsPath)) {
+      settings = JSON.parse(readFileSync2(settingsPath, "utf-8"));
+    }
+    settings.defaultMode = "bypassPermissions";
+    const perms = settings.permissions ?? {};
+    const existing = Array.isArray(perms.allow) ? perms.allow : [];
+    const merged = [.../* @__PURE__ */ new Set([...existing, ...requiredAllow])];
+    perms.allow = merged;
+    settings.permissions = perms;
+    if (!existsSync2(claudeDir)) mkdirSync2(claudeDir, { recursive: true });
+    writeFileSync2(settingsPath, JSON.stringify(settings, null, 2) + "\n", "utf-8");
+    console.log("[backends] Running as root \u2014 configured Claude Code settings.json to allow all permissions");
+  } catch (err) {
+    console.warn("[backends] Failed to configure Claude settings for root:", err);
+  }
+}
+ensureClaudeSettingsForRoot();
 var backends = [
   {
     id: "claude",
@@ -4785,7 +4920,8 @@ var backends = [
     command: "claude",
     supportsStdin: true,
     buildArgs(prompt, opts) {
-      const args = ["-p", prompt, "--output-format", "stream-json", "--verbose", "--dangerously-skip-permissions"];
+      const args = ["-p", prompt, "--output-format", "stream-json", "--verbose"];
+      if (!isRoot) args.push("--dangerously-skip-permissions");
       if (!opts.skipResume) {
         if (opts.resumeSessionId) {
           args.push("--resume", opts.resumeSessionId);
@@ -4804,7 +4940,7 @@ var backends = [
     name: "Codex CLI",
     command: "codex",
     buildArgs(prompt, opts) {
-      if (opts.fullAccess) {
+      if (opts.fullAccess && !isRoot) {
         return ["exec", prompt, "--dangerously-bypass-approvals-and-sandbox", "--skip-git-repo-check"];
       }
       return ["exec", prompt, "--full-auto", "--skip-git-repo-check"];
@@ -4922,53 +5058,118 @@ async function runSetup() {
 
 // ../../packages/orchestrator/src/orchestrator.ts
 import { EventEmitter } from "events";
+import { existsSync as existsSync5 } from "fs";
+import path7 from "path";
 import { nanoid as nanoid4 } from "nanoid";
 
 // ../../packages/orchestrator/src/agent-session.ts
 import { spawn as spawn2, execSync as execSync2 } from "child_process";
-import path2 from "path";
-import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2 } from "fs";
-import { homedir as homedir2 } from "os";
+import path3 from "path";
+import { existsSync as existsSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync3, mkdirSync as mkdirSync3 } from "fs";
+import { homedir as homedir3 } from "os";
 
 // ../../packages/orchestrator/src/preview-server.ts
 import { spawn } from "child_process";
-import path from "path";
-var PREVIEW_PORT = 9100;
+import path2 from "path";
+var STATIC_PORT = 9100;
 var PreviewServer = class {
   process = null;
   currentDir = null;
+  isDetached = false;
   /**
-   * Serve a directory on a fixed port. Kills any existing serve process first.
+   * Mode 1: Serve a static file directory on a fixed port.
    * Returns the preview URL for the given file.
    */
   serve(filePath) {
-    const dir = path.dirname(filePath);
-    const fileName = path.basename(filePath);
+    const dir = path2.dirname(filePath);
+    const fileName = path2.basename(filePath);
     this.stop();
     try {
-      this.process = spawn("npx", ["serve", dir, "-l", String(PREVIEW_PORT), "--no-clipboard"], {
+      this.process = spawn("npx", ["serve", dir, "-l", String(STATIC_PORT), "--no-clipboard"], {
         stdio: "ignore",
         detached: true
       });
       this.process.unref();
       this.currentDir = dir;
-      const url = `http://localhost:${PREVIEW_PORT}/${fileName}`;
-      console.log(`[PreviewServer] Serving ${dir} on port ${PREVIEW_PORT}`);
+      this.isDetached = true;
+      const url = `http://localhost:${STATIC_PORT}/${fileName}`;
+      console.log(`[PreviewServer] Serving ${dir} on port ${STATIC_PORT}`);
+      return url;
+    } catch (e) {
+      console.log(`[PreviewServer] Failed to start static serve: ${e}`);
+      return void 0;
+    }
+  }
+  /**
+   * Mode 2: Run a command (e.g. "python app.py") and use the specified port.
+   * The command is expected to start a server on the given port.
+   * Returns the preview URL.
+   */
+  runCommand(cmd, cwd, port) {
+    this.stop();
+    try {
+      this.process = spawn(cmd, {
+        shell: true,
+        cwd,
+        stdio: "ignore",
+        detached: true
+      });
+      this.process.unref();
+      this.currentDir = cwd;
+      this.isDetached = true;
+      const url = `http://localhost:${port}`;
+      console.log(`[PreviewServer] Running "${cmd}" in ${cwd}, preview at port ${port}`);
       return url;
     } catch (e) {
-      console.log(`[PreviewServer] Failed to start: ${e}`);
+      console.log(`[PreviewServer] Failed to run command: ${e}`);
       return void 0;
     }
   }
-  /** Kill the current serve process */
+  /**
+   * Mode 3: Launch a desktop/CLI process (no web preview URL).
+   * Used for Pygame, Tkinter, Electron, terminal apps, etc.
+   * NOT detached — GUI apps need the login session to access WindowServer (macOS).
+   */
+  launchProcess(cmd, cwd) {
+    this.stop();
+    try {
+      this.process = spawn(cmd, {
+        shell: true,
+        cwd,
+        stdio: ["ignore", "ignore", "pipe"]
+      });
+      this.currentDir = cwd;
+      this.isDetached = false;
+      console.log(`[PreviewServer] Launched "${cmd}" in ${cwd} (pid=${this.process.pid})`);
+      this.process.stderr?.on("data", (data) => {
+        const msg = data.toString().trim();
+        if (msg) console.log(`[PreviewServer] stderr: ${msg.slice(0, 200)}`);
+      });
+      this.process.on("exit", (code) => {
+        console.log(`[PreviewServer] Process exited with code ${code}`);
+      });
+    } catch (e) {
+      console.log(`[PreviewServer] Failed to launch process: ${e}`);
+    }
+  }
+  /** Kill the current process */
   stop() {
     if (this.process) {
       try {
-        this.process.kill("SIGTERM");
+        if (this.isDetached && this.process.pid) {
+          process.kill(-this.process.pid, "SIGTERM");
+        } else {
+          this.process.kill("SIGTERM");
+        }
       } catch {
+        try {
+          this.process.kill("SIGTERM");
+        } catch {
+        }
       }
       this.process = null;
       this.currentDir = null;
+      this.isDetached = false;
       console.log(`[PreviewServer] Stopped`);
     }
   }
@@ -4977,24 +5178,24 @@ var previewServer = new PreviewServer();
 
 // ../../packages/orchestrator/src/agent-session.ts
 import { nanoid as nanoid2 } from "nanoid";
-var SESSION_FILE = path2.join(homedir2(), ".bit-office", "agent-sessions.json");
+var SESSION_FILE = path3.join(homedir3(), ".bit-office", "agent-sessions.json");
 function loadSessionMap() {
   try {
-    if (existsSync2(SESSION_FILE)) return JSON.parse(readFileSync2(SESSION_FILE, "utf-8"));
+    if (existsSync3(SESSION_FILE)) return JSON.parse(readFileSync3(SESSION_FILE, "utf-8"));
   } catch {
   }
   return {};
 }
 function saveSessionId(agentId, sessionId) {
-  const dir = path2.dirname(SESSION_FILE);
-  if (!existsSync2(dir)) mkdirSync2(dir, { recursive: true });
+  const dir = path3.dirname(SESSION_FILE);
+  if (!existsSync3(dir)) mkdirSync3(dir, { recursive: true });
   const map = loadSessionMap();
   if (sessionId) {
     map[agentId] = sessionId;
   } else {
     delete map[agentId];
   }
-  writeFileSync2(SESSION_FILE, JSON.stringify(map), "utf-8");
+  writeFileSync3(SESSION_FILE, JSON.stringify(map), "utf-8");
 }
 var AgentSession = class {
   agentId;
@@ -5017,6 +5218,8 @@ var AgentSession = class {
   sandboxMode;
   stdoutBuffer = "";
   stderrBuffer = "";
+  taskInputTokens = 0;
+  taskOutputTokens = 0;
   hasHistory;
   sessionId;
   taskQueue = [];
@@ -5024,6 +5227,8 @@ var AgentSession = class {
   _renderPrompt;
   timedOut = false;
   _isTeamLead;
+  /** Whether this leader has already been through execute phase at least once */
+  _hasExecuted = false;
   _lastResult = null;
   /** Original user-facing task prompt (for leader state-summary mode) */
   originalTask = null;
@@ -5041,13 +5246,28 @@ var AgentSession = class {
     return this._lastResult;
   }
   _lastResultText = null;
+  /** Full output from the last completed task (for plan capture). */
+  _lastFullOutput = null;
+  get lastFullOutput() {
+    return this._lastFullOutput;
+  }
   set isTeamLead(v) {
     this._isTeamLead = v;
   }
+  /** Current phase override for team collaboration phases */
+  currentPhase = null;
   /** Current working directory of the running task (used by worktree logic) */
   get currentWorkingDir() {
     return this.currentCwd;
   }
+  /** The configured workspace root directory */
+  get workspaceDir() {
+    return this.workspace;
+  }
+  /** PID of the running child process (null if not running) */
+  get pid() {
+    return this.process?.pid ?? null;
+  }
   /** Worktree path if task is running in one (set externally by orchestrator) */
   worktreePath = null;
   worktreeBranch = null;
@@ -5067,7 +5287,7 @@ var AgentSession = class {
     this.onEvent = opts.onEvent;
     this._renderPrompt = opts.renderPrompt;
   }
-  async runTask(taskId, prompt, repoPath, teamContext, isUserInitiated = false) {
+  async runTask(taskId, prompt, repoPath, teamContext, isUserInitiated = false, phaseOverride) {
     if (this._userCancelled && !isUserInitiated) {
       console.log(`[Agent ${this.name}] Ignoring internal task restart \u2014 agent was cancelled by user`);
       return;
@@ -5077,7 +5297,7 @@ var AgentSession = class {
     }
     if (this.process) {
       const position = this.taskQueue.length + 1;
-      this.taskQueue.push({ taskId, prompt, repoPath, teamContext });
+      this.taskQueue.push({ taskId, prompt, repoPath, teamContext, phaseOverride });
       this.onEvent({
         type: "task:queued",
         agentId: this.agentId,
@@ -5092,10 +5312,13 @@ var AgentSession = class {
       this.idleTimer = null;
     }
     this.currentTaskId = taskId;
+    this.currentPhase = phaseOverride ?? null;
     const cwd = repoPath ?? this.workspace;
     this.currentCwd = cwd;
     this.stdoutBuffer = "";
     this.stderrBuffer = "";
+    this.taskInputTokens = 0;
+    this.taskOutputTokens = 0;
     this.onEvent({
       type: "task:started",
       agentId: this.agentId,
@@ -5108,19 +5331,29 @@ var AgentSession = class {
       for (const key of this.backend.deleteEnv ?? []) {
         delete cleanEnv[key];
       }
+      const rawOriginalTask = this._isTeamLead ? this.originalTask ?? prompt : "";
+      const originalTask = rawOriginalTask.length > 1500 ? rawOriginalTask.slice(0, 1500) + "\n...(truncated)" : rawOriginalTask;
       const templateVars = {
         name: this.name,
         role: this._isTeamLead ? "Team Lead" : this.role,
         personality: this.personality ? `${this.personality}` : "",
         teamRoster: teamContext ?? "",
-        originalTask: this._isTeamLead ? this.originalTask ?? prompt : "",
-        prompt
+        originalTask,
+        prompt,
+        soloHint: this.teamId ? "" : "- You are a SOLO developer. Do NOT delegate, assign tasks, or mention other team members. Do ALL the work yourself."
       };
+      const isFirstExecute = this._isTeamLead && phaseOverride === "execute" && !this._hasExecuted;
       let fullPrompt;
-      if (this._isTeamLead) {
-        fullPrompt = this._renderPrompt(this.hasHistory ? "leader-continue" : "leader-initial", templateVars);
+      if (this._isTeamLead && phaseOverride && ["create", "design", "complete"].includes(phaseOverride)) {
+        const templateName = this.hasHistory ? `leader-${phaseOverride}-continue` : `leader-${phaseOverride}`;
+        fullPrompt = this._renderPrompt(templateName, templateVars);
+      } else if (this._isTeamLead) {
+        const useInitial = isFirstExecute || !this.hasHistory;
+        fullPrompt = this._renderPrompt(useInitial ? "leader-initial" : "leader-continue", templateVars);
+        if (phaseOverride === "execute") this._hasExecuted = true;
       } else {
-        fullPrompt = this._renderPrompt(this.hasHistory ? "worker-continue" : "worker-initial", templateVars);
+        const workerInitial = this.role.toLowerCase().includes("review") ? "worker-reviewer-initial" : "worker-initial";
+        fullPrompt = this._renderPrompt(this.hasHistory ? "worker-continue" : workerInitial, templateVars);
       }
       const fullAccess = this.sandboxMode === "full";
       const verbose = !!process.env.DEBUG;
@@ -5129,9 +5362,10 @@ var AgentSession = class {
         resumeSessionId: this.sessionId ?? void 0,
         fullAccess,
         noTools: this._isTeamLead,
-        model: this._isTeamLead ? "sonnet" : void 0,
         verbose,
-        skipResume: this._isTeamLead && this.hasHistory
+        // Only skip resume on first execute (to shed conversational create/design context).
+        // On subsequent runs (result forwarding, user feedback), resume so leader keeps context.
+        skipResume: isFirstExecute && this.hasHistory
       });
       try {
         const whichPath = execSync2(`which ${this.backend.command}`, { env: cleanEnv, encoding: "utf-8", timeout: 3e3 }).trim();
@@ -5168,22 +5402,34 @@ var AgentSession = class {
         if (/^\s*[\w./\\-]+\.(ts|tsx|js|jsx|json|md|css|py)\s*$/.test(line)) return true;
         return false;
       };
+      let pendingDelegation = null;
+      const flushDelegation = () => {
+        if (pendingDelegation && this.onDelegation) {
+          const fullPrompt2 = pendingDelegation.lines.join("\n").replace(/\*\*$/, "").trim();
+          console.log(`[Delegation detected] ${this.name} -> @${pendingDelegation.targetName}: ${fullPrompt2.slice(0, 120)}`);
+          this.onDelegation(this.agentId, pendingDelegation.targetName, fullPrompt2);
+        }
+        pendingDelegation = null;
+      };
       const handleTextLine = (text) => {
         const lines = text.split("\n").filter((l) => l.trim());
         const visibleLines = [];
         for (const line of lines) {
           const trimmed = line.trim();
           console.log(`[Agent ${this.name}] ${trimmed.slice(0, 200)}`);
-          const match = trimmed.match(DELEGATION_RE);
-          if (match && this.onDelegation) {
+          const match = this._isTeamLead ? trimmed.match(DELEGATION_RE) : null;
+          if (match) {
+            flushDelegation();
             const [, targetName, delegatedPrompt] = match;
-            console.log(`[Delegation detected] ${this.name} -> @${targetName}: ${delegatedPrompt.slice(0, 60)}`);
-            this.onDelegation(this.agentId, targetName, delegatedPrompt.replace(/\*\*$/, "").trim());
+            pendingDelegation = { targetName, lines: [delegatedPrompt] };
+          } else if (pendingDelegation) {
+            pendingDelegation.lines.push(trimmed);
           }
           if (!isSystemNoise(line)) {
             visibleLines.push(trimmed);
           }
         }
+        flushDelegation();
         if (visibleLines.length > 0) {
           this.onEvent({
             type: "log:append",
@@ -5218,6 +5464,11 @@ var AgentSession = class {
                 console.log(`[Agent ${this.name}] Session ID: ${msg.session_id}`);
               }
               if (msg.type === "assistant" && msg.message?.content) {
+                if (msg.message.usage) {
+                  const usage = msg.message.usage;
+                  if (typeof usage.input_tokens === "number") this.taskInputTokens += usage.input_tokens;
+                  if (typeof usage.output_tokens === "number") this.taskOutputTokens += usage.output_tokens;
+                }
                 for (const block of msg.message.content) {
                   if (block.type === "text" && block.text) {
                     this.stdoutBuffer += block.text + "\n";
@@ -5302,15 +5553,17 @@ var AgentSession = class {
           } else if (code === 0) {
             this.hasHistory = true;
             saveSessionId(this.agentId, this.sessionId);
-            const { summary, fullOutput, changedFiles } = this.extractResult();
+            const { summary, fullOutput, changedFiles, entryFile, projectDir, previewCmd, previewPort } = this.extractResult();
+            this._lastFullOutput = fullOutput;
             const { previewUrl, previewPath } = this._isTeamLead ? { previewUrl: void 0, previewPath: void 0 } : this.detectPreview();
             this._lastResult = `done: ${summary.slice(0, 120)}`;
             this.setStatus("done");
+            const tokenUsage = this.taskInputTokens > 0 || this.taskOutputTokens > 0 ? { inputTokens: this.taskInputTokens, outputTokens: this.taskOutputTokens } : void 0;
             this.onEvent({
               type: "task:done",
               agentId: this.agentId,
               taskId: completedTaskId,
-              result: { summary, fullOutput, changedFiles, diffStat: "", testResult: "unknown", previewUrl, previewPath }
+              result: { summary, fullOutput, changedFiles, diffStat: "", testResult: "unknown", previewUrl, previewPath, entryFile, projectDir, previewCmd, previewPort, tokenUsage }
             });
             this.onTaskComplete?.(this.agentId, completedTaskId, summary, true);
             this.idleTimer = setTimeout(() => {
@@ -5378,29 +5631,58 @@ var AgentSession = class {
    * Called directly for workers; called by orchestrator for leader's final result.
    */
   detectPreview() {
-    const previewMatch = this.stdoutBuffer.match(/PREVIEW:\s*(https?:\/\/[^\s*)\]>]+)/i);
-    let previewUrl = previewMatch?.[1]?.replace(/[*)\]>]+$/, "");
+    const result = this.extractResult();
+    const cwd = this.currentCwd ?? this.workspace;
+    let previewUrl;
     let previewPath;
-    if (!previewUrl) {
-      const localhostMatch = this.stdoutBuffer.match(/https?:\/\/localhost[:\d]*/);
-      previewUrl = localhostMatch?.[0];
+    if (result.previewCmd) {
+      if (result.previewPort) {
+        previewUrl = previewServer.runCommand(result.previewCmd, cwd, result.previewPort);
+        if (previewUrl) return { previewUrl, previewPath: void 0 };
+      } else {
+        return { previewUrl: void 0, previewPath: void 0 };
+      }
     }
-    if (!previewUrl) {
-      const fileMatch = this.stdoutBuffer.match(/(?:open\s+)?((?:\/[\w./_-]+|[\w./_-]+)\.html?)\b/i);
-      if (fileMatch) {
-        previewPath = path2.isAbsolute(fileMatch[1]) ? fileMatch[1] : path2.join(this.currentCwd ?? this.workspace, fileMatch[1]);
-        previewUrl = previewServer.serve(previewPath);
+    if (result.entryFile) {
+      if (/\.html?$/i.test(result.entryFile)) {
+        previewPath = path3.isAbsolute(result.entryFile) ? result.entryFile : path3.join(cwd, result.entryFile);
+        if (existsSync3(previewPath)) {
+          previewUrl = previewServer.serve(previewPath);
+          if (previewUrl) return { previewUrl, previewPath };
+        }
       }
     }
-    if (!previewUrl) {
-      const { changedFiles } = this.extractResult();
-      const htmlFile = changedFiles.find((f) => /\.html?$/i.test(f));
-      if (htmlFile) {
-        previewPath = path2.isAbsolute(htmlFile) ? htmlFile : path2.join(this.currentCwd ?? this.workspace, htmlFile);
-        previewUrl = previewServer.serve(previewPath);
+    const previewMatch = this.stdoutBuffer.match(/PREVIEW:\s*(https?:\/\/[^\s*)\]>]+)/i);
+    if (previewMatch) {
+      return { previewUrl: previewMatch[1].replace(/[*)\]>]+$/, ""), previewPath: void 0 };
+    }
+    const fileMatch = this.stdoutBuffer.match(/(?:open\s+)?((?:\/[\w./_-]+|[\w./_-]+)\.html?)\b/i);
+    if (fileMatch) {
+      previewPath = path3.isAbsolute(fileMatch[1]) ? fileMatch[1] : path3.join(cwd, fileMatch[1]);
+      previewUrl = previewServer.serve(previewPath);
+      if (previewUrl) return { previewUrl, previewPath };
+    }
+    const htmlFile = result.changedFiles.find((f) => /\.html?$/i.test(f));
+    if (htmlFile) {
+      previewPath = path3.isAbsolute(htmlFile) ? htmlFile : path3.join(cwd, htmlFile);
+      previewUrl = previewServer.serve(previewPath);
+      if (previewUrl) return { previewUrl, previewPath };
+    }
+    const candidates = [
+      "dist/index.html",
+      "build/index.html",
+      "out/index.html",
+      "index.html",
+      "public/index.html"
+    ];
+    for (const candidate of candidates) {
+      const absPath = path3.join(cwd, candidate);
+      if (existsSync3(absPath)) {
+        previewUrl = previewServer.serve(absPath);
+        if (previewUrl) return { previewUrl, previewPath: absPath };
       }
     }
-    return { previewUrl, previewPath };
+    return { previewUrl: void 0, previewPath: void 0 };
   }
   /**
    * Parse stdoutBuffer for structured result (SUMMARY/STATUS/FILES_CHANGED).
@@ -5411,6 +5693,10 @@ var AgentSession = class {
     const fullOutput = raw.slice(0, 3e3);
     const summaryMatch = raw.match(/SUMMARY:\s*(.+)/i);
     const filesMatch = raw.match(/FILES_CHANGED:\s*(.+)/i);
+    const entryFileMatch = raw.match(/ENTRY_FILE:\s*(.+)/i);
+    const projectDirMatch = raw.match(/PROJECT_DIR:\s*(.+)/i);
+    const previewCmdMatch = raw.match(/PREVIEW_CMD:\s*(.+)/i);
+    const previewPortMatch = raw.match(/PREVIEW_PORT:\s*(\d+)/i);
     const changedFiles = [];
     if (filesMatch) {
       const fileList = filesMatch[1].trim();
@@ -5419,8 +5705,12 @@ var AgentSession = class {
         if (cleaned) changedFiles.push(cleaned);
       }
     }
+    const entryFile = entryFileMatch?.[1]?.trim();
+    const projectDir = projectDirMatch?.[1]?.trim();
+    const previewCmd = previewCmdMatch?.[1]?.trim();
+    const previewPort = previewPortMatch ? parseInt(previewPortMatch[1], 10) : void 0;
     if (summaryMatch) {
-      return { summary: summaryMatch[1].trim(), fullOutput, changedFiles };
+      return { summary: summaryMatch[1].trim(), fullOutput, changedFiles, entryFile, projectDir, previewCmd, previewPort };
     }
     const lines = raw.split("\n").filter((l) => l.trim());
     const delegationRe = /^@(\w+):/;
@@ -5445,17 +5735,17 @@ var AgentSession = class {
       }
     }
     if (meaningful.length === 0 && delegationTargets.length > 0) {
-      return { summary: `Delegated tasks to ${delegationTargets.join(", ")}`, fullOutput, changedFiles };
+      return { summary: `Delegated tasks to ${delegationTargets.join(", ")}`, fullOutput, changedFiles, entryFile, projectDir };
     }
     const lastChunk = meaningful.slice(-5).join("\n").trim();
     const summary = lastChunk.slice(0, 500) || "Task completed";
-    return { summary, fullOutput, changedFiles };
+    return { summary, fullOutput, changedFiles, entryFile, projectDir };
   }
   dequeueNext() {
     if (this.taskQueue.length === 0) return;
     const next = this.taskQueue.shift();
     setTimeout(() => {
-      this.runTask(next.taskId, next.prompt, next.repoPath, next.teamContext);
+      this.runTask(next.taskId, next.prompt, next.repoPath, next.teamContext, false, next.phaseOverride);
     }, 100);
   }
   cancelled = false;
@@ -5511,16 +5801,33 @@ var AgentSession = class {
       this.idleTimer = null;
     }
     if (this.process?.pid) {
+      const pgid = this.process.pid;
       try {
-        process.kill(-this.process.pid, "SIGTERM");
+        process.kill(-pgid, "SIGKILL");
       } catch {
-        this.process.kill("SIGTERM");
+        try {
+          this.process.kill("SIGKILL");
+        } catch {
+        }
       }
       this.process = null;
     }
     this.pendingApprovals.clear();
     saveSessionId(this.agentId, null);
   }
+  /** Reset conversation history so the next task starts fresh (used by End Project). */
+  clearHistory() {
+    this.hasHistory = false;
+    this.sessionId = null;
+    this.originalTask = null;
+    this.currentPhase = null;
+    this._hasExecuted = false;
+    this._lastResult = null;
+    this._lastResultText = null;
+    this._lastFullOutput = null;
+    this.setStatus("idle");
+    saveSessionId(this.agentId, null);
+  }
   resolveApproval(approvalId, decision) {
     if (approvalId === "__all__") {
       for (const [, pending2] of this.pendingApprovals) {
@@ -5580,7 +5887,8 @@ var AgentManager = class {
     const lines = [];
     for (const session of this.agents.values()) {
       const lead = this.isTeamLead(session.agentId) ? " (Team Lead)" : "";
-      const result = session.lastResult ? ` \u2014 ${session.lastResult}` : "";
+      const raw = session.lastResult ?? "";
+      const result = raw ? ` \u2014 ${raw.length > 100 ? raw.slice(0, 100) + "\u2026" : raw}` : "";
       lines.push(`- ${session.name} (${session.role}) [${session.status}]${lead}${result}`);
     }
     return lines.join("\n");
@@ -5626,10 +5934,12 @@ var AgentManager = class {
 
 // ../../packages/orchestrator/src/delegation.ts
 import { nanoid as nanoid3 } from "nanoid";
+import path4 from "path";
 var MAX_DELEGATION_DEPTH = 5;
 var MAX_TOTAL_DELEGATIONS = 20;
-var DELEGATION_BUDGET_ROUNDS = 5;
+var DELEGATION_BUDGET_ROUNDS = 7;
 var HARD_CEILING_ROUNDS = 10;
+var MAX_REVIEW_ROUNDS = 3;
 var RESULT_BATCH_WINDOW_MS = 2e4;
 var DelegationRouter = class {
   /** taskId → fromAgentId */
@@ -5642,6 +5952,8 @@ var DelegationRouter = class {
   totalDelegations = 0;
   /** How many times the leader has been invoked to process results */
   leaderRounds = 0;
+  /** How many times a Code Reviewer result has been forwarded to the leader */
+  reviewCount = 0;
   /** When true, all new delegations and result forwarding are blocked */
   stopped = false;
   /** TaskIds created by flushResults — only these can produce a final result */
@@ -5650,6 +5962,8 @@ var DelegationRouter = class {
   delegationsAtResultStart = /* @__PURE__ */ new Map();
   /** Batch result forwarding: originAgentId → pending results + timer */
   pendingResults = /* @__PURE__ */ new Map();
+  /** Team-wide project directory — all delegations use this as repoPath when set */
+  teamProjectDir = null;
   agentManager;
   promptEngine;
   emitEvent;
@@ -5683,7 +5997,7 @@ var DelegationRouter = class {
    * if the current task is not a "resultTask" (safety net for convergence).
    */
   isBudgetExhausted() {
-    return this.leaderRounds >= DELEGATION_BUDGET_ROUNDS;
+    return this.leaderRounds >= DELEGATION_BUDGET_ROUNDS || this.reviewCount >= MAX_REVIEW_ROUNDS;
   }
   /**
    * True if the given resultTask completed WITHOUT creating any new delegations.
@@ -5724,6 +6038,16 @@ var DelegationRouter = class {
     }
     this.pendingResults.clear();
   }
+  /**
+   * Set a team-wide project directory. All delegations will use this as repoPath.
+   */
+  setTeamProjectDir(dir) {
+    this.teamProjectDir = dir;
+    if (dir) console.log(`[Delegation] Team project dir set: ${dir}`);
+  }
+  getTeamProjectDir() {
+    return this.teamProjectDir;
+  }
   /**
    * Reset all delegation state (on new team task).
    */
@@ -5735,7 +6059,9 @@ var DelegationRouter = class {
     this.delegationsAtResultStart.clear();
     this.totalDelegations = 0;
     this.leaderRounds = 0;
+    this.reviewCount = 0;
     this.stopped = false;
+    this.teamProjectDir = null;
     for (const pending of this.pendingResults.values()) {
       clearTimeout(pending.timer);
     }
@@ -5744,8 +6070,13 @@ var DelegationRouter = class {
   wireDelegation(session) {
     session.onDelegation = (fromAgentId, targetName, prompt) => {
       if (this.stopped) return;
-      if (this.leaderRounds >= DELEGATION_BUDGET_ROUNDS) {
-        console.log(`[Delegation] BLOCKED: delegation budget exhausted (round ${this.leaderRounds}/${DELEGATION_BUDGET_ROUNDS})`);
+      const phaseCheckSession = this.agentManager.get(fromAgentId);
+      if (phaseCheckSession?.currentPhase && phaseCheckSession.currentPhase !== "execute") {
+        console.log(`[Delegation] BLOCKED: agent ${fromAgentId} is in phase "${phaseCheckSession.currentPhase}", not "execute"`);
+        return;
+      }
+      if (this.isBudgetExhausted()) {
+        console.log(`[Delegation] BLOCKED: budget exhausted (leaderRounds=${this.leaderRounds}/${DELEGATION_BUDGET_ROUNDS}, reviewCount=${this.reviewCount}/${MAX_REVIEW_ROUNDS})`);
         return;
       }
       const target = this.agentManager.findByName(targetName);
@@ -5785,14 +6116,27 @@ var DelegationRouter = class {
       const fromSession = this.agentManager.get(fromAgentId);
       const fromName = fromSession?.name ?? fromAgentId;
       const fromRole = fromSession?.role ?? "Team Lead";
-      const fullPrompt = this.promptEngine.render("delegation-prefix", { fromName, fromRole, prompt });
-      console.log(`[Delegation] ${fromAgentId} -> ${target.agentId} (${targetName}) depth=${newDepth} total=${this.totalDelegations}: ${prompt.slice(0, 80)}`);
+      let repoPath = this.teamProjectDir ?? void 0;
+      let cleanPrompt = prompt;
+      const dirMatch = prompt.match(/^\s*\[([^\]]+)\]\s*/);
+      if (dirMatch) {
+        cleanPrompt = prompt.slice(dirMatch[0].length);
+        if (!repoPath) {
+          const dirPart = dirMatch[1].replace(/\/$/, "");
+          const leaderSession = this.agentManager.get(fromAgentId);
+          if (leaderSession) {
+            repoPath = path4.resolve(leaderSession.workspaceDir, dirPart);
+          }
+        }
+      }
+      const fullPrompt = this.promptEngine.render("delegation-prefix", { fromName, fromRole, prompt: cleanPrompt });
+      console.log(`[Delegation] ${fromAgentId} -> ${target.agentId} (${targetName}) depth=${newDepth} total=${this.totalDelegations} repoPath=${repoPath ?? "default"}: ${cleanPrompt.slice(0, 80)}`);
       this.emitEvent({
         type: "task:delegated",
         fromAgentId,
         toAgentId: target.agentId,
         taskId,
-        prompt
+        prompt: cleanPrompt
       });
       this.emitEvent({
         type: "team:chat",
@@ -5804,7 +6148,7 @@ var DelegationRouter = class {
         timestamp: Date.now()
       });
       this.assignedTask.set(target.agentId, taskId);
-      target.runTask(taskId, fullPrompt);
+      target.runTask(taskId, fullPrompt, repoPath);
     };
   }
   wireResultForwarding(session) {
@@ -5879,6 +6223,13 @@ var DelegationRouter = class {
     const originSession = this.agentManager.get(originAgentId);
     if (!originSession) return;
     this.leaderRounds++;
+    for (const r of pending.results) {
+      const agent = this.agentManager.findByName(r.fromName);
+      if (agent && agent.role.toLowerCase().includes("review")) {
+        this.reviewCount++;
+        console.log(`[ResultBatch] Reviewer result detected (reviewCount=${this.reviewCount})`);
+      }
+    }
     if (this.leaderRounds > HARD_CEILING_ROUNDS) {
       console.log(`[ResultBatch] Hard ceiling reached (${HARD_CEILING_ROUNDS} rounds). Force-completing.`);
       const resultLines2 = pending.results.map(
@@ -5908,12 +6259,13 @@ ${resultLines2}`,
     }
     let roundInfo;
     const budgetExhausted = this.leaderRounds >= DELEGATION_BUDGET_ROUNDS;
-    if (budgetExhausted) {
-      roundInfo = `DELEGATION BUDGET REACHED (round ${this.leaderRounds}). No more delegations will be accepted. You MUST summarize the current results and report to the user NOW. Accept the work as-is \u2014 the user can request improvements later.`;
-    } else if (this.leaderRounds >= DELEGATION_BUDGET_ROUNDS - 1) {
-      roundInfo = `Round ${this.leaderRounds}/${DELEGATION_BUDGET_ROUNDS} \u2014 LAST delegation round. Only delegate if something is critically broken. Prefer to accept and summarize.`;
+    const reviewExhausted = this.reviewCount >= MAX_REVIEW_ROUNDS;
+    if (budgetExhausted || reviewExhausted) {
+      roundInfo = reviewExhausted ? `REVIEW LIMIT REACHED (${this.reviewCount}/${MAX_REVIEW_ROUNDS} reviews). No more fix iterations. Output your FINAL SUMMARY now \u2014 accept the work as-is.` : `BUDGET REACHED (round ${this.leaderRounds}/${DELEGATION_BUDGET_ROUNDS}). No more delegations allowed. Output your FINAL SUMMARY now.`;
+    } else if (this.reviewCount > 0) {
+      roundInfo = `Round ${this.leaderRounds}/${DELEGATION_BUDGET_ROUNDS} | Review ${this.reviewCount}/${MAX_REVIEW_ROUNDS} (fix iteration ${this.reviewCount})`;
     } else {
-      roundInfo = `Round ${this.leaderRounds}/${DELEGATION_BUDGET_ROUNDS}`;
+      roundInfo = `Round ${this.leaderRounds}/${DELEGATION_BUDGET_ROUNDS} | No reviews yet`;
     }
     const resultLines = pending.results.map(
       (r) => `- ${r.fromName} (${r.statusWord}): ${r.summary}`
@@ -5935,8 +6287,8 @@ ${resultLines2}`,
 };
 
 // ../../packages/orchestrator/src/prompt-templates.ts
-import { readFileSync as readFileSync3, writeFileSync as writeFileSync3, mkdirSync as mkdirSync3, existsSync as existsSync3 } from "fs";
-import path3 from "path";
+import { readFileSync as readFileSync4, writeFileSync as writeFileSync4, mkdirSync as mkdirSync4, existsSync as existsSync4 } from "fs";
+import path5 from "path";
 var PROMPT_DEFAULTS = {
   "leader-initial": `You are {{name}}, the Team Lead. {{personality}}
 You CANNOT write code, run commands, or use any tools. You can ONLY delegate.
@@ -5945,22 +6297,34 @@ Team:
 {{teamRoster}}
 
 Delegate using this exact format (one per line):
-@AgentName: [project-dir] task description
+@AgentName: task description
+
+The system has already created a dedicated project directory for this team. All agents will automatically work there \u2014 do NOT specify directory paths in delegations.
+
+===== DELEGATION RULES =====
+
+CRITICAL \u2014 How to assign work to developers:
+- Give each developer ONE complete, end-to-end task that produces a RUNNABLE deliverable.
+- The developer is responsible for EVERYTHING: project setup, dependencies, all source files, build configuration, and verification.
+- NEVER split a project into module-level sub-tasks (e.g. "create AudioManager.ts", "create GameScene.ts"). That produces disconnected files with no project skeleton.
+- CORRECT example: "@Leo: Build a complete arcade game with PixiJS. Set up the project (package.json, entry HTML, config), implement gameplay (player movement, enemies, scoring, game states), add audio (SFX + BGM with mute toggle), and build a working deliverable. Output ENTRY_FILE when done."
+- WRONG example: "@Leo: Create src/audio/AudioManager.ts" then "@Leo: Create src/game/GameScene.ts" \u2014 this produces isolated modules that can't run.
+- If you have multiple developers, split by FEATURE AREA (each producing a runnable piece), not by FILE.
 
-IMPORTANT: Every delegation MUST start with [project-dir] \u2014 the subdirectory path relative to the workspace root where this agent should focus. Example: @Alex: [game/] Fix the CSS overlay in game/styles.css. ALL team members MUST work in the same project directory. Identify the target project first, then use it consistently.
+===== EXECUTION PHASES =====
 
-Execution phases:
-1. BUILD: Assign coding tasks to developers now. Include file paths and specific instructions.
-2. VALIDATE (one round, parallel): When dev results come back, assign Code Reviewer AND QA Tester at the same time in a single response. Both run in parallel \u2014 do NOT wait for one before assigning the other.
-3. REPORT: After both review and QA report back, summarize and finish. Done.
+1. BUILD (this round): Assign developers now. Each dev must deliver a working, verifiable result.
+2. REVIEW: When dev results come back, assign Code Reviewer to check the code.
+3. FIX (if needed): If Reviewer reports VERDICT=FAIL, collect ISSUES and delegate a fix to the developer. Remind dev to rebuild/re-verify. After fix, assign Reviewer again. Up to 3 review cycles.
+4. REPORT: When Reviewer reports VERDICT=PASS (or after 3 cycles), output FINAL SUMMARY with preview info. Copy the developer's preview fields (ENTRY_FILE, PREVIEW_CMD, PREVIEW_PORT) exactly as reported \u2014 only include fields the dev actually provided.
 
 Rules:
 - Never write code yourself. Only delegate.
-- Each delegation must be specific and bounded: include exact file paths, function names, and expected output. Vague delegations ("improve the UI") cause scope creep.
-- Phase 1 (this round): Assign developers ONLY. Do NOT assign QA or code review yet \u2014 there is no code to test.
-- Phase 2 (one round only): Assign Code Reviewer AND QA Tester simultaneously in one response. This saves a full round.
-- Skip QA entirely for trivial changes (config tweaks, typo fixes, renaming, comment-only changes).
-- Keep the total number of rounds to 2-3. Ship working code now \u2014 the user can request improvements later.
+- Phase 1 (this round): Assign developers ONLY. Do NOT assign Code Reviewer yet \u2014 there is no code to review.
+- Skip review for trivial changes (config, typo, rename).
+
+Approved plan:
+{{originalTask}}
 
 Task: {{prompt}}`,
   "leader-continue": `You are {{name}}, the Team Lead. {{personality}}
@@ -5974,7 +6338,7 @@ Team status:
 Delegate using: @AgentName: task description
 
 {{prompt}}`,
-  "leader-result": `You are the Team Lead. You CANNOT write or fix code. You can ONLY delegate using @Name: [project-dir] <task>.
+  "leader-result": `You are the Team Lead. You CANNOT write or fix code. You can ONLY delegate using @Name: <task>.
 
 Original user task: {{originalTask}}
 
@@ -5986,21 +6350,47 @@ Team status:
 New result from {{fromName}} ({{resultStatus}}):
 {{resultSummary}}
 
-Decision priority (choose the FIRST that applies):
-1. ALL SUCCEEDED \u2192 Summarize the outcome for the user. You are DONE.
-2. Dev succeeded + this is a substantial change (new feature, significant logic change) + neither QA nor Code Reviewer has run yet \u2192 Assign BOTH @CodeReviewer AND @QATester simultaneously in ONE response (parallel). Skip this step for trivial changes.
-3. Dev succeeded + trivial change (config, rename, typo, style-only) \u2192 Summarize and you are DONE. No QA needed.
-4. QA or Code Review results received \u2192 Accept ALL findings as informational. Summarize and you are DONE. NEVER delegate fixes based on QA or review results.
-5. FAILED + critically broken (won't run, crash on start) \u2192 delegate ONE targeted fix to the original developer.
-6. FAILED + permanent blocker (auth error, service down, missing dependency) \u2192 report the blocker to the user.
-7. Same error repeated \u2192 STOP and report to the user.
+===== DECISION FLOW =====
+
+Check WHO sent this result, then follow the matching branch:
+
+\u2500\u2500 RESULT FROM A DEVELOPER \u2500\u2500
+  If STATUS=done:
+    \u2192 Assign Code Reviewer to check the code. In your delegation, include:
+      1. Dev's ENTRY_FILE/PREVIEW_CMD so reviewer knows what was built.
+      2. The KEY FEATURES from the approved plan (3-5 bullet points) so reviewer can verify feature completeness.
+    \u2192 Exception: skip review for trivial changes (config, typo, rename) \u2014 go straight to FINAL SUMMARY.
+  If STATUS=failed:
+    \u2192 Delegate ONE targeted fix to the same developer. Be specific about what failed.
+
+\u2500\u2500 RESULT FROM CODE REVIEWER \u2500\u2500
+  Reviewer output format: VERDICT (PASS/FAIL), ISSUES (numbered list), SUGGESTIONS (optional).
+  If VERDICT=PASS:
+    \u2192 Output FINAL SUMMARY. Copy ENTRY_FILE/PREVIEW fields from the developer's last report. You are DONE.
+  If VERDICT=FAIL:
+    \u2192 Collect ALL issues into ONE fix delegation to the original developer.
+    \u2192 Quote each issue verbatim. Remind dev: after fixing, rebuild and verify the deliverable works.
+    \u2192 After dev returns with the fix, assign Code Reviewer again to re-check.
+
+\u2500\u2500 SPECIAL CASES \u2500\u2500
+  \u2022 If roundInfo says "REVIEW LIMIT REACHED" or "BUDGET REACHED" \u2192 Output FINAL SUMMARY immediately. Accept the work as-is.
+  \u2022 Permanent blocker (auth error, missing API key, service down) \u2192 report to the user, do not retry.
+  \u2022 Same error repeated twice \u2192 STOP and report to the user.
 
-CRITICAL RULES:
-- QA/testing findings are ALWAYS informational. NEVER delegate fixes based on QA results. Note them and finish.
-- Code review comments are ALWAYS informational. Only delegate a fix if the code literally doesn't compile or run.
-- When assigning parallel QA + Review (rule 2): write BOTH @Name: lines in one response. Do not wait for one to finish.
-- Maximum ONE fix round after a failure. After that, accept and summarize.
-- Prefer DONE over more delegation. The user can request improvements later.`,
+===== FINAL SUMMARY FORMAT =====
+(Copy preview fields EXACTLY from the developer's LAST successful report. Only include fields the dev actually provided \u2014 do NOT invent values.)
+
+ENTRY_FILE: <from dev \u2014 e.g. index.html, dist/index.html. OMIT if dev didn't provide one>
+PREVIEW_CMD: <from dev \u2014 e.g. "python app.py", "node server.js". OMIT if dev didn't provide one>
+PREVIEW_PORT: <from dev \u2014 e.g. 5000, 3000. OMIT if dev didn't provide one>
+SUMMARY: <2-3 sentence description of what was built>
+
+RULES:
+- VERDICT=PASS means done, even if SUGGESTIONS exist. Suggestions are non-blocking.
+- VERDICT=FAIL means real bugs \u2014 always delegate a fix before finalizing.
+- In every fix delegation, remind dev to rebuild and re-test before reporting.
+- You MUST include ENTRY_FILE or PREVIEW_CMD in your FINAL SUMMARY \u2014 the user needs this to preview.
+- Do NOT include PROJECT_DIR \u2014 the system manages project directories automatically.`,
   "worker-initial": `Your name is {{name}}, your role is {{role}}. {{personality}}
 
 CONVERGENCE RULES (follow strictly):
@@ -6008,24 +6398,197 @@ CONVERGENCE RULES (follow strictly):
 - Only touch files directly required by this task. Do NOT refactor, clean up, or "improve" unrelated code.
 - If you are uncertain between two approaches, choose the simpler one and note it in SUMMARY.
 - Do NOT add features, error handling, or improvements that were not explicitly asked for.
-- Sub-delegate (@AgentName:) when you need a teammate's specialized expertise (e.g. frontend dev asking backend dev for an API contract, or asking QA to verify a specific behavior). Natural peer collaboration is encouraged \u2014 just keep it focused.
 
 HARD LIMITS:
-- Do NOT start any dev server, HTTP server, or file server (no npx serve, no python -m http.server, no live-server, etc.). The system handles preview automatically.
-- Do NOT install new dependencies unless the task explicitly requires it. Note any missing deps in SUMMARY instead.
+- Do NOT start any long-running dev server or file server. The system handles preview serving automatically.
+- You MAY install dependencies if the project needs them (npm install, pip install, etc.).
+{{soloHint}}
+
+Start with one sentence describing your approach. Then do the work.
+
+You are responsible for the COMPLETE deliverable \u2014 not just source files. This means:
+1. Project setup: create all config files needed (package.json, tsconfig, build config, requirements.txt, etc.)
+2. All source code
+3. Build & verify: if the project has a build step, RUN IT and fix errors until it passes
+4. Report how to run/preview the result (see deliverable types below)
+
+VERIFICATION (MANDATORY before reporting STATUS: done):
+- If you created a package.json with a build script \u2192 run the build, fix errors until it succeeds, confirm the output file exists
+- If your deliverable is an HTML file \u2192 confirm it exists and references valid scripts/styles
+- If your deliverable is a script (Python, Node, etc.) \u2192 run a syntax check (python -c "import ast; ast.parse(open('app.py').read())" or node --check app.js)
+- If NONE of the above apply \u2192 at minimum list the files and confirm the entry point exists
+- IMPORTANT: Do NOT launch GUI/desktop applications (Pygame, Tkinter, Electron, etc.) to test them \u2014 they open windows that cannot be controlled. Use syntax checks and import checks only. The user will launch the app manually when ready.
+- FINAL CHECK: confirm you can fill in at least ENTRY_FILE or PREVIEW_CMD (see deliverable types). If you cannot, your deliverable is incomplete \u2014 fix it before reporting.
+- Do NOT report STATUS: done unless verification passes. Fix problems yourself first.
+- STATUS: failed is ONLY for truly unsolvable problems (missing API keys, no network, system-level issues).
+
+===== DELIVERABLE TYPES =====
+Your project falls into one of these categories. Report the matching fields:
+
+A) STATIC WEB (HTML/CSS/JS \u2014 no server needed):
+   ENTRY_FILE: index.html  (the HTML file to open \u2014 e.g. index.html, dist/index.html, build/index.html)
 
-Start with one sentence describing your approach (e.g. "I'll add the API route in routes.ts and wire it to the existing handler."). Then do the work.
+B) WEB SERVER (Flask, Express, Sinatra, Rails, Go net/http, etc. \u2014 serves on a port):
+   PREVIEW_CMD: python app.py  (the command to start the server)
+   PREVIEW_PORT: 5000  (the port the server listens on \u2014 REQUIRED for web servers)
+
+C) DESKTOP/CLI APP (Pygame, Tkinter, Electron, JavaFX, terminal tool, native GUI, etc.):
+   PREVIEW_CMD: python game.py  (the command to launch the app \u2014 NO PREVIEW_PORT needed)
+
+OUTPUT:
 
-When you finish, report your result in this exact format:
 STATUS: done | failed
-FILES_CHANGED: (list of files you created or modified, one per line)
-SUMMARY: (one sentence \u2014 what you did and why it satisfies the task)
+FILES_CHANGED: (list all files created or modified, one per line)
+ENTRY_FILE: (type A only \u2014 path to the HTML file)
+PREVIEW_CMD: (types B and C \u2014 command to start the app or server)
+PREVIEW_PORT: (type B only \u2014 the port the server listens on)
+SUMMARY: (one sentence: what you built + how to run/preview it)
+
+You MUST provide at least ENTRY_FILE or PREVIEW_CMD.
+
+{{prompt}}`,
+  "worker-reviewer-initial": `Your name is {{name}}, your role is {{role}}. {{personality}}
+
+CONVERGENCE RULES (follow strictly):
+- Do the MINIMUM needed to satisfy the task. Simple and working beats perfect and slow.
+- Only touch files directly required by this task. Do NOT refactor, clean up, or "improve" unrelated code.
+- If you are uncertain between two approaches, choose the simpler one and note it in SUMMARY.
+- Do NOT add features, error handling, or improvements that were not explicitly asked for.
+
+HARD LIMITS:
+- Do NOT start any long-running dev server or file server. The system handles preview serving automatically.
+- Do NOT launch GUI/desktop applications (Pygame, Tkinter, Electron, etc.) to test them \u2014 they open windows that cannot be controlled. Use syntax checks, import checks, and code reading only.
+
+Code Quality (must check):
+- Correctness, security vulnerabilities, crashes, broken logic.
+- Verify the deliverable can actually run: check that entry point exists, dependencies are declared, build output is present. For GUI/desktop apps, verify via code review and syntax checks \u2014 do NOT run them.
+
+Feature Completeness (must check):
+- Compare the deliverable against the key features listed in your task assignment.
+- Flag CORE features that are completely missing or non-functional as ISSUES.
+- Do NOT fail for polish, extras, or stretch goals \u2014 this is a prototype. Focus on whether the main functionality works.
+
+Do NOT nitpick style, naming, or formatting. This is a prototype, not production code.
+
+VERDICT: PASS | FAIL
+- PASS = code runs without crashes AND core features are implemented (even if rough)
+- FAIL = crashes/bugs that prevent usage OR core features are missing/broken
+ISSUES: (numbered list \u2014 bugs, security problems, or missing core features)
+SUGGESTIONS: (optional \u2014 minor non-blocking observations, keep brief)
+SUMMARY: (one sentence overall assessment)
 
 {{prompt}}`,
   "worker-continue": `{{prompt}}`,
   "delegation-prefix": `[Assigned by {{fromName}} ({{fromRole}})]
 {{prompt}}`,
-  "delegation-hint": `To delegate a task to another agent, output on its own line: @AgentName: <task description>`
+  "delegation-hint": `To delegate a task to another agent, output on its own line: @AgentName: <task description>`,
+  "leader-create": `You are {{name}}, the team's Creative Director and Product Consultant. {{personality}}
+You are starting a new project conversation with the user. Your dual role:
+1. CREATIVE DIRECTOR \u2014 design the product vision: theme, look & feel, user experience, what makes it unique
+2. PRODUCT CONSULTANT \u2014 turn that vision into a clear, buildable plan
+
+Rules:
+- Be conversational, warm, and concise.
+- Ask at most 1-2 clarifying questions, then produce a plan. Do NOT over-question.
+- If the user gives a clear idea (even brief), that is ENOUGH \u2014 use your CREATIVITY to fill in the vision (theme, style, characters, mood, unique twist) and produce the plan immediately.
+- The goal is a WORKING PROTOTYPE, not a production system.
+- When ready, produce a project plan wrapped in [PLAN]...[/PLAN] tags.
+
+===== PLAN FORMAT (strict \u2014 follow this structure) =====
+
+[PLAN]
+CONCEPT: Short Name \u2014 one sentence describing what this product is and who it's for (e.g. "Shadow Dash \u2014 a fast-paced rooftop runner for casual gamers")
+
+CREATIVE VISION:
+- Theme & setting (e.g. "pixel cityscape at night", "cozy forest caf\xE9")
+- Visual style (e.g. "retro pixel art", "flat minimalist", "hand-drawn sketch")
+- Core experience \u2014 what does the user SEE and FEEL when using it?
+
+FEATURES:
+- (3-5 bullet points describing WHAT the product does from the user's perspective)
+- (focus on interactions, content, and behavior \u2014 NOT technical implementation)
+
+TECH: (one line \u2014 e.g. "Vanilla JS + Canvas" or "React + Tailwind")
+
+ASSIGNMENTS:
+- @DevName: (one-sentence summary of what they build)
+[/PLAN]
+
+===== ANTI-PATTERNS (never do these) =====
+- Do NOT write technical implementation steps (e.g. "implement game loop with requestAnimationFrame") \u2014 that is the developer's job.
+- Do NOT list generic engineering tasks (e.g. "add collision detection", "implement scoring system") \u2014 describe WHAT the product does, not HOW to code it.
+- Do NOT produce a checklist of modules or files. The plan is a PRODUCT DESCRIPTION, not a technical spec.
+- Do NOT include milestones, risk analysis, acceptance criteria, or deployment plans.
+- Do NOT delegate. Do NOT write code. Do NOT use @AgentName: syntax outside [PLAN] tags.
+
+If the user hasn't described their project yet, greet them and ask what they'd like to build.
+
+Team:
+{{teamRoster}}
+
+{{prompt}}`,
+  "leader-create-continue": `You are {{name}}, the team's Creative Director and Product Consultant. {{personality}}
+Do NOT greet or re-introduce yourself \u2014 the conversation is already underway.
+
+The user replied: {{prompt}}
+
+IMPORTANT: If the user is pushing you to move forward (e.g. "just do it", "make a plan", "you decide", "any is fine", "up to you"), STOP asking questions and use your CREATIVITY to fill in the vision \u2014 pick a theme, style, unique twist \u2014 and immediately produce a project plan in [PLAN]...[/PLAN] tags.
+
+Remember: You are the Creative Director. The plan must describe the PRODUCT VISION (concept, creative vision, features from user's perspective), NOT technical implementation steps. Keep it short, actionable, no milestones or risk analysis. Otherwise, ask at most ONE more question, then produce the plan. Do NOT delegate or write code.`,
+  "leader-design": `You are {{name}}, the team's Creative Director, refining the project vision with the user. {{personality}}
+The user has given feedback on your plan. Your job is to REVISE the existing plan, not start over.
+
+===== CRITICAL: INCREMENTAL UPDATE =====
+- User feedback is usually a PARTIAL adjustment (e.g. "use PixiJS", "make it darker", "add multiplayer").
+- Apply the feedback to the EXISTING plan. Keep everything the user did NOT mention.
+- NEVER discard the original concept, story, characters, or gameplay just because the user asked for a tech or style change.
+- If the user says "use X engine" or "change to Y framework" \u2192 update ONLY the TECH line and any affected details. The product vision stays.
+- Think of it as editing a document, not writing a new one.
+
+Rules:
+- Address the user's feedback directly and show what changed.
+- Always output the updated plan in [PLAN]...[/PLAN] tags using the standard format: CONCEPT, CREATIVE VISION, FEATURES, TECH, ASSIGNMENTS.
+- The plan describes the PRODUCT VISION \u2014 what users see, feel, and experience. NOT technical implementation steps.
+- Keep it prototype-focused. No milestones, risk analysis, or deployment plans.
+- Do NOT delegate. Do NOT write code. Do NOT use @AgentName: syntax outside [PLAN] tags.
+
+Team:
+{{teamRoster}}
+
+Previous plan context: {{originalTask}}
+
+User feedback: {{prompt}}`,
+  "leader-design-continue": `You are {{name}}, the team's Creative Director, refining the project vision. {{personality}}
+
+Your current plan:
+{{originalTask}}
+
+The user replied: {{prompt}}
+
+IMPORTANT: This is an INCREMENTAL update. Apply the user's feedback to the plan above \u2014 do NOT discard the original concept. If the user only mentions one aspect (tech, style, feature), change ONLY that part and keep everything else intact.
+
+Output the revised plan in the standard format: CONCEPT, CREATIVE VISION, FEATURES, TECH, ASSIGNMENTS. Describe the product vision, NOT technical steps. Always output in [PLAN]...[/PLAN] tags. Do NOT delegate or write code.`,
+  "leader-complete": `You are {{name}}, presenting completed work to the user. {{personality}}
+The team has finished executing the project. Summarize what was accomplished and ask if the user wants any changes.
+
+Rules:
+- Be concise and highlight key outcomes.
+- If the user provides feedback, note it \u2014 the system will transition back to execute phase.
+- Do NOT delegate. Do NOT write code. Do NOT use @AgentName: syntax.
+
+Team:
+{{teamRoster}}
+
+Original task: {{originalTask}}
+
+{{prompt}}`,
+  "leader-complete-continue": `You are {{name}}, discussing the completed project with the user. {{personality}}
+
+Original task: {{originalTask}}
+
+The user replied: {{prompt}}
+
+Address their feedback. Do NOT delegate or write code.`
 };
 var PromptEngine = class {
   templates = { ...PROMPT_DEFAULTS };
@@ -6035,21 +6598,24 @@ var PromptEngine = class {
   }
   /**
    * Initialize prompt templates on startup.
-   * Creates promptsDir with defaults if it doesn't exist,
-   * then loads all .md files (falling back to defaults for missing ones).
+   * Always writes built-in defaults to disk so new/updated templates take effect.
+   * Users can still customize — edits are preserved until the next code update changes a template.
    */
   init() {
     if (!this.promptsDir) {
       console.log(`[Prompts] No promptsDir configured, using ${Object.keys(PROMPT_DEFAULTS).length} default templates`);
       return;
     }
-    if (!existsSync3(this.promptsDir)) {
-      mkdirSync3(this.promptsDir, { recursive: true });
-      for (const [name, content] of Object.entries(PROMPT_DEFAULTS)) {
-        writeFileSync3(path3.join(this.promptsDir, `${name}.md`), content, "utf-8");
-      }
-      console.log(`[Prompts] Created ${this.promptsDir} with ${Object.keys(PROMPT_DEFAULTS).length} default templates`);
+    if (!existsSync4(this.promptsDir)) {
+      mkdirSync4(this.promptsDir, { recursive: true });
+    }
+    let written = 0;
+    for (const [name, content] of Object.entries(PROMPT_DEFAULTS)) {
+      const filePath = path5.join(this.promptsDir, `${name}.md`);
+      writeFileSync4(filePath, content, "utf-8");
+      written++;
     }
+    console.log(`[Prompts] Synced ${written} default templates to ${this.promptsDir}`);
     this.reload();
   }
   /**
@@ -6061,10 +6627,10 @@ var PromptEngine = class {
     let defaulted = 0;
     if (this.promptsDir) {
       for (const name of Object.keys(PROMPT_DEFAULTS)) {
-        const filePath = path3.join(this.promptsDir, `${name}.md`);
-        if (existsSync3(filePath)) {
+        const filePath = path5.join(this.promptsDir, `${name}.md`);
+        if (existsSync4(filePath)) {
           try {
-            merged[name] = readFileSync3(filePath, "utf-8");
+            merged[name] = readFileSync4(filePath, "utf-8");
             loaded++;
           } catch {
             defaulted++;
@@ -6191,7 +6757,7 @@ IMPORTANT: If the same error keeps repeating, choose option 3. Do not waste reso
 
 // ../../packages/orchestrator/src/worktree.ts
 import { execSync as execSync3 } from "child_process";
-import path4 from "path";
+import path6 from "path";
 var TIMEOUT = 5e3;
 function isGitRepo(cwd) {
   try {
@@ -6203,9 +6769,9 @@ function isGitRepo(cwd) {
 }
 function createWorktree(workspace, agentId, taskId, agentName) {
   if (!isGitRepo(workspace)) return null;
-  const worktreeDir = path4.join(workspace, ".worktrees");
+  const worktreeDir = path6.join(workspace, ".worktrees");
   const worktreeName = `${agentId}-${taskId}`;
-  const worktreePath = path4.join(worktreeDir, worktreeName);
+  const worktreePath = path6.join(worktreeDir, worktreeName);
   const branch = `agent/${agentName.toLowerCase().replace(/\s+/g, "-")}/${taskId}`;
   try {
     execSync3(`git worktree add "${worktreePath}" -b "${branch}"`, {
@@ -6251,7 +6817,7 @@ function mergeWorktree(workspace, worktreePath, branch) {
   }
 }
 function removeWorktree(worktreePath, branch, workspace) {
-  const cwd = workspace ?? path4.dirname(path4.dirname(worktreePath));
+  const cwd = workspace ?? path6.dirname(path6.dirname(worktreePath));
   try {
     execSync3(`git worktree remove --force "${worktreePath}"`, { cwd, stdio: "pipe", timeout: TIMEOUT });
   } catch {
@@ -6274,8 +6840,12 @@ var Orchestrator = class extends EventEmitter {
   sandboxMode;
   worktreeEnabled;
   worktreeMerge;
-  /** Preview captured from the first dev worker that produces one — not from QA/reviewer */
+  /** Preview info captured from the first dev worker that produces one — not from QA/reviewer */
   teamPreview = null;
+  /** Accumulated changedFiles from all workers in the current team session */
+  teamChangedFiles = /* @__PURE__ */ new Set();
+  /** Guard against emitting isFinalResult more than once per execute cycle. */
+  teamFinalized = false;
   constructor(opts) {
     super();
     this.workspace = opts.workspace;
@@ -6402,9 +6972,15 @@ var Orchestrator = class extends EventEmitter {
       return;
     }
     if (this.agentManager.isTeamLead(agentId) && !this.delegationRouter.isDelegated(taskId)) {
-      session.originalTask = prompt;
+      if (!session.originalTask || !opts?.phaseOverride || opts.phaseOverride !== "execute" && opts.phaseOverride !== "design" && opts.phaseOverride !== "complete") {
+        session.originalTask = prompt;
+      }
+      const savedProjectDir = this.delegationRouter.getTeamProjectDir();
       this.delegationRouter.clearAll();
+      if (savedProjectDir) this.delegationRouter.setTeamProjectDir(savedProjectDir);
       this.teamPreview = null;
+      this.teamChangedFiles.clear();
+      this.teamFinalized = false;
     }
     this.retryTracker?.track(taskId, prompt);
     if (this.worktreeEnabled && !session.worktreePath) {
@@ -6424,14 +7000,7 @@ var Orchestrator = class extends EventEmitter {
     }
     const repoPath = session.worktreePath ?? opts?.repoPath;
     const teamContext = this.agentManager.isTeamLead(agentId) ? this.agentManager.getTeamRoster() : void 0;
-    session.runTask(
-      taskId,
-      prompt,
-      repoPath,
-      teamContext,
-      true
-      /* isUserInitiated */
-    );
+    session.runTask(taskId, prompt, repoPath, teamContext, true, opts?.phaseOverride);
   }
   cancelTask(agentId) {
     const session = this.agentManager.get(agentId);
@@ -6491,7 +7060,7 @@ var Orchestrator = class extends EventEmitter {
   getAgent(agentId) {
     const s = this.agentManager.get(agentId);
     if (!s) return void 0;
-    return { agentId: s.agentId, name: s.name, role: s.role, status: s.status, palette: s.palette, backend: s.backend.id };
+    return { agentId: s.agentId, name: s.name, role: s.role, status: s.status, palette: s.palette, backend: s.backend.id, pid: s.pid };
   }
   getAllAgents() {
     return this.agentManager.getAll().map((s) => ({
@@ -6501,6 +7070,7 @@ var Orchestrator = class extends EventEmitter {
       status: s.status,
       palette: s.palette,
       backend: s.backend.id,
+      pid: s.pid,
       isTeamLead: this.agentManager.isTeamLead(s.agentId),
       teamId: s.teamId
     }));
@@ -6508,9 +7078,51 @@ var Orchestrator = class extends EventEmitter {
   getTeamRoster() {
     return this.agentManager.getTeamRoster();
   }
+  /** Return PIDs of all managed (gateway-spawned) agent processes */
+  getManagedPids() {
+    const pids = [];
+    for (const session of this.agentManager.getAll()) {
+      const pid = session.pid;
+      if (pid !== null) pids.push(pid);
+    }
+    return pids;
+  }
   isTeamLead(agentId) {
     return this.agentManager.isTeamLead(agentId);
   }
+  /** Get the leader's last full output (used to capture the approved plan). */
+  getLeaderLastOutput(agentId) {
+    const session = this.agentManager.get(agentId);
+    return session?.lastFullOutput ?? null;
+  }
+  /** Set team-wide project directory — all delegations will use this as cwd. */
+  setTeamProjectDir(dir) {
+    this.delegationRouter.setTeamProjectDir(dir);
+  }
+  getTeamProjectDir() {
+    return this.delegationRouter.getTeamProjectDir();
+  }
+  /** Set the original task context for the leader (e.g. the approved plan). */
+  setOriginalTask(agentId, task) {
+    const session = this.agentManager.get(agentId);
+    if (session) session.originalTask = task;
+  }
+  /** Clear ALL team members' conversation history for a fresh project cycle. */
+  clearLeaderHistory(agentId) {
+    const session = this.agentManager.get(agentId);
+    if (session) {
+      session.clearHistory();
+      for (const agent of this.agentManager.getAll()) {
+        if (agent.agentId !== agentId) {
+          agent.clearHistory();
+        }
+      }
+      this.delegationRouter.clearAll();
+      this.teamPreview = null;
+      this.teamChangedFiles.clear();
+      this.teamFinalized = false;
+    }
+  }
   // ---------------------------------------------------------------------------
   // Cleanup
   // ---------------------------------------------------------------------------
@@ -6586,28 +7198,84 @@ var Orchestrator = class extends EventEmitter {
         session.worktreeBranch = null;
       }
       this.retryTracker?.clear(event.taskId);
-      if (!this.agentManager.isTeamLead(agentId) && !this.teamPreview) {
+      if (!this.agentManager.isTeamLead(agentId) && event.result?.changedFiles) {
+        for (const f of event.result.changedFiles) {
+          this.teamChangedFiles.add(f);
+        }
+      }
+      if (!this.agentManager.isTeamLead(agentId)) {
         const role = session?.role?.toLowerCase() ?? "";
-        const isDevWorker = !role.includes("qa") && !role.includes("tester") && !role.includes("review");
-        if (isDevWorker && event.result?.previewUrl) {
+        const isDevWorker = !role.includes("review");
+        if (isDevWorker && event.result && (event.result.previewUrl || event.result.entryFile || event.result.previewCmd)) {
           this.teamPreview = {
             previewUrl: event.result.previewUrl,
-            previewPath: event.result.previewPath
+            previewPath: event.result.previewPath,
+            entryFile: event.result.entryFile,
+            previewCmd: event.result.previewCmd,
+            previewPort: event.result.previewPort
           };
-          console.log(`[Orchestrator] Preview captured from ${session?.name}: ${this.teamPreview.previewUrl}`);
+          console.log(`[Orchestrator] Preview captured from ${session?.name}: url=${this.teamPreview.previewUrl}, entry=${this.teamPreview.entryFile}, cmd=${this.teamPreview.previewCmd}`);
         }
       }
       if (this.agentManager.isTeamLead(agentId)) {
         const isResultTask = this.delegationRouter.isResultTask(event.taskId);
         const leaderDidNotDelegateNewWork = isResultTask && this.delegationRouter.resultTaskDidNotDelegate(event.taskId);
         const budgetForced = this.delegationRouter.isBudgetExhausted() && !this.delegationRouter.hasPendingFrom(agentId);
-        const shouldFinalize = leaderDidNotDelegateNewWork || budgetForced;
+        const hasWorkingWorkers = this.agentManager.getAll().some(
+          (w) => w.agentId !== agentId && w.status === "working"
+        );
+        if (hasWorkingWorkers && !budgetForced) {
+          console.log(`[Orchestrator] Deferring finalization \u2014 workers still running`);
+        }
+        const shouldFinalize = (leaderDidNotDelegateNewWork || budgetForced) && !this.teamFinalized && (!hasWorkingWorkers || budgetForced);
         if (shouldFinalize) {
+          this.teamFinalized = true;
           event.isFinalResult = true;
           this.delegationRouter.clearAgent(agentId);
-          if (!event.result?.previewUrl && this.teamPreview && event.result) {
-            event.result.previewUrl = this.teamPreview.previewUrl;
-            event.result.previewPath = this.teamPreview.previewPath;
+          if (event.result && this.teamChangedFiles.size > 0) {
+            const merged = new Set(event.result.changedFiles ?? []);
+            for (const f of this.teamChangedFiles) merged.add(f);
+            event.result.changedFiles = Array.from(merged);
+          }
+          if (event.result) {
+            const teamDir = this.delegationRouter.getTeamProjectDir();
+            if (teamDir) {
+              event.result.projectDir = teamDir;
+            }
+          }
+          if (this.teamPreview && event.result) {
+            if (this.teamPreview.previewUrl) {
+              event.result.previewUrl = this.teamPreview.previewUrl;
+              event.result.previewPath = this.teamPreview.previewPath;
+            }
+            if (this.teamPreview.entryFile) event.result.entryFile = this.teamPreview.entryFile;
+            if (this.teamPreview.previewCmd) event.result.previewCmd = this.teamPreview.previewCmd;
+            if (this.teamPreview.previewPort) event.result.previewPort = this.teamPreview.previewPort;
+          }
+          if (event.result?.entryFile) {
+            const projectDir = this.delegationRouter.getTeamProjectDir() ?? this.workspace;
+            const absEntry = path7.isAbsolute(event.result.entryFile) ? event.result.entryFile : path7.join(projectDir, event.result.entryFile);
+            if (!existsSync5(absEntry)) {
+              const allFiles = event.result.changedFiles ?? [];
+              const ext = path7.extname(event.result.entryFile).toLowerCase();
+              const candidate = allFiles.map((f) => path7.basename(f)).find((f) => path7.extname(f).toLowerCase() === ext);
+              if (candidate) {
+                console.log(`[Orchestrator] entryFile "${event.result.entryFile}" not found on disk, using "${candidate}" from changedFiles`);
+                event.result.entryFile = candidate;
+              } else {
+                console.log(`[Orchestrator] entryFile "${event.result.entryFile}" not found on disk, clearing`);
+                event.result.entryFile = void 0;
+              }
+            }
+          }
+          if (event.result?.entryFile && !event.result.previewCmd && !/\.html?$/i.test(event.result.entryFile)) {
+            const ext = path7.extname(event.result.entryFile).toLowerCase();
+            const runners = { ".py": "python3", ".js": "node", ".rb": "ruby", ".sh": "bash" };
+            const runner = runners[ext];
+            if (runner) {
+              event.result.previewCmd = `${runner} ${event.result.entryFile}`;
+              console.log(`[Orchestrator] Auto-constructed previewCmd: ${event.result.previewCmd}`);
+            }
           }
           if (!event.result?.previewUrl && event.result) {
             for (const worker of this.agentManager.getAll()) {
@@ -6620,6 +7288,70 @@ var Orchestrator = class extends EventEmitter {
               }
             }
           }
+          if (!event.result?.previewUrl && event.result?.previewCmd) {
+            const projectDir = this.delegationRouter.getTeamProjectDir() ?? this.workspace;
+            if (event.result.previewPort) {
+              const url = previewServer.runCommand(event.result.previewCmd, projectDir, event.result.previewPort);
+              if (url) {
+                event.result.previewUrl = url;
+                console.log(`[Orchestrator] Preview from leader PREVIEW_CMD (port ${event.result.previewPort}): ${url}`);
+              }
+            } else {
+              console.log(`[Orchestrator] Desktop app ready (user can Launch): ${event.result.previewCmd}`);
+            }
+          }
+          if (!event.result?.previewUrl && event.result?.entryFile) {
+            const entryFile = event.result.entryFile;
+            const projectDir = this.delegationRouter.getTeamProjectDir() ?? this.workspace;
+            if (/\.html?$/i.test(entryFile)) {
+              const absPath = path7.isAbsolute(entryFile) ? entryFile : path7.join(projectDir, entryFile);
+              const url = previewServer.serve(absPath);
+              if (url) {
+                event.result.previewUrl = url;
+                event.result.previewPath = absPath;
+                console.log(`[Orchestrator] Preview from leader ENTRY_FILE: ${url}`);
+              }
+            }
+          }
+          if (!event.result?.previewUrl && event.result && this.teamChangedFiles.size > 0) {
+            const projectDir = this.delegationRouter.getTeamProjectDir() ?? this.workspace;
+            const htmlFile = Array.from(this.teamChangedFiles).find((f) => /\.html?$/i.test(f));
+            if (htmlFile) {
+              const absPath = path7.isAbsolute(htmlFile) ? htmlFile : path7.join(projectDir, htmlFile);
+              const url = previewServer.serve(absPath);
+              if (url) {
+                event.result.previewUrl = url;
+                event.result.previewPath = absPath;
+                console.log(`[Orchestrator] Preview from teamChangedFiles: ${url}`);
+              }
+            }
+          }
+          if (!event.result?.previewUrl && event.result) {
+            const projectDir = this.delegationRouter.getTeamProjectDir();
+            if (projectDir) {
+              const candidates = [
+                "dist/index.html",
+                "build/index.html",
+                "out/index.html",
+                // common build dirs
+                "index.html",
+                "public/index.html"
+                // static projects
+              ];
+              for (const candidate of candidates) {
+                const absPath = path7.join(projectDir, candidate);
+                if (existsSync5(absPath)) {
+                  const url = previewServer.serve(absPath);
+                  if (url) {
+                    event.result.previewUrl = url;
+                    event.result.previewPath = absPath;
+                    console.log(`[Orchestrator] Preview from project scan: ${absPath}`);
+                    break;
+                  }
+                }
+              }
+            }
+          }
           const summary = event.result?.summary?.slice(0, 200) ?? "All tasks completed.";
           this.emitEvent({
             type: "team:chat",
@@ -6655,14 +7387,481 @@ function createOrchestrator(options) {
 
 // src/index.ts
 import { nanoid as nanoid5 } from "nanoid";
+import { execFile as execFile3 } from "child_process";
+import { existsSync as existsSync7, mkdirSync as mkdirSync5, readFileSync as readFileSync5, writeFileSync as writeFileSync5 } from "fs";
+import path9 from "path";
+import os2 from "os";
+
+// src/process-scanner.ts
 import { execFile } from "child_process";
-import { existsSync as existsSync4 } from "fs";
-import path5 from "path";
+var KNOWN_COMMANDS = ["claude", "codex", "gemini", "aider", "opencode"];
+var COMMAND_TO_BACKEND = {
+  claude: "claude",
+  codex: "codex",
+  gemini: "gemini",
+  aider: "aider",
+  opencode: "opencode"
+};
+function parseEtime(etime) {
+  const now = Date.now();
+  const parts = etime.trim().replace(/-/g, ":").split(":");
+  let seconds = 0;
+  if (parts.length === 4) {
+    seconds = parseInt(parts[0]) * 86400 + parseInt(parts[1]) * 3600 + parseInt(parts[2]) * 60 + parseInt(parts[3]);
+  } else if (parts.length === 3) {
+    seconds = parseInt(parts[0]) * 3600 + parseInt(parts[1]) * 60 + parseInt(parts[2]);
+  } else if (parts.length === 2) {
+    seconds = parseInt(parts[0]) * 60 + parseInt(parts[1]);
+  }
+  return now - seconds * 1e3;
+}
+function exec(cmd, args) {
+  return new Promise((resolve2) => {
+    execFile(cmd, args, { timeout: 5e3, maxBuffer: 1024 * 512 }, (err, stdout) => {
+      resolve2(err ? "" : stdout);
+    });
+  });
+}
+async function getCwds(pids) {
+  const result = /* @__PURE__ */ new Map();
+  if (pids.length === 0) return result;
+  const output = await exec("lsof", ["-a", "-p", pids.join(","), "-d", "cwd", "-Fn"]);
+  let currentPid = null;
+  for (const line of output.split("\n")) {
+    if (line.startsWith("p")) {
+      currentPid = parseInt(line.slice(1));
+    } else if (line.startsWith("n") && currentPid !== null) {
+      result.set(currentPid, line.slice(1));
+    }
+  }
+  return result;
+}
+var ProcessScanner = class _ProcessScanner {
+  timer = null;
+  previous = /* @__PURE__ */ new Map();
+  getManagedPids;
+  callbacks;
+  /** PIDs to ignore temporarily (recently killed — may still appear in ps) */
+  graceList = /* @__PURE__ */ new Map();
+  // pid → expiry timestamp
+  static GRACE_MS = 15e3;
+  // 15 seconds grace period
+  constructor(getManagedPids, callbacks) {
+    this.getManagedPids = getManagedPids;
+    this.callbacks = callbacks;
+  }
+  /** Mark a PID as recently killed — scanner will ignore it for a grace period */
+  addGracePid(pid) {
+    this.graceList.set(pid, Date.now() + _ProcessScanner.GRACE_MS);
+  }
+  start(intervalMs = 7e3) {
+    this.scan();
+    this.timer = setInterval(() => this.scan(), intervalMs);
+  }
+  stop() {
+    if (this.timer) {
+      clearInterval(this.timer);
+      this.timer = null;
+    }
+  }
+  async scan() {
+    try {
+      const psOutput = await exec("ps", ["-eo", "pid,ppid,pcpu,etime,args"]);
+      const managed = new Set(this.getManagedPids());
+      const now = Date.now();
+      for (const [pid, expiry] of this.graceList) {
+        if (now >= expiry) {
+          this.graceList.delete(pid);
+        } else {
+          managed.add(pid);
+        }
+      }
+      const lines = psOutput.split("\n").slice(1);
+      const candidates = [];
+      for (const line of lines) {
+        const trimmed = line.trim();
+        if (!trimmed) continue;
+        const match = trimmed.match(/^\s*(\d+)\s+(\d+)\s+([\d.]+)\s+([\w:-]+)\s+(.+)$/);
+        if (!match) continue;
+        const pid = parseInt(match[1]);
+        const ppid = parseInt(match[2]);
+        const cpu = parseFloat(match[3]);
+        const etime = match[4];
+        const args = match[5];
+        if (managed.has(pid)) continue;
+        const cmdName = this.matchCommand(args);
+        if (!cmdName) continue;
+        candidates.push({ pid, ppid, cpu, etime, command: cmdName });
+      }
+      const candidatePids = new Set(candidates.map((c) => c.pid));
+      const filtered = candidates.filter((c) => !candidatePids.has(c.ppid));
+      const cwds = await getCwds(filtered.map((c) => c.pid));
+      const current = /* @__PURE__ */ new Map();
+      for (const c of filtered) {
+        const backendId = COMMAND_TO_BACKEND[c.command] ?? c.command;
+        const agentId = `ext-${backendId}-${c.pid}`;
+        const status = c.cpu >= 5 ? "working" : "idle";
+        current.set(agentId, {
+          pid: c.pid,
+          ppid: c.ppid,
+          cpu: c.cpu,
+          command: c.command,
+          backendId,
+          cwd: cwds.get(c.pid) ?? null,
+          startedAt: parseEtime(c.etime),
+          agentId,
+          status
+        });
+      }
+      const added = [];
+      const removed = [];
+      const changed = [];
+      for (const [id, agent] of current) {
+        const prev = this.previous.get(id);
+        if (!prev) {
+          added.push(agent);
+        } else if (prev.status !== agent.status) {
+          changed.push(agent);
+        }
+      }
+      for (const id of this.previous.keys()) {
+        if (!current.has(id)) {
+          removed.push(id);
+        }
+      }
+      this.previous = current;
+      if (added.length > 0) this.callbacks.onAdded(added);
+      if (removed.length > 0) this.callbacks.onRemoved(removed);
+      if (changed.length > 0) this.callbacks.onChanged(changed);
+    } catch (err) {
+      console.error("[ProcessScanner] Scan error:", err);
+    }
+  }
+  matchCommand(args) {
+    for (const cmd of KNOWN_COMMANDS) {
+      const re = new RegExp(`(?:^|/)${cmd}(?:\\s|$)`);
+      if (re.test(args)) return cmd;
+    }
+    return null;
+  }
+};
+
+// src/external-output-reader.ts
+import { watch, readdirSync, statSync, existsSync as existsSync6, openSync, readSync, closeSync } from "fs";
+import { execFile as execFile2 } from "child_process";
+import path8 from "path";
 import os from "os";
+var SOURCE_EXTS = /* @__PURE__ */ new Set([
+  ".ts",
+  ".tsx",
+  ".js",
+  ".jsx",
+  ".py",
+  ".go",
+  ".rs",
+  ".java",
+  ".c",
+  ".cpp",
+  ".h",
+  ".css",
+  ".scss",
+  ".html",
+  ".json",
+  ".yaml",
+  ".yml",
+  ".toml",
+  ".md",
+  ".sql",
+  ".sh",
+  ".rb",
+  ".swift",
+  ".kt"
+]);
+var ExternalOutputReader = class {
+  readers = /* @__PURE__ */ new Map();
+  onStatus = null;
+  onTokenUpdate = null;
+  /** Set a callback to be notified when an external agent's status changes (driven by JSONL entries) */
+  setOnStatus(cb) {
+    this.onStatus = cb;
+  }
+  /** Set a callback to be notified when token usage is detected from JSONL entries */
+  setOnTokenUpdate(cb) {
+    this.onTokenUpdate = cb;
+  }
+  attach(agentId, pid, cwd, backendId, onOutput) {
+    if (this.readers.has(agentId)) return;
+    let cleanup2;
+    if (backendId === "claude" && cwd) {
+      cleanup2 = this.startClaudeReader(agentId, cwd, onOutput);
+    } else {
+      cleanup2 = this.startLsofReader(agentId, pid, onOutput);
+    }
+    this.readers.set(agentId, { agentId, pid, cwd, backendId, onOutput, cleanup: cleanup2, inputTokens: 0, outputTokens: 0 });
+  }
+  detach(agentId) {
+    const reader = this.readers.get(agentId);
+    if (reader) {
+      reader.cleanup();
+      this.readers.delete(agentId);
+    }
+  }
+  detachAll() {
+    for (const [id] of this.readers) {
+      this.detach(id);
+    }
+  }
+  // ── Claude JSONL reader ───────────────────────────────────────
+  startClaudeReader(agentId, cwd, onOutput) {
+    const projectKey = cwd.replace(/\//g, "-");
+    const projectDir = path8.join(os.homedir(), ".claude", "projects", projectKey);
+    console.log(`[OutputReader] Claude reader for ${agentId}: watching ${projectDir}`);
+    let lastPosition = 0;
+    let watchedFile = null;
+    let watcher = null;
+    let lastEmitTime = 0;
+    let pendingChunk = null;
+    let throttleTimer = null;
+    let pollTimer = null;
+    let retryTimer = null;
+    let stopped = false;
+    let retryCount = 0;
+    const THROTTLE_MS = 2e3;
+    const POLL_MS = 3e3;
+    const MAX_RETRIES = 5;
+    const emitThrottled = (text) => {
+      const now = Date.now();
+      if (now - lastEmitTime >= THROTTLE_MS) {
+        lastEmitTime = now;
+        onOutput(text);
+        pendingChunk = null;
+      } else {
+        pendingChunk = text;
+        if (!throttleTimer) {
+          throttleTimer = setTimeout(() => {
+            throttleTimer = null;
+            if (pendingChunk && !stopped) {
+              lastEmitTime = Date.now();
+              onOutput(pendingChunk);
+              pendingChunk = null;
+            }
+          }, THROTTLE_MS - (now - lastEmitTime));
+        }
+      }
+    };
+    const readNewLines = () => {
+      if (!watchedFile || stopped) return;
+      try {
+        const stat2 = statSync(watchedFile);
+        if (stat2.size <= lastPosition) return;
+        const bytesToRead = stat2.size - lastPosition;
+        const buf = Buffer.alloc(bytesToRead);
+        const fd = openSync(watchedFile, "r");
+        try {
+          readSync(fd, buf, 0, bytesToRead, lastPosition);
+        } finally {
+          closeSync(fd);
+        }
+        lastPosition = stat2.size;
+        const newData = buf.toString("utf-8");
+        for (const line of newData.split("\n")) {
+          if (!line.trim()) continue;
+          try {
+            const entry = JSON.parse(line);
+            this.extractClaudeOutput(entry, emitThrottled, agentId);
+          } catch {
+          }
+        }
+      } catch (err) {
+        console.error(`[OutputReader] Error reading JSONL for ${agentId}:`, err);
+      }
+    };
+    const findAndWatch = () => {
+      if (stopped) return;
+      if (!existsSync6(projectDir)) {
+        retryCount++;
+        if (retryCount > MAX_RETRIES) {
+          console.log(`[OutputReader] Project dir not found after ${MAX_RETRIES} retries, giving up: ${projectDir}`);
+          return;
+        }
+        console.log(`[OutputReader] Project dir not found (${retryCount}/${MAX_RETRIES}), retrying: ${projectDir}`);
+        retryTimer = setTimeout(findAndWatch, 5e3);
+        return;
+      }
+      try {
+        const files = readdirSync(projectDir).filter((f) => f.endsWith(".jsonl")).map((f) => ({
+          name: f,
+          mtime: statSync(path8.join(projectDir, f)).mtimeMs
+        })).sort((a, b) => b.mtime - a.mtime);
+        if (files.length === 0) {
+          retryCount++;
+          if (retryCount > MAX_RETRIES) {
+            console.log(`[OutputReader] No JSONL files after ${MAX_RETRIES} retries, giving up: ${projectDir}`);
+            return;
+          }
+          console.log(`[OutputReader] No JSONL files yet in ${projectDir} (${retryCount}/${MAX_RETRIES}), retrying`);
+          retryTimer = setTimeout(findAndWatch, 5e3);
+          return;
+        }
+        watchedFile = path8.join(projectDir, files[0].name);
+        lastPosition = statSync(watchedFile).size;
+        console.log(`[OutputReader] Watching JSONL: ${watchedFile} (pos=${lastPosition})`);
+        try {
+          watcher = watch(projectDir, (_event, filename) => {
+            if (stopped) return;
+            if (filename && filename.endsWith(".jsonl")) {
+              const fullPath = path8.join(projectDir, filename);
+              if (fullPath !== watchedFile && existsSync6(fullPath)) {
+                try {
+                  const newMtime = statSync(fullPath).mtimeMs;
+                  const curMtime = watchedFile ? statSync(watchedFile).mtimeMs : 0;
+                  if (newMtime > curMtime) {
+                    console.log(`[OutputReader] Switching to newer JSONL: ${fullPath}`);
+                    watchedFile = fullPath;
+                    lastPosition = 0;
+                  }
+                } catch {
+                }
+              }
+            }
+            readNewLines();
+          });
+        } catch {
+          console.log(`[OutputReader] fs.watch failed, relying on polling only`);
+        }
+        pollTimer = setInterval(readNewLines, POLL_MS);
+      } catch (err) {
+        console.error(`[OutputReader] Error setting up watcher for ${agentId}:`, err);
+      }
+    };
+    findAndWatch();
+    return () => {
+      stopped = true;
+      if (watcher) {
+        watcher.close();
+        watcher = null;
+      }
+      if (pollTimer) {
+        clearInterval(pollTimer);
+        pollTimer = null;
+      }
+      if (throttleTimer) {
+        clearTimeout(throttleTimer);
+        throttleTimer = null;
+      }
+      if (retryTimer) {
+        clearTimeout(retryTimer);
+        retryTimer = null;
+      }
+    };
+  }
+  /**
+   * Extract readable output from a Claude JSONL entry.
+   * Also drives status: "human" → working, "result" → idle.
+   *
+   * Claude JSONL types:
+   * - { type: "human" }         → user sent message, agent starts working
+   * - { type: "assistant", message: { content: [...] } } → agent responding
+   * - { type: "result", result: "..." } → turn complete, waiting for input
+   */
+  extractClaudeOutput(entry, emit, agentId) {
+    if (entry.type === "user" || entry.type === "human") {
+      this.onStatus?.(agentId, "working");
+    }
+    if (entry.type === "assistant") {
+      const message = entry.message;
+      const usage = message?.usage;
+      if (usage) {
+        const reader = this.readers.get(agentId);
+        if (reader) {
+          const inp = typeof usage.input_tokens === "number" ? usage.input_tokens : 0;
+          const out = typeof usage.output_tokens === "number" ? usage.output_tokens : 0;
+          if (inp > 0 || out > 0) {
+            reader.inputTokens += inp;
+            reader.outputTokens += out;
+            this.onTokenUpdate?.(agentId, reader.inputTokens, reader.outputTokens);
+          }
+        }
+      }
+      const stopReason = message?.stop_reason ?? entry.stop_reason;
+      const content = message?.content;
+      if (content && Array.isArray(content)) {
+        for (const block of content) {
+          if (block.type === "text" && typeof block.text === "string" && block.text.trim()) {
+            emit(block.text.slice(0, 200));
+          }
+        }
+      }
+      if (stopReason === "end_turn") {
+        this.onStatus?.(agentId, "idle");
+      } else {
+        this.onStatus?.(agentId, "working");
+      }
+    }
+    if (entry.type === "result") {
+      const result = entry.result;
+      if (typeof result === "string" && result.trim()) {
+        emit(result.slice(0, 200));
+      }
+      this.onStatus?.(agentId, "idle");
+    }
+  }
+  // ── lsof fallback reader ──────────────────────────────────────
+  startLsofReader(agentId, pid, onOutput) {
+    const knownFiles = /* @__PURE__ */ new Set();
+    let stopped = false;
+    console.log(`[OutputReader] lsof reader for ${agentId}: pid=${pid}`);
+    const poll = () => {
+      if (stopped) return;
+      execFile2("lsof", ["-p", String(pid)], { timeout: 5e3, maxBuffer: 512 * 1024 }, (err, stdout) => {
+        if (err || stopped) return;
+        const lines = stdout.split("\n");
+        const newFiles = [];
+        for (const line of lines) {
+          const cols = line.trim().split(/\s+/);
+          if (cols.length < 9) continue;
+          const name = cols.slice(8).join(" ");
+          if (!name || name.startsWith("/dev/") || name.startsWith("/System/")) continue;
+          const ext = path8.extname(name);
+          if (!SOURCE_EXTS.has(ext)) continue;
+          if (!knownFiles.has(name)) {
+            knownFiles.add(name);
+            newFiles.push(name);
+          }
+        }
+        if (newFiles.length > 0) {
+          const basename = path8.basename(newFiles[newFiles.length - 1]);
+          onOutput(`Editing ${basename}`);
+        }
+      });
+    };
+    const timer = setInterval(poll, 5e3);
+    poll();
+    return () => {
+      stopped = true;
+      clearInterval(timer);
+    };
+  }
+};
+
+// src/index.ts
 registerChannel(wsChannel);
 registerChannel(ablyChannel);
 registerChannel(telegramChannel);
 var orc;
+var scanner = null;
+var outputReader = null;
+var externalAgents = /* @__PURE__ */ new Map();
+var teamPhases = /* @__PURE__ */ new Map();
+function publishTeamPhase(teamId, phase, leadAgentId) {
+  teamPhases.set(teamId, { phase, leadAgentId });
+  publishEvent({
+    type: "TEAM_PHASE",
+    teamId,
+    phase,
+    leadAgentId
+  });
+}
 function generatePairCode() {
   return nanoid5(6).toUpperCase();
 }
@@ -6677,12 +7876,109 @@ function showPairCode() {
   console.log(`Open your phone \u2192 enter gateway address + code`);
   console.log("");
 }
+function extractProjectName(planText) {
+  function toKebab(s) {
+    return s.toLowerCase().replace(/[^a-z0-9\u4e00-\u9fff\s-]/g, "").replace(/\s+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
+  }
+  function trimKebab(s, maxLen) {
+    if (s.length <= maxLen) return s;
+    const cut = s.lastIndexOf("-", maxLen);
+    return cut > 2 ? s.slice(0, cut) : s.slice(0, maxLen);
+  }
+  const namedConcept = planText.match(/CONCEPT\s*[:：]\s*(?:A\s+|An\s+|The\s+)?(.+?)\s*[—–]\s/i);
+  if (namedConcept) {
+    const kebab = toKebab(namedConcept[1].trim());
+    if (kebab.length >= 2 && kebab.length <= 30) return kebab;
+  }
+  const quoted = planText.match(/["""\u201c]([^"""\u201d]{2,25})["""\u201d]/);
+  if (quoted) {
+    const kebab = toKebab(quoted[1].trim());
+    if (kebab.length >= 2) return trimKebab(kebab, 25);
+  }
+  const concept = planText.match(/CONCEPT\s*[:：]\s*(?:A\s+|An\s+|The\s+)?(.+?)(?:\s+(?:for|that|which|where|with|featuring|aimed|designed|，|。)\b|[—–.\n])/i);
+  if (concept) {
+    const kebab = toKebab(concept[1].trim());
+    if (kebab.length >= 2) return trimKebab(kebab, 25);
+  }
+  const fallbacks = [
+    /(?:goal|project|目标|项目)\s*[:：]\s*(.+)/i,
+    /\[PLAN\][\s\S]*?(?:goal|project|目标)\s*[:：]\s*(.+)/i,
+    /(?:build|create|make|开发|做|构建)\s+(?:a\s+)?(.+?)(?:\s+(?:with|using|that|for|where|，|。)\b|[.\n])/i
+  ];
+  for (const re of fallbacks) {
+    const m = planText.match(re);
+    if (m) {
+      const kebab = toKebab(m[1].trim());
+      if (kebab.length >= 2) return trimKebab(kebab, 25);
+    }
+  }
+  return "project";
+}
+function createUniqueProjectDir(workspace, baseName) {
+  let dirName = baseName;
+  let counter = 1;
+  while (existsSync7(path9.join(workspace, dirName))) {
+    counter++;
+    dirName = `${baseName}-${counter}`;
+  }
+  const fullPath = path9.join(workspace, dirName);
+  mkdirSync5(fullPath, { recursive: true });
+  console.log(`[Gateway] Created project directory: ${fullPath}`);
+  return fullPath;
+}
+var AGENTS_FILE = path9.join(os2.homedir(), ".bit-office", "agents.json");
+function loadAgentDefs() {
+  try {
+    if (existsSync7(AGENTS_FILE)) {
+      const raw = JSON.parse(readFileSync5(AGENTS_FILE, "utf-8"));
+      if (Array.isArray(raw.agents)) return raw.agents;
+    }
+  } catch (e) {
+    console.log(`[Gateway] Failed to read agents.json: ${e}`);
+  }
+  saveAgentDefs(DEFAULT_AGENT_DEFS);
+  return [...DEFAULT_AGENT_DEFS];
+}
+function saveAgentDefs(agents) {
+  try {
+    const dir = path9.dirname(AGENTS_FILE);
+    if (!existsSync7(dir)) mkdirSync5(dir, { recursive: true });
+    writeFileSync5(AGENTS_FILE, JSON.stringify({ agents }, null, 2), "utf-8");
+    console.log(`[Gateway] Saved ${agents.length} agent definitions to ${AGENTS_FILE}`);
+  } catch (e) {
+    console.log(`[Gateway] Failed to save agents.json: ${e}`);
+  }
+}
+var agentDefs = [];
 function mapOrchestratorEvent(e) {
   switch (e.type) {
     case "task:started":
       return { type: "TASK_STARTED", agentId: e.agentId, taskId: e.taskId, prompt: e.prompt };
-    case "task:done":
+    case "task:done": {
+      const resultText = (e.result?.summary ?? "") + (e.result?.fullOutput ?? "");
+      if (resultText && /\[PLAN\]/i.test(resultText)) {
+        for (const [teamId, tp] of teamPhases) {
+          if (tp.leadAgentId === e.agentId && tp.phase === "create") {
+            const planOutput = e.result?.fullOutput ?? e.result?.summary ?? "";
+            if (planOutput) {
+              orc.setOriginalTask(e.agentId, planOutput);
+              console.log(`[Gateway] Captured plan from create phase (${planOutput.length} chars) for design context`);
+            }
+            publishTeamPhase(teamId, "design", e.agentId);
+            break;
+          }
+        }
+      }
+      if (e.isFinalResult) {
+        for (const [teamId, tp] of teamPhases) {
+          if (tp.leadAgentId === e.agentId && tp.phase === "execute") {
+            publishTeamPhase(teamId, "complete", e.agentId);
+            break;
+          }
+        }
+      }
       return { type: "TASK_DONE", agentId: e.agentId, taskId: e.taskId, result: e.result, isFinalResult: e.isFinalResult };
+    }
     case "task:failed":
       return { type: "TASK_FAILED", agentId: e.agentId, taskId: e.taskId, error: e.error };
     case "task:delegated":
@@ -6698,7 +7994,7 @@ function mapOrchestratorEvent(e) {
     case "task:queued":
       return { type: "TASK_QUEUED", agentId: e.agentId, taskId: e.taskId, prompt: e.prompt, position: e.position };
     case "agent:created":
-      return { type: "AGENT_CREATED", agentId: e.agentId, name: e.name, role: e.role, palette: e.palette, personality: e.personality, backend: e.backend, isTeamLead: e.isTeamLead, teamId: e.teamId };
+      return { type: "AGENT_CREATED", agentId: e.agentId, name: e.name, role: e.role, palette: e.palette, personality: e.personality, backend: e.backend, isTeamLead: e.isTeamLead || void 0, teamId: e.teamId };
     case "agent:fired":
       return { type: "AGENT_FIRED", agentId: e.agentId };
     case "task:result-returned":
@@ -6735,6 +8031,8 @@ function handleCommand(parsed) {
     }
     case "FIRE_AGENT": {
       console.log(`[Gateway] Firing agent: ${parsed.agentId}`);
+      const agentToFire = orc.getAgent(parsed.agentId);
+      if (agentToFire?.pid) scanner?.addGracePid(agentToFire.pid);
       orc.removeAgent(parsed.agentId);
       break;
     }
@@ -6755,7 +8053,23 @@ function handleCommand(parsed) {
       }
       if (agent) {
         console.log(`[Gateway] RUN_TASK: agent=${parsed.agentId}, isLead=${orc.isTeamLead(parsed.agentId)}, hasTeam=${orc.getAllAgents().length > 1}`);
-        orc.runTask(parsed.agentId, parsed.taskId, parsed.prompt, { repoPath: parsed.repoPath });
+        let phaseOverride;
+        if (orc.isTeamLead(parsed.agentId)) {
+          for (const [, tp] of teamPhases) {
+            if (tp.leadAgentId === parsed.agentId) {
+              phaseOverride = tp.phase;
+              if (tp.phase === "complete") {
+                const teamId = Array.from(teamPhases.entries()).find(([, v]) => v.leadAgentId === parsed.agentId)?.[0];
+                if (teamId) {
+                  publishTeamPhase(teamId, "execute", parsed.agentId);
+                  phaseOverride = "execute";
+                }
+              }
+              break;
+            }
+          }
+        }
+        orc.runTask(parsed.agentId, parsed.taskId, parsed.prompt, { repoPath: parsed.repoPath, phaseOverride });
       } else {
         publishEvent({
           type: "TASK_FAILED",
@@ -6775,63 +8089,78 @@ function handleCommand(parsed) {
       break;
     }
     case "SERVE_PREVIEW": {
-      const filePath = parsed.filePath;
-      console.log(`[Gateway] SERVE_PREVIEW: ${filePath}`);
-      previewServer.serve(filePath);
+      if (parsed.previewCmd && parsed.previewPort) {
+        const cwd = parsed.cwd ?? config.defaultWorkspace;
+        console.log(`[Gateway] SERVE_PREVIEW (cmd): "${parsed.previewCmd}" port=${parsed.previewPort} cwd=${cwd}`);
+        previewServer.runCommand(parsed.previewCmd, cwd, parsed.previewPort);
+      } else if (parsed.previewCmd) {
+        const cwd = parsed.cwd ?? config.defaultWorkspace;
+        console.log(`[Gateway] SERVE_PREVIEW (launch): "${parsed.previewCmd}" cwd=${cwd}`);
+        previewServer.launchProcess(parsed.previewCmd, cwd);
+      } else if (parsed.filePath) {
+        console.log(`[Gateway] SERVE_PREVIEW (static): ${parsed.filePath}`);
+        previewServer.serve(parsed.filePath);
+      }
       break;
     }
     case "OPEN_FILE": {
       const raw = parsed.path;
-      const resolved = path5.resolve(config.defaultWorkspace, raw);
-      const normalized = path5.normalize(resolved);
-      if (!normalized.startsWith(config.defaultWorkspace + path5.sep) && normalized !== config.defaultWorkspace) {
+      const resolved = path9.resolve(config.defaultWorkspace, raw);
+      const normalized = path9.normalize(resolved);
+      if (!normalized.startsWith(config.defaultWorkspace + path9.sep) && normalized !== config.defaultWorkspace) {
         console.error(`[Gateway] Blocked OPEN_FILE: path "${raw}" resolves outside workspace`);
         break;
       }
-      if (!existsSync4(normalized)) {
+      if (!existsSync7(normalized)) {
         console.error(`[Gateway] OPEN_FILE: path does not exist: ${normalized}`);
         break;
       }
       console.log(`[Gateway] Opening file: ${normalized}`);
-      execFile("open", [normalized], (err) => {
+      execFile3("open", [normalized], (err) => {
         if (err) console.error(`[Gateway] Failed to open file: ${err.message}`);
       });
       break;
     }
     case "CREATE_TEAM": {
-      const { leadPresetIndex, memberPresetIndices, backends: backends2 } = parsed;
-      const allIndices = [leadPresetIndex, ...memberPresetIndices.filter((i) => i !== leadPresetIndex)];
-      console.log(`[Gateway] Creating team: lead=${leadPresetIndex}, members=${memberPresetIndices.join(",")}`);
+      const { leadId, memberIds, backends: backends2 } = parsed;
+      const allIds = [leadId, ...memberIds.filter((id) => id !== leadId)];
+      console.log(`[Gateway] Creating team: lead=${leadId}, members=${memberIds.join(",")}`);
       let leadAgentId = null;
       const teamId = `team-${nanoid5(6)}`;
-      for (const idx of allIndices) {
-        const preset = AGENT_PRESETS[idx];
-        if (!preset) continue;
+      for (const defId of allIds) {
+        const def = agentDefs.find((a) => a.id === defId);
+        if (!def) {
+          console.log(`[Gateway] Agent def not found: ${defId}`);
+          continue;
+        }
         const agentId = `agent-${nanoid5(6)}`;
-        const backendId = backends2?.[String(idx)] ?? config.defaultBackend;
-        if (idx === leadPresetIndex) {
+        const backendId = backends2?.[defId] ?? config.defaultBackend;
+        if (defId === leadId) {
           leadAgentId = agentId;
           orc.setTeamLead(agentId);
         }
         orc.createAgent({
           agentId,
-          name: preset.name,
-          role: preset.role,
-          personality: preset.personality,
+          name: def.name,
+          role: def.skills ? `${def.role} \u2014 ${def.skills}` : def.role,
+          personality: def.personality,
           backend: backendId,
-          palette: preset.palette,
+          palette: def.palette,
           teamId
         });
       }
       if (leadAgentId) {
-        const leadPreset = AGENT_PRESETS[leadPresetIndex];
+        const leadDef = agentDefs.find((a) => a.id === leadId);
         publishEvent({
           type: "TEAM_CHAT",
           fromAgentId: leadAgentId,
-          message: `Team created! ${leadPreset?.name ?? "Lead"} is the Team Lead with ${memberPresetIndices.length} team members.`,
+          message: `Team created! ${leadDef?.name ?? "Lead"} is the Team Lead with ${memberIds.length} team members.`,
           messageType: "status",
           timestamp: Date.now()
         });
+        publishTeamPhase(teamId, "create", leadAgentId);
+        const greetTaskId = nanoid5();
+        orc.runTask(leadAgentId, greetTaskId, "Greet the user and ask what they would like to build.", { phaseOverride: "create" });
       }
       break;
     }
@@ -6842,7 +8171,83 @@ function handleCommand(parsed) {
     }
     case "FIRE_TEAM": {
       console.log("[Gateway] Firing entire team");
+      for (const agent of orc.getAllAgents()) {
+        const pid = agent.pid;
+        if (pid) scanner?.addGracePid(pid);
+      }
       orc.fireTeam();
+      teamPhases.clear();
+      break;
+    }
+    case "KILL_EXTERNAL": {
+      const ext = externalAgents.get(parsed.agentId);
+      if (ext) {
+        console.log(`[Gateway] Killing external process: ${ext.name} (pid=${ext.pid})`);
+        scanner?.addGracePid(ext.pid);
+        try {
+          process.kill(ext.pid, "SIGKILL");
+        } catch (err) {
+          console.error(`[Gateway] Failed to kill pid ${ext.pid}:`, err);
+        }
+        outputReader?.detach(ext.agentId);
+        externalAgents.delete(ext.agentId);
+        publishEvent({ type: "AGENT_FIRED", agentId: ext.agentId });
+      } else {
+        console.log(`[Gateway] KILL_EXTERNAL: agent ${parsed.agentId} not found`);
+      }
+      break;
+    }
+    case "APPROVE_PLAN": {
+      const agentId = parsed.agentId;
+      console.log(`[Gateway] APPROVE_PLAN: agent=${agentId}`);
+      const approvedPlan = orc.getLeaderLastOutput(agentId);
+      if (approvedPlan) {
+        orc.setOriginalTask(agentId, approvedPlan);
+        console.log(`[Gateway] Captured approved plan (${approvedPlan.length} chars) for leader ${agentId}`);
+      }
+      const projectName = extractProjectName(approvedPlan ?? "project");
+      const projectDir = createUniqueProjectDir(config.defaultWorkspace, projectName);
+      orc.setTeamProjectDir(projectDir);
+      let approveTeamId;
+      for (const [teamId, tp] of teamPhases) {
+        if (tp.leadAgentId === agentId) {
+          approveTeamId = teamId;
+          break;
+        }
+      }
+      if (!approveTeamId) {
+        const agentInfo = orc.getAllAgents().find((a) => a.agentId === agentId);
+        if (agentInfo?.teamId) approveTeamId = agentInfo.teamId;
+      }
+      if (approveTeamId) {
+        publishTeamPhase(approveTeamId, "execute", agentId);
+        const taskId = nanoid5();
+        orc.runTask(agentId, taskId, `The user approved your plan. Execute it now by delegating tasks to your team members. All work must go in the project directory: ${path9.basename(projectDir)}/`, { phaseOverride: "execute" });
+      }
+      break;
+    }
+    case "END_PROJECT": {
+      const agentId = parsed.agentId;
+      console.log(`[Gateway] END_PROJECT: agent=${agentId}`);
+      orc.clearLeaderHistory(agentId);
+      let foundTeamId;
+      for (const [teamId, tp] of teamPhases) {
+        if (tp.leadAgentId === agentId) {
+          foundTeamId = teamId;
+          break;
+        }
+      }
+      if (!foundTeamId) {
+        const agentInfo = orc.getAllAgents().find((a) => a.agentId === agentId);
+        if (agentInfo?.teamId) foundTeamId = agentInfo.teamId;
+      }
+      if (foundTeamId) {
+        publishTeamPhase(foundTeamId, "create", agentId);
+        const greetTaskId = nanoid5();
+        orc.runTask(agentId, greetTaskId, "Greet the user and ask what they would like to build next.", { phaseOverride: "create" });
+      } else {
+        console.log(`[Gateway] END_PROJECT: no team found for agent ${agentId}, ignoring`);
+      }
       break;
     }
     case "PING": {
@@ -6856,7 +8261,7 @@ function handleCommand(parsed) {
           palette: agent.palette,
           personality: void 0,
           backend: agent.backend,
-          isTeamLead: agent.isTeamLead,
+          isTeamLead: agent.isTeamLead || void 0,
           teamId: agent.teamId
         });
         publishEvent({
@@ -6864,7 +8269,67 @@ function handleCommand(parsed) {
           agentId: agent.agentId,
           status: agent.status
         });
+        if (agent.isTeamLead && agent.teamId && !teamPhases.has(agent.teamId)) {
+          teamPhases.set(agent.teamId, { phase: "create", leadAgentId: agent.agentId });
+          console.log(`[Gateway] Restored team phase for ${agent.teamId} (leader=${agent.agentId})`);
+        }
+      }
+      for (const [teamId, tp] of teamPhases) {
+        publishEvent({
+          type: "TEAM_PHASE",
+          teamId,
+          phase: tp.phase,
+          leadAgentId: tp.leadAgentId
+        });
+      }
+      for (const [, ext] of externalAgents) {
+        publishEvent({
+          type: "AGENT_CREATED",
+          agentId: ext.agentId,
+          name: ext.name,
+          role: ext.cwd ? ext.cwd.split("/").pop() ?? ext.backendId : ext.backendId,
+          isExternal: true,
+          pid: ext.pid,
+          cwd: ext.cwd ?? void 0,
+          startedAt: ext.startedAt,
+          backend: ext.backendId
+        });
+        publishEvent({
+          type: "AGENT_STATUS",
+          agentId: ext.agentId,
+          status: ext.status
+        });
+      }
+      publishEvent({ type: "AGENT_DEFS", agents: agentDefs });
+      break;
+    }
+    case "SAVE_AGENT_DEF": {
+      const def = parsed.agent;
+      const idx = agentDefs.findIndex((a) => a.id === def.id);
+      if (idx >= 0) {
+        if (agentDefs[idx].isBuiltin) {
+          def.isBuiltin = true;
+          def.teamRole = agentDefs[idx].teamRole;
+        }
+        agentDefs[idx] = def;
+      } else {
+        def.isBuiltin = false;
+        def.teamRole = "dev";
+        agentDefs.push(def);
       }
+      saveAgentDefs(agentDefs);
+      publishEvent({ type: "AGENT_DEFS", agents: agentDefs });
+      break;
+    }
+    case "DELETE_AGENT_DEF": {
+      const target = agentDefs.find((a) => a.id === parsed.agentDefId);
+      if (target?.isBuiltin) {
+        console.log(`[Gateway] Cannot delete built-in agent: ${parsed.agentDefId}`);
+        break;
+      }
+      agentDefs = agentDefs.filter((a) => a.id !== parsed.agentDefId);
+      saveAgentDefs(agentDefs);
+      publishEvent({ type: "AGENT_DEFS", agents: agentDefs });
       break;
     }
   }
@@ -6892,9 +8357,11 @@ async function main() {
     worktree: false,
     // disabled by default for now
     retry: { maxRetries: 2, escalateToLeader: true },
-    promptsDir: path5.join(os.homedir(), ".bit-office", "prompts"),
+    promptsDir: path9.join(os2.homedir(), ".bit-office", "prompts"),
     sandboxMode: config.sandboxMode
   });
+  agentDefs = loadAgentDefs();
+  console.log(`[Gateway] Loaded ${agentDefs.length} agent definitions (${agentDefs.filter((a) => !a.isBuiltin).length} custom)`);
   const forwardEvent = (event) => {
     const mapped = mapOrchestratorEvent(event);
     if (mapped) publishEvent(mapped);
@@ -6914,6 +8381,99 @@ async function main() {
   orc.on("agent:created", forwardEvent);
   orc.on("agent:fired", forwardEvent);
   orc.on("task:result-returned", forwardEvent);
+  outputReader = new ExternalOutputReader();
+  outputReader.setOnStatus((agentId, status) => {
+    const ext = externalAgents.get(agentId);
+    if (ext && ext.status !== status) {
+      ext.status = status;
+      publishEvent({
+        type: "AGENT_STATUS",
+        agentId,
+        status
+      });
+    }
+  });
+  outputReader.setOnTokenUpdate((agentId, inputTokens, outputTokens) => {
+    publishEvent({
+      type: "TOKEN_UPDATE",
+      agentId,
+      inputTokens,
+      outputTokens
+    });
+  });
+  scanner = new ProcessScanner(
+    () => orc.getManagedPids(),
+    {
+      onAdded: (agents) => {
+        for (const agent of agents) {
+          const name = agent.command.charAt(0).toUpperCase() + agent.command.slice(1);
+          const displayName = `${name} (${agent.pid})`;
+          externalAgents.set(agent.agentId, {
+            agentId: agent.agentId,
+            name: displayName,
+            backendId: agent.backendId,
+            pid: agent.pid,
+            cwd: agent.cwd,
+            startedAt: agent.startedAt,
+            status: agent.status
+          });
+          console.log(`[ProcessScanner] External agent found: ${displayName} (pid=${agent.pid}, cwd=${agent.cwd})`);
+          publishEvent({
+            type: "AGENT_CREATED",
+            agentId: agent.agentId,
+            name: displayName,
+            role: agent.cwd ? agent.cwd.split("/").pop() ?? agent.backendId : agent.backendId,
+            isExternal: true,
+            pid: agent.pid,
+            cwd: agent.cwd ?? void 0,
+            startedAt: agent.startedAt,
+            backend: agent.backendId
+          });
+          publishEvent({
+            type: "AGENT_STATUS",
+            agentId: agent.agentId,
+            status: agent.status
+          });
+          outputReader?.attach(agent.agentId, agent.pid, agent.cwd, agent.backendId, (chunk) => {
+            publishEvent({
+              type: "LOG_APPEND",
+              agentId: agent.agentId,
+              taskId: "external",
+              stream: "stdout",
+              chunk
+            });
+          });
+        }
+      },
+      onRemoved: (agentIds) => {
+        for (const agentId of agentIds) {
+          const ext = externalAgents.get(agentId);
+          console.log(`[ProcessScanner] External agent gone: ${ext?.name ?? agentId}`);
+          outputReader?.detach(agentId);
+          externalAgents.delete(agentId);
+          publishEvent({
+            type: "AGENT_FIRED",
+            agentId
+          });
+        }
+      },
+      onChanged: (agents) => {
+        for (const agent of agents) {
+          const ext = externalAgents.get(agent.agentId);
+          if (ext?.backendId === "claude") continue;
+          if (ext) {
+            ext.status = agent.status;
+          }
+          publishEvent({
+            type: "AGENT_STATUS",
+            agentId: agent.agentId,
+            status: agent.status
+          });
+        }
+      }
+    }
+  );
+  scanner.start();
   const backendNames = config.detectedBackends.map((id) => getBackend(id)?.name ?? id).join(", ");
   console.log(`[Gateway] AI backends: ${backendNames || "none detected"} (default: ${getBackend(config.defaultBackend)?.name ?? config.defaultBackend})`);
   console.log(`[Gateway] Permissions: ${config.sandboxMode === "full" ? "Full access" : "Sandbox"}`);
@@ -6922,10 +8482,10 @@ async function main() {
   await initTransports(handleCommand);
   console.log("[Gateway] Listening for commands...");
   console.log("[Gateway] Press 'p' + Enter to generate a new pair code");
-  if (process.env.NODE_ENV !== "development" && existsSync4(config.webDir)) {
+  if (process.env.NODE_ENV !== "development" && existsSync7(config.webDir)) {
     const url = `http://localhost:${config.wsPort}`;
     console.log(`[Gateway] Opening ${url}`);
-    execFile("open", [url]);
+    execFile3("open", [url]);
   }
   if (process.stdin.isTTY) {
     process.stdin.setEncoding("utf-8");
@@ -6939,6 +8499,8 @@ async function main() {
 }
 function cleanup() {
   console.log("[Gateway] Shutting down...");
+  outputReader?.detachAll();
+  scanner?.stop();
   previewServer.stop();
   orc?.destroy();
   destroyTransports();