copilotoffice 1.1.1 → 2.0.0

package/dist/game.bundle.js

@@ -121442,23 +121442,23 @@ var CopilotOffice = (() => {
                      * @return {Phaser.Textures.Frame} A clone of this Frame.
                      */
                     clone: function() {
-                      var clone = new Frame(this.texture, this.name, this.sourceIndex);
-                      clone.cutX = this.cutX;
-                      clone.cutY = this.cutY;
-                      clone.cutWidth = this.cutWidth;
-                      clone.cutHeight = this.cutHeight;
-                      clone.x = this.x;
-                      clone.y = this.y;
-                      clone.width = this.width;
-                      clone.height = this.height;
-                      clone.halfWidth = this.halfWidth;
-                      clone.halfHeight = this.halfHeight;
-                      clone.centerX = this.centerX;
-                      clone.centerY = this.centerY;
-                      clone.rotated = this.rotated;
-                      clone.data = Extend(true, clone.data, this.data);
-                      clone.updateUVs();
-                      return clone;
+                      var clone2 = new Frame(this.texture, this.name, this.sourceIndex);
+                      clone2.cutX = this.cutX;
+                      clone2.cutY = this.cutY;
+                      clone2.cutWidth = this.cutWidth;
+                      clone2.cutHeight = this.cutHeight;
+                      clone2.x = this.x;
+                      clone2.y = this.y;
+                      clone2.width = this.width;
+                      clone2.height = this.height;
+                      clone2.halfWidth = this.halfWidth;
+                      clone2.halfHeight = this.halfHeight;
+                      clone2.centerX = this.centerX;
+                      clone2.centerY = this.centerY;
+                      clone2.rotated = this.rotated;
+                      clone2.data = Extend(true, clone2.data, this.data);
+                      clone2.updateUVs();
+                      return clone2;
                     },
                     /**
                      * Destroys this Frame by nulling its reference to the parent Texture and and data objects.
@@ -138673,15 +138673,15 @@ var CopilotOffice = (() => {
                 /***/
                 ((module2) => {
                   var Clone = function(obj) {
-                    var clone = {};
+                    var clone2 = {};
                     for (var key in obj) {
                       if (Array.isArray(obj[key])) {
-                        clone[key] = obj[key].slice(0);
+                        clone2[key] = obj[key].slice(0);
                       } else {
-                        clone[key] = obj[key];
+                        clone2[key] = obj[key];
                       }
                     }
-                    return clone;
+                    return clone2;
                   };
                   module2.exports = Clone;
                 })
@@ -138713,7 +138713,7 @@ var CopilotOffice = (() => {
                 ((module2, __unused_webpack_exports, __webpack_require__2) => {
                   var IsPlainObject = __webpack_require__2(41212);
                   var Extend = function() {
-                    var options, name, src, copy, copyIsArray, clone, target = arguments[0] || {}, i = 1, length = arguments.length, deep = false;
+                    var options, name, src, copy, copyIsArray, clone2, target = arguments[0] || {}, i = 1, length = arguments.length, deep = false;
                     if (typeof target === "boolean") {
                       deep = target;
                       target = arguments[1] || {};
@@ -138734,11 +138734,11 @@ var CopilotOffice = (() => {
                           if (deep && copy && (IsPlainObject(copy) || (copyIsArray = Array.isArray(copy)))) {
                             if (copyIsArray) {
                               copyIsArray = false;
-                              clone = src && Array.isArray(src) ? src : [];
+                              clone2 = src && Array.isArray(src) ? src : [];
                             } else {
-                              clone = src && IsPlainObject(src) ? src : {};
+                              clone2 = src && IsPlainObject(src) ? src : {};
                             }
-                            target[name] = Extend(deep, clone, copy);
+                            target[name] = Extend(deep, clone2, copy);
                           } else if (copy !== void 0) {
                             target[name] = copy;
                           }
@@ -138922,13 +138922,13 @@ var CopilotOffice = (() => {
                 ((module2, __unused_webpack_exports, __webpack_require__2) => {
                   var Clone = __webpack_require__2(41786);
                   var Merge = function(obj1, obj2) {
-                    var clone = Clone(obj1);
+                    var clone2 = Clone(obj1);
                     for (var key in obj2) {
-                      if (!clone.hasOwnProperty(key)) {
-                        clone[key] = obj2[key];
+                      if (!clone2.hasOwnProperty(key)) {
+                        clone2[key] = obj2[key];
                       }
                     }
-                    return clone;
+                    return clone2;
                   };
                   module2.exports = Merge;
                 })
@@ -138939,13 +138939,13 @@ var CopilotOffice = (() => {
                 ((module2, __unused_webpack_exports, __webpack_require__2) => {
                   var Clone = __webpack_require__2(41786);
                   var MergeRight = function(obj1, obj2) {
-                    var clone = Clone(obj1);
+                    var clone2 = Clone(obj1);
                     for (var key in obj2) {
-                      if (clone.hasOwnProperty(key)) {
-                        clone[key] = obj2[key];
+                      if (clone2.hasOwnProperty(key)) {
+                        clone2[key] = obj2[key];
                       }
                     }
-                    return clone;
+                    return clone2;
                   };
                   module2.exports = MergeRight;
                 })
@@ -139192,6 +139192,22 @@ var CopilotOffice = (() => {
     }
     return vy < 0 ? 3 /* UP */ : 0 /* DOWN */;
   }
+  function nextWalkAction(spriteKey, vx, vy, current) {
+    const newDir = directionFromVelocity(vx, vy);
+    if (newDir === null) {
+      return {
+        kind: "idle",
+        direction: current.direction,
+        standFrame: getStandFrame(current.direction)
+      };
+    }
+    return {
+      kind: "play",
+      direction: newDir,
+      animKey: walkAnimKey(spriteKey, newDir),
+      directionChanged: newDir !== current.direction
+    };
+  }
   function registerWalkAnimations(anims, spriteKey) {
     const directions = [0 /* DOWN */, 1 /* LEFT */, 2 /* RIGHT */, 3 /* UP */];
     for (const dir of directions) {
@@ -140056,10 +140072,19 @@ var CopilotOffice = (() => {
     }
     return valid;
   }
-  var FLEET_NAMES, FLEET_COLORS, FLEET_SEAT_POSITIONS, ARTHUR_FLEET_SEAT_INDEX, FLEET_AGENTS, RESERVE_AGENTS, SHOW_ARCHITECT_IN_DEFAULT_OFFICE, CORE_AGENT_IDS, RESERVE_AGENT_DESK, AGENTS, DEFAULT_AGENTS, DEFAULT_RESERVE_MAP, RANDOM_POOL_CONFIGS, RANDOM_SPRITE_COUNT, CORE_POSITIONS, RESERVE_DESK_IDS, RESERVE_POSITIONS, ROLE_TITLES;
+  var ARCHITECT_AGENT_ID, GENERALIST_AGENT_ID, DEBUGGER_AGENT_ID, ADMIN_AGENT_ID, DEFAULT_PLAN_AGENT_IDS, FLEET_NAMES, FLEET_COLORS, FLEET_SEAT_POSITIONS, ARTHUR_FLEET_SEAT_INDEX, FLEET_AGENTS, RESERVE_AGENTS, SHOW_ARCHITECT_IN_DEFAULT_OFFICE, CORE_AGENT_IDS, RESERVE_AGENT_DESK, AGENTS, DEFAULT_AGENTS, DEFAULT_RESERVE_MAP, RANDOM_POOL_CONFIGS, RANDOM_SPRITE_COUNT, CORE_POSITIONS, RESERVE_DESK_IDS, RESERVE_POSITIONS, ROLE_TITLES;
   var init_agents = __esm({
     "src/config/agents.ts"() {
       "use strict";
+      ARCHITECT_AGENT_ID = "architect";
+      GENERALIST_AGENT_ID = "generalist";
+      DEBUGGER_AGENT_ID = "debugger";
+      ADMIN_AGENT_ID = "admin";
+      DEFAULT_PLAN_AGENT_IDS = [
+        GENERALIST_AGENT_ID,
+        DEBUGGER_AGENT_ID,
+        ADMIN_AGENT_ID
+      ];
       FLEET_NAMES = [
         "Liam",
         "Emma",
@@ -140216,7 +140241,7 @@ var CopilotOffice = (() => {
       FLEET_AGENTS = FLEET_SEAT_POSITIONS.map((pos, i) => {
         if (i === ARTHUR_FLEET_SEAT_INDEX) {
           return {
-            id: "architect",
+            id: ARCHITECT_AGENT_ID,
             name: "Arthur",
             skill: "general",
             sprite: "npc_architect",
@@ -140303,10 +140328,10 @@ var CopilotOffice = (() => {
       };
       SHOW_ARCHITECT_IN_DEFAULT_OFFICE = false;
       CORE_AGENT_IDS = /* @__PURE__ */ new Set([
-        "generalist",
-        ...SHOW_ARCHITECT_IN_DEFAULT_OFFICE ? ["architect"] : [],
-        "debugger",
-        "admin"
+        GENERALIST_AGENT_ID,
+        ...SHOW_ARCHITECT_IN_DEFAULT_OFFICE ? [ARCHITECT_AGENT_ID] : [],
+        DEBUGGER_AGENT_ID,
+        ADMIN_AGENT_ID
       ]);
       RESERVE_AGENT_DESK = Object.fromEntries(
         Object.entries(RESERVE_AGENTS).map(([deskId, config]) => [config.id, deskId])
@@ -140325,7 +140350,7 @@ var CopilotOffice = (() => {
           description: "the Generalist"
         },
         ...SHOW_ARCHITECT_IN_DEFAULT_OFFICE ? [{
-          id: "architect",
+          id: ARCHITECT_AGENT_ID,
           name: "Arthur",
           skill: "general",
           sprite: "npc_architect",
@@ -141697,13 +141722,15 @@ var CopilotOffice = (() => {
           if (vx !== 0 && vy !== 0) {
             body.velocity.normalize().scale(currentSpeed);
           }
-          const newDir = directionFromVelocity(vx, vy);
-          if (newDir !== null) {
-            const dirChanged = newDir !== this.currentDirection;
-            this.currentDirection = newDir;
-            if (!this.isWalking || dirChanged) {
+          const action = nextWalkAction("player", vx, vy, {
+            direction: this.currentDirection,
+            isWalking: this.isWalking
+          });
+          if (action.kind === "play") {
+            this.currentDirection = action.direction;
+            if (!this.isWalking || action.directionChanged) {
               this.isWalking = true;
-              this.anims.play(walkAnimKey("player", this.currentDirection), true);
+              this.anims.play(action.animKey, true);
             }
           } else {
             this.stopWalking();
@@ -148170,12 +148197,191 @@ WARNING: This link could potentially be dangerous`)) {
     }
   });
 
+  // src/config/zIndex.ts
+  var ZIndex;
+  var init_zIndex = __esm({
+    "src/config/zIndex.ts"() {
+      "use strict";
+      ZIndex = {
+        /** Status bar at the bottom of the app shell. */
+        STATUS_BAR: 100,
+        /** In-scene HTML overlay rendered by OfficeScene above the Phaser canvas
+         *  but below all modal surfaces (e.g. fleet-progress sticker). */
+        OFFICE_SCENE_OVERLAY: 150,
+        /** Transient toast notifications (auto-dismissed). */
+        TOAST: 9e3,
+        /** Terminal overlay panel host (xterm.js + tab strip). */
+        TERMINAL_OVERLAY: 1e4,
+        /** Sprite/session card that floats above the terminal overlay. */
+        TERMINAL_SPRITE_CARD: 10001,
+        /** Serious-mode terminal controller (full-pane mode). Sits above the
+         *  terminal overlay so its chrome (mode toggle, footer) stays on top. */
+        SERIOUS_TERMINAL: 10003,
+        /** Sprite customizer modal. Above terminal but below settings. */
+        SPRITE_CUSTOMIZER: 15e3,
+        /** Settings panel modal. */
+        SETTINGS: 2e4,
+        /** Notification settings modal. Shares SETTINGS' layer because the two
+         *  are never open simultaneously by app construction (both routed via
+         *  the same `settings:open` / `settings:close` bus). */
+        NOTIFICATION_SETTINGS: 2e4,
+        /** Generic blocking modal dialog (e.g. layout chooser, new office dialog).
+         *  Sits above everything except the absolute top-most modal layer. */
+        MODAL_DIALOG: 99999,
+        /** Reserved for the topmost modal layer (e.g. critical confirmation that
+         *  must sit above an already-open MODAL_DIALOG). */
+        TOP_MODAL: 1e5
+      };
+    }
+  });
+
+  // src/util/lifecycleLog.ts
+  function logLifecycleTransition(t) {
+    if (t.from === t.to) return;
+    const full = { ...t, timestamp: Date.now() };
+    const reasonStr = full.reason ? ` reason=${full.reason}` : "";
+    const detailStr = full.detail ? ` detail=${JSON.stringify(full.detail)}` : "";
+    console.log(
+      `[lifecycle] agent=${full.agentId} office=${full.officeId} ${full.from}\u2192${full.to}${reasonStr}${detailStr}`
+    );
+    for (const fn of subscribers) {
+      try {
+        fn(full);
+      } catch (err) {
+        console.warn("[lifecycle] subscriber threw:", err);
+      }
+    }
+  }
+  var subscribers;
+  var init_lifecycleLog = __esm({
+    "src/util/lifecycleLog.ts"() {
+      "use strict";
+      subscribers = /* @__PURE__ */ new Set();
+    }
+  });
+
+  // src/office/officePersistence.ts
+  function serializeOffices(state) {
+    return JSON.stringify(
+      {
+        currentOfficeId: state.currentOfficeId,
+        offices: state.offices
+      },
+      null,
+      2
+    );
+  }
+  function deserializeOffices(stored) {
+    if (!stored) return { currentOfficeId: null, offices: [] };
+    let data;
+    try {
+      data = JSON.parse(stored);
+    } catch {
+      return { currentOfficeId: null, offices: [] };
+    }
+    if (data === null || typeof data !== "object") {
+      return { currentOfficeId: null, offices: [] };
+    }
+    const record = data;
+    const rawOffices = Array.isArray(record.offices) ? record.offices : [];
+    const offices = [];
+    for (let i = 0; i < rawOffices.length; i++) {
+      const raw = rawOffices[i];
+      if (raw === null || typeof raw !== "object") continue;
+      const cfg = raw;
+      const name = typeof cfg.name === "string" ? cfg.name : `Office ${i}`;
+      const workingDirectory = typeof cfg.workingDirectory === "string" ? cfg.workingDirectory : ".";
+      const createdAt = typeof cfg.createdAt === "number" ? cfg.createdAt : Date.now();
+      const layout = cfg.layout === "fleet-vteam" ? "fleet-vteam" : "default";
+      const seatedAgents = Array.isArray(cfg.seatedAgents) ? cfg.seatedAgents.filter(
+        (s) => !!s && typeof s === "object" && typeof s.deskId === "string" && typeof s.agentId === "string"
+      ) : [];
+      const normalized = {
+        // Reindex from array position — this replaces legacy UUID-style ids and
+        // matches the prior inline loader behaviour exactly.
+        id: `office-${i}`,
+        name,
+        workingDirectory,
+        createdAt,
+        layout,
+        seatedAgents
+      };
+      if (cfg.customAgents !== void 0) {
+        normalized.customAgents = cfg.customAgents;
+      }
+      if (cfg.customReserveAgents !== void 0) {
+        normalized.customReserveAgents = cfg.customReserveAgents;
+      }
+      offices.push(normalized);
+    }
+    let currentOfficeId = null;
+    if (record.currentOfficeId !== void 0 && record.currentOfficeId !== null) {
+      currentOfficeId = String(record.currentOfficeId);
+    }
+    if (!currentOfficeId || !offices.some((o) => o.id === currentOfficeId)) {
+      currentOfficeId = offices.length > 0 ? offices[0].id : null;
+    }
+    return { currentOfficeId, offices };
+  }
+  function createBridgePersistencePort() {
+    const getBridge = () => typeof window !== "undefined" ? window.copilotBridge : void 0;
+    return {
+      async loadDurable() {
+        const bridge = getBridge();
+        if (!bridge?.loadOffices) return null;
+        try {
+          const result = await bridge.loadOffices();
+          if (result?.success && typeof result.data === "string") {
+            return result.data;
+          }
+        } catch (e) {
+          console.warn("[OfficePersistence] loadOffices failed:", e);
+        }
+        return null;
+      },
+      async saveDurable(json) {
+        const bridge = getBridge();
+        if (!bridge?.saveOffices) return;
+        try {
+          await bridge.saveOffices(json);
+        } catch (e) {
+          console.warn("[OfficePersistence] saveOffices failed:", e);
+        }
+      },
+      async createOfficeSession(officeId) {
+        const bridge = getBridge();
+        if (!bridge?.createOfficeSession) return;
+        try {
+          await bridge.createOfficeSession(officeId);
+        } catch (e) {
+          console.warn("[OfficePersistence] createOfficeSession failed:", e);
+        }
+      },
+      async deleteOfficeSession(officeId) {
+        const bridge = getBridge();
+        if (!bridge?.deleteOfficeSession) return;
+        try {
+          await bridge.deleteOfficeSession(officeId);
+        } catch (e) {
+          console.warn("[OfficePersistence] deleteOfficeSession failed:", e);
+        }
+      }
+    };
+  }
+  var init_officePersistence = __esm({
+    "src/office/officePersistence.ts"() {
+      "use strict";
+    }
+  });
+
   // src/office/officeManager.ts
   var VALID_TRANSITIONS, MAX_RECENT_ACTIONS, OfficeManager, officeManager;
   var init_officeManager = __esm({
     "src/office/officeManager.ts"() {
       "use strict";
       init_agents();
+      init_lifecycleLog();
+      init_officePersistence();
       VALID_TRANSITIONS = {
         slacking: /* @__PURE__ */ new Set(["starting", "ready"]),
         starting: /* @__PURE__ */ new Set(["ready", "error", "slacking"]),
@@ -148186,14 +148392,24 @@ WARNING: This link could potentially be dangerous`)) {
       };
       MAX_RECENT_ACTIONS = 8;
       OfficeManager = class {
-        constructor() {
+        constructor(persistence = createBridgePersistencePort()) {
           this.offices = /* @__PURE__ */ new Map();
           this.sessionToOffice = /* @__PURE__ */ new Map();
           // sessionId → officeId
           this._currentOfficeId = null;
+          // Spec 008 (2026-06-12): durable load is async but renderer boot triggers
+          // saves (status updates, agent registrations) almost immediately. Without
+          // gating, those saves serialize the localStorage-only state and clobber
+          // the multi-office file on disk before the durable load can hydrate. We
+          // hold all durable writes until loadFromStorage's async path settles, then
+          // flush whatever the most-recent state was. localStorage writes are NOT
+          // gated — they're fast, synchronous, and only matter for next cold boot.
+          this.durableLoadSettled = false;
+          this.pendingDurableWrite = false;
           // Callbacks for UI updates
           this.onOfficeChanged = null;
           this.onOfficesUpdated = null;
+          this.persistence = persistence;
           this.loadFromStorage();
         }
         get currentOfficeId() {
@@ -148237,11 +148453,7 @@ WARNING: This link could potentially be dangerous`)) {
             this._currentOfficeId = id;
           }
           this.saveToStorage();
-          if (typeof window !== "undefined" && window.copilotBridge?.createOfficeSession) {
-            window.copilotBridge.createOfficeSession(id).catch((e) => {
-              console.warn("[OfficeManager] Failed to create session file:", e);
-            });
-          }
+          void this.persistence.createOfficeSession(id);
           this.onOfficesUpdated?.();
           return data;
         }
@@ -148259,11 +148471,7 @@ WARNING: This link could potentially be dangerous`)) {
             }
           }
           this.offices.delete(officeId);
-          if (typeof window !== "undefined" && window.copilotBridge?.deleteOfficeSession) {
-            window.copilotBridge.deleteOfficeSession(officeId).catch((e) => {
-              console.warn("[OfficeManager] Failed to delete session file:", e);
-            });
-          }
+          void this.persistence.deleteOfficeSession(officeId);
           if (this._currentOfficeId === officeId) {
             this._currentOfficeId = this.offices.has("office-0") ? "office-0" : this.offices.keys().next().value || null;
             if (this._currentOfficeId) {
@@ -148335,70 +148543,63 @@ WARNING: This link could potentially be dangerous`)) {
           const office = this.offices.get(officeId);
           return office?.config.seatedAgents ?? [];
         }
-        // Persistence — saves to both localStorage (fast) and .data/copilot-offices.json (durable)
+        // Persistence — saves to both localStorage (fast) and durable file via port.
         saveToStorage() {
-          const data = {
+          const json = serializeOffices({
             currentOfficeId: this._currentOfficeId,
             offices: Array.from(this.offices.values()).map((o) => o.config)
-          };
-          const json = JSON.stringify(data, null, 2);
+          });
           try {
             localStorage.setItem("copilot-offices", json);
           } catch (e) {
             console.warn("[OfficeManager] Failed to save to localStorage:", e);
           }
-          if (typeof window !== "undefined" && window.copilotBridge?.saveOffices) {
-            window.copilotBridge.saveOffices(json).catch((e) => {
-              console.warn("[OfficeManager] Failed to save to file:", e);
-            });
+          if (!this.durableLoadSettled) {
+            this.pendingDurableWrite = true;
+            return;
           }
+          void this.persistence.saveDurable(json);
+        }
+        flushPendingDurableWrite() {
+          if (!this.pendingDurableWrite) return;
+          this.pendingDurableWrite = false;
+          const json = serializeOffices({
+            currentOfficeId: this._currentOfficeId,
+            offices: Array.from(this.offices.values()).map((o) => o.config)
+          });
+          void this.persistence.saveDurable(json);
         }
         loadFromStorage() {
-          this.loadFromJson(localStorage.getItem("copilot-offices"));
-          if (typeof window !== "undefined" && window.copilotBridge?.loadOffices) {
-            window.copilotBridge.loadOffices().then((result) => {
-              if (result.success && result.data) {
-                console.log("[OfficeManager] Loaded offices from .data/copilot-offices.json");
-                this.loadFromJson(result.data);
-                this.onOfficesUpdated?.();
-              }
-            }).catch((e) => {
-              console.warn("[OfficeManager] Failed to load from file:", e);
-            });
-          }
+          this.applyStoredState(localStorage.getItem("copilot-offices"));
+          void this.persistence.loadDurable().then((data) => {
+            if (data) {
+              console.log("[OfficeManager] Loaded offices from durable persistence");
+              this.applyStoredState(data);
+              this.onOfficesUpdated?.();
+            }
+          }).catch((e) => {
+            console.warn("[OfficeManager] Failed to load from durable persistence:", e);
+          }).finally(() => {
+            this.durableLoadSettled = true;
+            this.flushPendingDurableWrite();
+          });
         }
-        loadFromJson(stored) {
-          if (!stored) return;
-          try {
-            const data = JSON.parse(stored);
-            if (Array.isArray(data.offices)) {
-              for (let i = 0; i < data.offices.length; i++) {
-                const config = data.offices[i];
-                if (!config.layout) config.layout = "default";
-                if (!Array.isArray(config.seatedAgents)) config.seatedAgents = [];
-                config.id = `office-${i}`;
-                delete config.index;
-                const id = config.id;
-                const existing = this.offices.get(id);
-                const officeData = {
-                  config,
-                  agents: existing?.agents ?? /* @__PURE__ */ new Map(),
-                  agentTools: existing?.agentTools ?? /* @__PURE__ */ new Map()
-                };
-                this.offices.set(id, officeData);
-              }
-            }
-            let currentId = null;
-            if (data.currentOfficeId !== void 0 && data.currentOfficeId !== null) {
-              currentId = String(data.currentOfficeId);
-            }
-            if (currentId && this.offices.has(currentId)) {
-              this._currentOfficeId = currentId;
-            } else if (this.offices.size > 0) {
-              this._currentOfficeId = this.offices.keys().next().value;
-            }
-          } catch (e) {
-            console.warn("[OfficeManager] Failed to parse office data:", e);
+        applyStoredState(stored) {
+          const { currentOfficeId, offices } = deserializeOffices(stored);
+          if (offices.length === 0 && currentOfficeId === null) return;
+          for (const config of offices) {
+            const existing = this.offices.get(config.id);
+            const officeData = {
+              config,
+              agents: existing?.agents ?? /* @__PURE__ */ new Map(),
+              agentTools: existing?.agentTools ?? /* @__PURE__ */ new Map()
+            };
+            this.offices.set(config.id, officeData);
+          }
+          if (currentOfficeId && this.offices.has(currentOfficeId)) {
+            this._currentOfficeId = currentOfficeId;
+          } else if (this.offices.size > 0) {
+            this._currentOfficeId = this.offices.keys().next().value;
           }
         }
         // Agent status helpers
@@ -148428,9 +148629,27 @@ WARNING: This link could potentially be dangerous`)) {
             console.warn(`[OfficeManager] Invalid transition: ${agentId} ${from} \u2192 ${target}`);
           }
         }
-        setAgentSlacking(officeId, agentId) {
+        /**
+         * Emit a structured lifecycle telemetry entry for a transition that has
+         * already been applied to `status`. Callers pass the pre-mutation effective
+         * state captured before mutating. Safe additive observability — never mutates
+         * state and self-transitions are suppressed by the helper.
+         */
+        emitLifecycleTransition(officeId, agentId, status, from, reason, detail) {
+          const to = this.getEffectiveState(status);
+          logLifecycleTransition({
+            agentId,
+            officeId,
+            from,
+            to,
+            reason,
+            detail
+          });
+        }
+        setAgentSlacking(officeId, agentId, reason) {
           const status = this.getOrCreateStatus(officeId, agentId);
           if (!status) return;
+          const from = this.getEffectiveState(status);
           this.validateTransition(agentId, status, "slacking");
           status.state = "slacking";
           status.subState = null;
@@ -148440,11 +148659,13 @@ WARNING: This link could potentially be dangerous`)) {
           status.activityStartTime = null;
           status.recentActions = [];
           status.taskSummary = null;
+          this.emitLifecycleTransition(officeId, agentId, status, from, reason);
         }
-        setAgentStarting(officeId, agentId) {
+        setAgentStarting(officeId, agentId, reason) {
           const status = this.getOrCreateStatus(officeId, agentId);
           if (!status) return;
           if (status.subState === "starting") return;
+          const from = this.getEffectiveState(status);
           this.validateTransition(agentId, status, "starting");
           status.state = "active";
           status.subState = "starting";
@@ -148452,10 +148673,12 @@ WARNING: This link could potentially be dangerous`)) {
           status.currentTool = null;
           status.completionPendingAck = false;
           status.activityStartTime = Date.now();
+          this.emitLifecycleTransition(officeId, agentId, status, from, reason);
         }
-        setAgentReady(officeId, agentId) {
+        setAgentReady(officeId, agentId, reason) {
           const status = this.getOrCreateStatus(officeId, agentId);
           if (!status) return;
+          const from = this.getEffectiveState(status);
           this.validateTransition(agentId, status, "ready");
           status.state = "active";
           status.subState = "ready";
@@ -148463,10 +148686,12 @@ WARNING: This link could potentially be dangerous`)) {
           status.currentTool = null;
           status.completionPendingAck = false;
           status.activityStartTime = null;
+          this.emitLifecycleTransition(officeId, agentId, status, from, reason);
         }
-        setAgentDonePendingAck(officeId, agentId) {
+        setAgentDonePendingAck(officeId, agentId, reason) {
           const status = this.getOrCreateStatus(officeId, agentId);
           if (!status) return;
+          const from = this.getEffectiveState(status);
           this.validateTransition(agentId, status, "ready");
           status.state = "active";
           status.subState = "ready";
@@ -148474,6 +148699,7 @@ WARNING: This link could potentially be dangerous`)) {
           status.currentTool = null;
           status.completionPendingAck = true;
           status.activityStartTime = null;
+          this.emitLifecycleTransition(officeId, agentId, status, from, reason ?? "done_pending_ack");
         }
         acknowledgeAgentCompletion(officeId, agentId) {
           const status = this.getOrCreateStatus(officeId, agentId);
@@ -148481,9 +148707,10 @@ WARNING: This link could potentially be dangerous`)) {
           status.completionPendingAck = false;
           return true;
         }
-        setAgentWaiting(officeId, agentId) {
+        setAgentWaiting(officeId, agentId, reason) {
           const status = this.getOrCreateStatus(officeId, agentId);
           if (!status) return;
+          const from = this.getEffectiveState(status);
           this.validateTransition(agentId, status, "waiting");
           status.state = "active";
           status.subState = "waiting";
@@ -148491,10 +148718,12 @@ WARNING: This link could potentially be dangerous`)) {
           status.currentTool = null;
           status.completionPendingAck = false;
           if (!status.activityStartTime) status.activityStartTime = Date.now();
+          this.emitLifecycleTransition(officeId, agentId, status, from, reason);
         }
-        setAgentThinking(officeId, agentId, detail) {
+        setAgentThinking(officeId, agentId, detail, reason) {
           const status = this.getOrCreateStatus(officeId, agentId);
           if (!status) return;
+          const from = this.getEffectiveState(status);
           this.validateTransition(agentId, status, "thinking");
           status.state = "active";
           status.subState = "thinking";
@@ -148504,6 +148733,7 @@ WARNING: This link could potentially be dangerous`)) {
           status.currentTool = tools?.length ? tools[tools.length - 1].name : null;
           status.completionPendingAck = false;
           if (!status.activityStartTime) status.activityStartTime = Date.now();
+          this.emitLifecycleTransition(officeId, agentId, status, from, reason, detail ?? void 0);
         }
         clearAgentThinkingDetail(officeId, agentId) {
           const status = this.getOrCreateStatus(officeId, agentId);
@@ -148524,9 +148754,10 @@ WARNING: This link could potentially be dangerous`)) {
           status.unreadCount = 0;
           status.lastEvent = null;
         }
-        setAgentError(officeId, agentId, detail = null) {
+        setAgentError(officeId, agentId, detail = null, reason) {
           const status = this.getOrCreateStatus(officeId, agentId);
           if (!status) return;
+          const from = this.getEffectiveState(status);
           this.validateTransition(agentId, status, "error");
           status.state = "active";
           status.subState = "error";
@@ -148534,6 +148765,7 @@ WARNING: This link could potentially be dangerous`)) {
           status.currentTool = null;
           status.completionPendingAck = false;
           status.activityStartTime = null;
+          this.emitLifecycleTransition(officeId, agentId, status, from, reason, detail ?? void 0);
         }
         setLastCompletedAction(officeId, agentId, action) {
           const status = this.getOrCreateStatus(officeId, agentId);
@@ -148569,6 +148801,271 @@ WARNING: This link could potentially be dangerous`)) {
     }
   });
 
+  // src/ui/clipboardToast.ts
+  function ensureToastElement() {
+    if (typeof document === "undefined") return null;
+    let el = document.getElementById(TOAST_ID);
+    if (el) return el;
+    el = document.createElement("div");
+    el.id = TOAST_ID;
+    el.style.cssText = `
+    position: fixed;
+    top: 24px;
+    left: 50%;
+    transform: translateX(-50%);
+    z-index: ${ZIndex.TERMINAL_SPRITE_CARD + 20};
+    padding: 8px 16px;
+    border-radius: 6px;
+    font-family: 'Cascadia Code', Consolas, monospace;
+    font-size: 13px;
+    color: #ffffff;
+    box-shadow: 0 4px 14px rgba(0, 0, 0, 0.5);
+    pointer-events: none;
+    opacity: 0;
+    transition: opacity 120ms ease-out;
+    max-width: 60vw;
+    text-align: center;
+  `;
+    document.body.appendChild(el);
+    return el;
+  }
+  function showClipboardToast(message, kind = "info") {
+    const el = ensureToastElement();
+    if (!el) return;
+    el.textContent = message;
+    el.style.background = KIND_BG[kind];
+    el.style.opacity = "1";
+    if (dismissTimer) clearTimeout(dismissTimer);
+    dismissTimer = setTimeout(() => {
+      el.style.opacity = "0";
+    }, TOAST_DURATION_MS);
+  }
+  var TOAST_ID, TOAST_DURATION_MS, dismissTimer, KIND_BG;
+  var init_clipboardToast = __esm({
+    "src/ui/clipboardToast.ts"() {
+      "use strict";
+      init_zIndex();
+      TOAST_ID = "copilot-office-clipboard-toast";
+      TOAST_DURATION_MS = 1500;
+      dismissTimer = null;
+      KIND_BG = {
+        success: "#1f6f3a",
+        info: "#27355a",
+        error: "#7a2230"
+      };
+    }
+  });
+
+  // src/ui/xtermStyles.ts
+  function ensureXtermStyles() {
+    if (typeof document === "undefined") return;
+    if (document.getElementById(STYLE_ID)) return;
+    const style = document.createElement("style");
+    style.id = STYLE_ID;
+    style.textContent = `
+    .xterm {
+      height: 100%;
+    }
+    .xterm-viewport {
+      overflow-y: scroll !important;
+      background-color: #0a0a14 !important;
+      scrollbar-width: none;
+      scrollbar-gutter: auto;
+    }
+    .xterm-viewport::-webkit-scrollbar {
+      width: 0 !important;
+      height: 0 !important;
+      display: none !important;
+    }
+    #terminal-container .xterm {
+      height: 100%;
+    }
+    #serious-terminal-container .xterm {
+      height: 100%;
+    }
+  `;
+    document.head.appendChild(style);
+  }
+  var STYLE_ID;
+  var init_xtermStyles = __esm({
+    "src/ui/xtermStyles.ts"() {
+      "use strict";
+      STYLE_ID = "copilot-office-xterm-styles";
+    }
+  });
+
+  // src/ui/terminalWheel.ts
+  function wheelToPtySequence(deltaY, opts = {}) {
+    if (!deltaY) return "";
+    const pages = Math.max(1, Math.round(opts.pagesPerNotch ?? 1));
+    const key = deltaY < 0 ? PAGE_UP : PAGE_DOWN;
+    return key.repeat(pages);
+  }
+  var PAGE_UP, PAGE_DOWN;
+  var init_terminalWheel = __esm({
+    "src/ui/terminalWheel.ts"() {
+      "use strict";
+      PAGE_UP = "\x1B[5~";
+      PAGE_DOWN = "\x1B[6~";
+    }
+  });
+
+  // src/agents/AutoStartCoordinator.ts
+  function readSessionStorage() {
+    try {
+      if (typeof sessionStorage !== "undefined") return sessionStorage;
+    } catch {
+    }
+    return null;
+  }
+  function setAutoStartCoordinator(c) {
+    _instance = c;
+  }
+  function getAutoStartCoordinator() {
+    return _instance;
+  }
+  var WARMED_STORAGE_KEY, WarmedOfficeRegistry, AgentReplaceTracker, AutoStartCoordinator, _instance;
+  var init_AutoStartCoordinator = __esm({
+    "src/agents/AutoStartCoordinator.ts"() {
+      "use strict";
+      WARMED_STORAGE_KEY = "copilot-office-auto-start:warmed";
+      WarmedOfficeRegistry = class {
+        constructor() {
+          const storage = readSessionStorage();
+          let initial = [];
+          if (storage) {
+            try {
+              const raw = storage.getItem(WARMED_STORAGE_KEY);
+              if (raw) {
+                const parsed = JSON.parse(raw);
+                if (Array.isArray(parsed)) initial = parsed.filter((s) => typeof s === "string");
+              }
+            } catch {
+            }
+          }
+          this.warmed = new Set(initial);
+        }
+        has(officeId) {
+          return this.warmed.has(officeId);
+        }
+        mark(officeId) {
+          this.warmed.add(officeId);
+          const storage = readSessionStorage();
+          if (!storage) return;
+          try {
+            storage.setItem(WARMED_STORAGE_KEY, JSON.stringify(Array.from(this.warmed)));
+          } catch {
+          }
+        }
+        /** @internal — test helper. */
+        snapshot() {
+          return Array.from(this.warmed);
+        }
+        /** @internal — e2e helper for spec 009 A4 (Settings OFF gate). */
+        clearAll() {
+          this.warmed.clear();
+          const storage = readSessionStorage();
+          if (storage) {
+            try {
+              storage.removeItem(WARMED_STORAGE_KEY);
+            } catch {
+            }
+          }
+        }
+      };
+      AgentReplaceTracker = class {
+        constructor() {
+          this.inFlight = /* @__PURE__ */ new Map();
+        }
+        has(agentId) {
+          return this.inFlight.has(agentId);
+        }
+        get(agentId) {
+          return this.inFlight.get(agentId);
+        }
+        set(agentId, p) {
+          this.inFlight.set(agentId, p);
+        }
+        delete(agentId) {
+          this.inFlight.delete(agentId);
+        }
+      };
+      AutoStartCoordinator = class {
+        constructor(deps) {
+          this.deps = deps;
+          this.warmedOffices = new WarmedOfficeRegistry();
+          this.replaceTracker = new AgentReplaceTracker();
+        }
+        /** Rule #1 + #2 trigger. Idempotent: no-op if office already warmed or
+         *  setting is OFF. Returns the agents it kicked off (for testing). */
+        async tryWarmCurrentOffice() {
+          if (!this.deps.getSettings().autoStartKnownAgents) return [];
+          const oid = this.deps.getCurrentOfficeId();
+          if (!oid) return [];
+          if (this.warmedOffices.has(oid)) return [];
+          this.warmedOffices.mark(oid);
+          let roster;
+          try {
+            roster = this.deps.getCanonicalAgentIds(oid) || [];
+          } catch {
+            roster = [];
+          }
+          let meta;
+          try {
+            meta = await this.deps.getSessionMeta(oid) || {};
+          } catch {
+            meta = {};
+          }
+          const titled = [];
+          for (const id of roster) {
+            const entry = meta[id];
+            const title = entry && typeof entry.title === "string" ? entry.title.trim() : "";
+            if (title) titled.push(id);
+          }
+          const sids = await Promise.all(
+            titled.map(
+              (id) => Promise.resolve().then(() => this.deps.getCurrentSessionId(oid, id)).catch(() => null)
+            )
+          );
+          const qualifying = [];
+          for (let i = 0; i < titled.length; i++) {
+            if (sids[i]) qualifying.push(titled[i]);
+          }
+          for (const id of qualifying) {
+            void Promise.resolve().then(() => this.deps.warmAgentSession(oid, id)).catch((err) => {
+              try {
+                console.warn(
+                  `[AutoStartCoordinator] warmAgentSession failed for ${oid}/${id}:`,
+                  err
+                );
+              } catch {
+              }
+            });
+          }
+          return qualifying;
+        }
+        /** Rule #3 trigger. Returns the in-flight promise for an existing replace,
+         *  otherwise starts and tracks a new one. Setting OFF short-circuits to
+         *  just resetSession (acts like Close Session, per FR-017). */
+        replaceSession(officeId, agentId) {
+          const existing = this.replaceTracker.get(agentId);
+          if (existing) return existing;
+          const p = (async () => {
+            await this.deps.resetSession(officeId, agentId);
+            if (this.deps.getSettings().autoStartKnownAgents) {
+              await this.deps.warmAgentSession(officeId, agentId);
+            }
+          })().finally(() => {
+            this.replaceTracker.delete(agentId);
+          });
+          this.replaceTracker.set(agentId, p);
+          return p;
+        }
+      };
+      _instance = null;
+    }
+  });
+
   // src/ui/TerminalOverlay.ts
   function withTimeout(promise, ms, label) {
     let timeoutId = null;
@@ -148584,14 +149081,22 @@ WARNING: This link could potentially be dangerous`)) {
       });
     });
   }
-  var import_xterm, import_addon_fit, IPC_TIMEOUT, TerminalOverlay;
+  var import_xterm, import_addon_fit, IPC_TIMEOUT, DEBUG_COLD_START, DEBUG_SPRITE_SERIOUS, TerminalOverlay;
   var init_TerminalOverlay = __esm({
     "src/ui/TerminalOverlay.ts"() {
       "use strict";
       import_xterm = __toESM(require_xterm());
       import_addon_fit = __toESM(require_addon_fit());
+      init_agents();
+      init_zIndex();
       init_officeManager();
+      init_clipboardToast();
+      init_xtermStyles();
+      init_terminalWheel();
+      init_AutoStartCoordinator();
       IPC_TIMEOUT = 1e4;
+      DEBUG_COLD_START = typeof window !== "undefined" && window.__COPILOT_OFFICE_DEBUG_COLD_START__ === true || false;
+      DEBUG_SPRITE_SERIOUS = false;
       TerminalOverlay = class _TerminalOverlay {
         constructor(scene, inputManager, getOfficeId) {
           this.container = null;
@@ -148613,6 +149118,7 @@ WARNING: This link could potentially be dangerous`)) {
           this.mobileKeyboardBtn = null;
           this.isFocused = false;
           this.resizeHandler = null;
+          this.clipboardHandler = null;
           this.resizeObserver = null;
           this.refitTimers = [];
           this.refitGeneration = 0;
@@ -148621,11 +149127,18 @@ WARNING: This link could potentially be dangerous`)) {
           this.isReplaying = false;
           this.launchMode = "copilot";
           this.pendingInputLine = "";
-          this.awaitingSessionIdRefresh = false;
-          this.sessionRefreshCommandTimer = null;
-          this.sessionRefreshExpiryTimer = null;
+          // Spec 007: awaitingSessionIdRefresh / sessionRefresh*Timer fields removed
+          // along with the parseSessionId / scheduleSessionIdRefresh helpers.
           this.currentSessionTitle = null;
           this.isEditingSessionTitle = false;
+          this.terminalContextMenu = null;
+          this.terminalContextMenuDismiss = null;
+          // Disposable returned by xterm.terminal.onData(...). Re-registered per show()
+          // so the handler's closure captures the new agent id (feature 002, C3/V6).
+          this.onDataDisposable = null;
+          // Toggled while show() is awaiting detach/attach so onData cannot fire input
+          // against a half-attached agent (feature 002, V5).
+          this.isSwitchingAgent = false;
           this.scene = scene;
           this.inputManager = inputManager;
           this.getOfficeId = getOfficeId;
@@ -148645,7 +149158,6 @@ WARNING: This link could potentially be dangerous`)) {
               if (this.isReplaying) return;
               if (agentId === this.currentAgentId && this.terminal) {
                 this.terminal.write(data);
-                this.parseSessionId(data);
               }
             });
             window.copilotBridge.onTerminalExit((agentId, exitCode) => {
@@ -148671,49 +149183,12 @@ WARNING: This link could potentially be dangerous`)) {
           this.setupTerminalListeners();
           console.log("[TerminalOverlay] Re-attached terminal IPC listeners");
         }
-        clearSessionRefreshTimers() {
-          if (this.sessionRefreshCommandTimer) {
-            clearTimeout(this.sessionRefreshCommandTimer);
-            this.sessionRefreshCommandTimer = null;
-          }
-          if (this.sessionRefreshExpiryTimer) {
-            clearTimeout(this.sessionRefreshExpiryTimer);
-            this.sessionRefreshExpiryTimer = null;
-          }
-        }
-        scheduleSessionIdRefresh(agentId) {
-          if (!window.copilotBridge) return;
-          const officeId = this.getActiveOfficeId();
-          this.awaitingSessionIdRefresh = true;
-          this.clearSessionRefreshTimers();
-          const el = this.spriteCardElement?.querySelector(".session-id-display");
-          if (el) {
-            el.textContent = "syncing...";
-          }
-          this.sessionRefreshCommandTimer = setTimeout(() => {
-            this.sessionRefreshCommandTimer = null;
-            void window.copilotBridge.terminalWrite(officeId, agentId, "/session\r").catch(() => {
-            });
-          }, 400);
-          this.sessionRefreshExpiryTimer = setTimeout(() => {
-            this.sessionRefreshExpiryTimer = null;
-            this.awaitingSessionIdRefresh = false;
-            this.updateSessionDisplay();
-          }, 12e3);
-        }
-        parseSessionId(data) {
-          if (!this.awaitingSessionIdRefresh || !this.currentAgentId || !window.copilotBridge) return;
-          const match = data.match(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i);
-          if (!match) return;
-          const nextSessionId = match[0].toLowerCase();
-          this.awaitingSessionIdRefresh = false;
-          this.clearSessionRefreshTimers();
-          this.sessionId = nextSessionId;
-          this.updateSessionDisplay();
-          const officeId = this.getActiveOfficeId();
-          void window.copilotBridge.setSessionId(officeId, this.currentAgentId, nextSessionId).catch(() => {
-          });
-        }
+        // Spec 007: parseSessionId / scheduleSessionIdRefresh / awaitingSessionIdRefresh
+        // were removed. They greedily matched any UUID-shaped substring in PTY data
+        // (which could be a constant install/trace/OAuth UUID emitted by Copilot CLI
+        // before the real session UUID), then persisted that wrong value as the
+        // agent's session id. The server is now the only source of truth for session
+        // ids — see `bridge.resetSession` in the /new path below.
         getActiveOfficeId() {
           return this.attachedOfficeId ?? this.getOfficeId();
         }
@@ -148723,6 +149198,75 @@ WARNING: This link could potentially be dangerous`)) {
           }
           this.refitTimers.length = 0;
         }
+        // Spec 006: diagnostic toast prefix so multi-instance and channel issues
+        // are visible in the UI (no DevTools required).
+        tag() {
+          return `[O${this.instanceId}]`;
+        }
+        // Spec 005 + 006: write text to OS clipboard via Electron main process.
+        // Diagnostic toast on every outcome so we never have to guess again.
+        async copyToClipboard(text, source = "live") {
+          const t = this.tag();
+          if (!text) {
+            showClipboardToast(`${t} empty selection`, "info");
+            return false;
+          }
+          const bridge = window.copilotBridge;
+          if (!bridge?.clipboardWriteText) {
+            try {
+              await navigator.clipboard.writeText(text);
+              showClipboardToast(`${t} OK ${text.length} (fallback)`, "success");
+              return true;
+            } catch {
+              showClipboardToast(`${t} no-bridge`, "error");
+              return false;
+            }
+          }
+          try {
+            const r = await bridge.clipboardWriteText(text);
+            if (r?.success === true) {
+              showClipboardToast(`${t} OK ${text.length} (verified)`, "success");
+              return true;
+            }
+            if (r?.verified === false) {
+              showClipboardToast(`${t} verify-fail (wrote=${text.length})`, "error");
+            } else {
+              showClipboardToast(`${t} bridge-err: ${r?.error || "unknown"}`, "error");
+            }
+            return false;
+          } catch (e) {
+            showClipboardToast(`${t} bridge-err: ${e?.message || "threw"}`, "error");
+            return false;
+          }
+        }
+        // Spec 005: read OS clipboard via Electron main, forward to PTY.
+        async pasteFromClipboardToTerminal() {
+          if (!this.currentAgentId || !window.copilotBridge) return;
+          let text = "";
+          try {
+            const bridge = window.copilotBridge;
+            if (bridge?.clipboardReadText) {
+              const r = await bridge.clipboardReadText();
+              if (r?.success) text = r.text || "";
+            } else if (navigator.clipboard?.readText) {
+              text = await navigator.clipboard.readText();
+            }
+          } catch (e) {
+            showClipboardToast(`Paste failed: ${e?.message || "bridge threw"}`, "error");
+            return;
+          }
+          if (!text) {
+            showClipboardToast("Clipboard is empty", "info");
+            return;
+          }
+          const officeId = this.attachedOfficeId ?? this.getOfficeId();
+          try {
+            await window.copilotBridge.terminalWrite(officeId, this.currentAgentId, text);
+            showClipboardToast(`Pasted ${text.length} char${text.length === 1 ? "" : "s"}`, "success");
+          } catch (e) {
+            showClipboardToast(`Paste failed: ${e?.message || "terminalWrite threw"}`, "error");
+          }
+        }
         resolveTerminalDimensions() {
           if (!this.terminal || !this.fitAddon) return null;
           this.fitAddon.fit();
@@ -148849,20 +149393,42 @@ WARNING: This link could potentially be dangerous`)) {
         async show(agent, onClose, options) {
           const previousAgentId = this.currentAgentId;
           const previousOfficeId = this.attachedOfficeId ?? this.getOfficeId();
+          const nextOfficeId = this.getOfficeId();
+          const isSwitchingAgent = previousAgentId !== null && (previousAgentId !== agent.id || previousOfficeId !== nextOfficeId);
           if (previousAgentId && previousAgentId !== agent.id) {
             this.acknowledgeCompletedWork(previousOfficeId, previousAgentId);
           }
+          if (isSwitchingAgent && previousAgentId && window.copilotBridge) {
+            this.isSwitchingAgent = true;
+            this.onDataDisposable?.dispose();
+            this.onDataDisposable = null;
+            try {
+              const detachStartedAt = Date.now();
+              await withTimeout(
+                window.copilotBridge.terminalDetach(previousOfficeId, previousAgentId),
+                IPC_TIMEOUT,
+                "terminalDetach"
+              );
+              if (DEBUG_COLD_START) {
+                console.log(
+                  `[TerminalOverlay] switch from=${previousAgentId} to=${agent.id} detachMs=${Date.now() - detachStartedAt}`
+                );
+              }
+            } catch (e) {
+              console.warn(`[TerminalOverlay] terminalDetach failed for ${previousAgentId}: ${String(e)}`);
+            }
+          }
           this.currentAgentId = agent.id;
           this.onCloseCallback = onClose;
           this.isReadOnly = options?.readOnly ?? false;
           this.launchMode = options?.launchMode ?? "copilot";
-          this.attachedOfficeId = this.getOfficeId();
+          this.attachedOfficeId = nextOfficeId;
           const officeId = this.getActiveOfficeId();
           this.currentAgent = agent;
           if (!this.container) {
             this.createContainer();
           }
-          const inceptionBadge = agent.id === "admin" ? " \u{1F3AD} INCEPTION MODE" : "";
+          const inceptionBadge = agent.id === ADMIN_AGENT_ID ? " \u{1F3AD} INCEPTION MODE" : "";
           let sessionTitle = null;
           if (window.copilotBridge?.getSessionMeta) {
             try {
@@ -148899,8 +149465,6 @@ WARNING: This link could potentially be dangerous`)) {
           if (this.container) {
             this.container.style.display = "flex";
           }
-          this.awaitingSessionIdRefresh = false;
-          this.clearSessionRefreshTimers();
           if (this.spriteCardElement) {
             this.spriteCardElement.style.display = "flex";
           }
@@ -148921,8 +149485,6 @@ WARNING: This link could potentially be dangerous`)) {
           this.updateSessionTitleDisplay(sessionTitle);
           this.drawAgentSprite(agent);
           this.pendingInputLine = "";
-          this.awaitingSessionIdRefresh = false;
-          this.clearSessionRefreshTimers();
           this.clearRefitTimers();
           this.refitGeneration += 1;
           if (!this.terminal) {
@@ -148980,6 +149542,14 @@ WARNING: This link could potentially be dangerous`)) {
             }
           }
           this.isVisible = true;
+          const attachStartedAt = Date.now();
+          this.isSwitchingAgent = false;
+          this.registerOnDataHandler(agent.id, officeId);
+          if (DEBUG_COLD_START && isSwitchingAgent) {
+            console.log(
+              `[TerminalOverlay] switch attach complete to=${agent.id} attachMs=${Date.now() - attachStartedAt}`
+            );
+          }
           this.scene.game.events.emit("npc:highlight", agent.id);
           const spriteCanvas = this.spriteCardElement?.querySelector(".agent-sprite-canvas");
           if (spriteCanvas) {
@@ -149006,8 +149576,6 @@ WARNING: This link could potentially be dangerous`)) {
           }, 50);
         }
         async startNewSession(agentId, workingDir, officeId) {
-          this.awaitingSessionIdRefresh = false;
-          this.clearSessionRefreshTimers();
           this.sessionId = null;
           this.updateSessionDisplay();
           const el = this.spriteCardElement?.querySelector(".session-id-display");
@@ -149042,8 +149610,19 @@ WARNING: This link could potentially be dangerous`)) {
             this.updateSessionDisplay();
           }
         }
-        fetchSessionId(agentId) {
-          this.scheduleSessionIdRefresh(agentId);
+        // Spec 007: after the user types /new in the PTY, ask the server to mint
+        // a fresh per-agent session UUID. Authoritative — never parses CLI output.
+        async fetchSessionId(agentId) {
+          if (!window.copilotBridge) return;
+          const officeId = this.getActiveOfficeId();
+          try {
+            const r = await window.copilotBridge.resetSession(officeId, agentId);
+            if (r?.success && r.sessionId && agentId === this.currentAgentId) {
+              this.sessionId = r.sessionId;
+              this.updateSessionDisplay();
+            }
+          } catch {
+          }
         }
         createContainer() {
           this.container = document.createElement("div");
@@ -149059,7 +149638,7 @@ WARNING: This link could potentially be dangerous`)) {
       border-radius: 0;
       display: none;
       flex-direction: column;
-      z-index: 10000;
+      z-index: ${ZIndex.TERMINAL_OVERLAY};
     `;
           this.headerElement = document.createElement("div");
           this.headerElement.style.cssText = `
@@ -149080,7 +149659,7 @@ WARNING: This link could potentially be dangerous`)) {
           terminalOuter.id = "terminal-container";
           terminalOuter.style.cssText = `
       flex: 1;
-      overflow: hidden;
+      overflow: auto;
       min-height: 0;
       padding: 10px;
       box-sizing: border-box;
@@ -149089,13 +149668,18 @@ WARNING: This link could potentially be dangerous`)) {
           this.terminalDiv.style.cssText = `
       width: 100%;
       height: 100%;
-      overflow: hidden;
     `;
           terminalOuter.appendChild(this.terminalDiv);
           terminalOuter.addEventListener("mousedown", () => {
             if (this.isVisible && !this.isFocused) {
               this.focusTerminal();
             }
+            this.terminal?.focus();
+          });
+          terminalOuter.addEventListener("mouseup", () => {
+            if (this.isVisible) {
+              requestAnimationFrame(() => this.terminal?.focus());
+            }
           });
           this.container.appendChild(terminalOuter);
           const terminalPanel = document.getElementById("terminal-panel") || document.body;
@@ -149114,6 +149698,16 @@ WARNING: This link could potentially be dangerous`)) {
         }
         /** Create the SpriteCard — a full-width bottom bar showing agent sprite, info, and controls. */
         createSpriteCard() {
+          const stale = document.getElementById("sprite-card");
+          if (stale) {
+            try {
+              stale.remove();
+            } catch {
+            }
+            if (DEBUG_SPRITE_SERIOUS) {
+              console.log("[TerminalOverlay] createSpriteCard removed stale #sprite-card before append");
+            }
+          }
           this.spriteCardElement = document.createElement("div");
           this.spriteCardElement.id = "sprite-card";
           this.spriteCardElement.style.cssText = `
@@ -149130,7 +149724,7 @@ WARNING: This link could potentially be dangerous`)) {
       padding: 16px 24px;
       box-sizing: border-box;
       position: relative;
-      z-index: 10001;
+      z-index: ${ZIndex.TERMINAL_SPRITE_CARD};
     `;
           const agentDisplay = document.createElement("div");
           agentDisplay.className = "agent-display";
@@ -149277,49 +149871,65 @@ WARNING: This link could potentially be dangerous`)) {
           this.footerElement = this.spriteCardElement;
         }
         copySessionId() {
-          if (this.sessionId) {
-            navigator.clipboard.writeText(this.sessionId).then(() => {
+          if (!this.sessionId) return;
+          void this.copyToClipboard(this.sessionId, "session").then((success) => {
+            if (!this.sessionIdElement) return;
+            const original = this.sessionIdElement.textContent;
+            this.sessionIdElement.textContent = success ? "Copied!" : "Copy failed";
+            this.sessionIdElement.style.color = success ? "#50fa7b" : "#ff6b6b";
+            setTimeout(() => {
               if (this.sessionIdElement) {
-                const original = this.sessionIdElement.textContent;
-                this.sessionIdElement.textContent = "Copied!";
-                this.sessionIdElement.style.color = "#50fa7b";
-                setTimeout(() => {
-                  if (this.sessionIdElement) {
-                    this.sessionIdElement.textContent = original;
-                    this.sessionIdElement.style.color = "#4a9eff";
-                  }
-                }, 1e3);
+                this.sessionIdElement.textContent = original;
+                this.sessionIdElement.style.color = "#4a9eff";
               }
-            });
-          }
+            }, 1e3);
+          });
         }
         async handleNewSession() {
           if (!this.currentAgentId || !this.currentAgent || this.isReadOnly) return;
-          this.awaitingSessionIdRefresh = false;
-          this.clearSessionRefreshTimers();
           const officeId = this.attachedOfficeId ?? this.getOfficeId();
-          console.log(`[TerminalOverlay] handleNewSession: agent=${this.currentAgentId}, office=${officeId}`);
+          const agentId = this.currentAgentId;
+          console.log(`[TerminalOverlay] handleNewSession: agent=${agentId}, office=${officeId}`);
           this.clearRefitTimers();
           this.refitGeneration += 1;
           this.pendingInputLine = "";
           this.terminal?.clear();
           this.terminal?.writeln("\x1B[33m[Starting new session...]\x1B[0m\r\n");
-          await withTimeout(
-            window.copilotBridge.resetSession(officeId, this.currentAgentId),
-            IPC_TIMEOUT,
-            "resetSession"
-          ).catch(() => {
-          });
           const el = this.spriteCardElement?.querySelector(".session-id-display");
           if (el) el.textContent = "starting...";
           this.sessionId = null;
           this.updateSessionDisplay();
           this.updateSessionTitleDisplay(null);
-          const dims = this.fitAndResizeTerminal({ officeId, agentId: this.currentAgentId });
+          const coordinator = getAutoStartCoordinator();
+          if (coordinator) {
+            try {
+              await coordinator.replaceSession(officeId, agentId);
+            } catch (err) {
+              this.terminal?.writeln(`Failed to start terminal: ${err?.message || String(err)}`);
+            }
+            try {
+              if (window.copilotBridge?.getSessionId) {
+                const sid = await window.copilotBridge.getSessionId(officeId, agentId);
+                if (sid) {
+                  this.sessionId = sid;
+                  this.updateSessionDisplay();
+                }
+              }
+            } catch {
+            }
+            return;
+          }
+          await withTimeout(
+            window.copilotBridge.resetSession(officeId, agentId),
+            IPC_TIMEOUT,
+            "resetSession"
+          ).catch(() => {
+          });
+          const dims = this.fitAndResizeTerminal({ officeId, agentId });
           const result = await withTimeout(
             this.launchMode === "shell" ? window.copilotBridge.terminalStart(
               officeId,
-              this.currentAgentId,
+              agentId,
               this.currentAgent.workingDir || officeManager.getCurrentWorkingDirectory(),
               dims?.cols,
               dims?.rows,
@@ -149327,7 +149937,7 @@ WARNING: This link could potentially be dangerous`)) {
               "shell"
             ) : window.copilotBridge.terminalStart(
               officeId,
-              this.currentAgentId,
+              agentId,
               this.currentAgent.workingDir || officeManager.getCurrentWorkingDirectory(),
               dims?.cols,
               dims?.rows
@@ -149390,7 +150000,7 @@ WARNING: This link could potentially be dangerous`)) {
       min-width: 320px;
       max-height: 250px;
       overflow-y: auto;
-      z-index: 10001;
+      z-index: ${ZIndex.TERMINAL_SPRITE_CARD};
       font-family: 'Cascadia Code', Consolas, monospace;
       font-size: 12px;
       box-shadow: 0 -4px 12px rgba(0,0,0,0.5);
@@ -149448,21 +150058,7 @@ WARNING: This link could potentially be dangerous`)) {
           this.closeHistoryPopover();
         }
         injectStyles() {
-          if (document.getElementById("xterm-styles")) return;
-          const style = document.createElement("style");
-          style.id = "xterm-styles";
-          style.textContent = `
-      .xterm {
-        height: 100%;
-      }
-      .xterm-viewport {
-        background-color: #0a0a14 !important;
-      }
-      #terminal-container .xterm {
-        height: 100%;
-      }
-    `;
-          document.head.appendChild(style);
+          ensureXtermStyles();
         }
         createTerminal() {
           if (!this.terminalDiv) return;
@@ -149502,38 +150098,109 @@ WARNING: This link could potentially be dangerous`)) {
           this.terminal.loadAddon(this.fitAddon);
           this.terminal.open(this.terminalDiv);
           this.fitAndResizeTerminal();
+          const MOUSE_MODES = /* @__PURE__ */ new Set([1e3, 1002, 1003, 1006]);
+          this.terminal.parser.registerCsiHandler({ prefix: "?", final: "h" }, (params) => {
+            for (const p of params) {
+              if (typeof p === "number" && MOUSE_MODES.has(p)) return true;
+            }
+            return false;
+          });
+          this.terminal.attachCustomWheelEventHandler((event) => {
+            const term = this.terminal;
+            if (!term) return true;
+            if (term.buffer.active.type !== "alternate") return true;
+            const seq = wheelToPtySequence(event.deltaY);
+            if (!seq) return true;
+            const officeId = this.attachedOfficeId ?? this.getOfficeId();
+            if (officeId && this.currentAgentId && window.copilotBridge) {
+              void window.copilotBridge.terminalWrite(officeId, this.currentAgentId, seq);
+            }
+            return false;
+          });
+          this.installTerminalContextMenu();
           this.terminal.attachCustomKeyEventHandler((event) => {
             const isModifierPressed = event.ctrlKey || event.metaKey;
             const key = event.key.toLowerCase();
             if (event.type !== "keydown" || !isModifierPressed) return true;
             if (key === "c") {
-              const selectedText = this.terminal?.hasSelection() ? this.terminal.getSelection() : "";
-              if (!selectedText) {
+              const selection = this.terminal?.hasSelection() ? this.terminal.getSelection() ?? "" : "";
+              if (!selection) {
                 return true;
               }
               event.preventDefault();
               event.stopPropagation();
-              navigator.clipboard.writeText(selectedText).catch((err) => {
-                console.warn("[Terminal] Clipboard write failed:", err);
-              });
+              void this.copyToClipboard(selection, "live");
               return false;
             }
             if (key === "v") {
               if (this.isReadOnly) return false;
               event.preventDefault();
               event.stopPropagation();
-              navigator.clipboard.readText().then((text) => {
-                if (text) this.terminal.paste(text);
-              }).catch((err) => {
-                console.warn("[Terminal] Clipboard read failed:", err);
-              });
+              void this.pasteFromClipboardToTerminal();
               return false;
             }
             return true;
           });
-          this.terminal.onData((data) => {
+          if (this.clipboardHandler) {
+            document.removeEventListener("keydown", this.clipboardHandler, true);
+          }
+          this.clipboardHandler = (event) => {
+            if (!this.isVisible) return;
+            if (this.isEditingSessionTitle) return;
+            const active = document.activeElement;
+            if (active && (active.tagName === "INPUT" || active.tagName === "TEXTAREA") && active !== this.terminal?.textarea) {
+              return;
+            }
+            const isModifierPressed = event.ctrlKey || event.metaKey;
+            if (!isModifierPressed || event.type !== "keydown") return;
+            const key = event.key.toLowerCase();
+            if (key === "c") {
+              const selection = this.terminal?.hasSelection() ? this.terminal.getSelection() ?? "" : "";
+              if (!selection) return;
+              event.preventDefault();
+              event.stopImmediatePropagation();
+              void this.copyToClipboard(selection, "live");
+            } else if (key === "v") {
+              if (this.isReadOnly) return;
+              event.preventDefault();
+              event.stopImmediatePropagation();
+              void this.pasteFromClipboardToTerminal();
+            }
+          };
+          document.addEventListener("keydown", this.clipboardHandler, true);
+          this.resizeHandler = () => {
+            if (this.isVisible) {
+              this.applySpriteCardResponsiveStyles();
+              this.updateMobileKeyboardButtonVisibility();
+              this.debouncedRefit();
+            }
+          };
+          window.addEventListener("resize", this.resizeHandler);
+          this.resizeObserver = new ResizeObserver(() => {
+            if (this.isVisible) {
+              this.applySpriteCardResponsiveStyles();
+              this.updateMobileKeyboardButtonVisibility();
+              this.debouncedRefit();
+            }
+          });
+          if (this.terminalDiv) {
+            this.resizeObserver.observe(this.terminalDiv);
+          }
+        }
+        /**
+         * Re-register the xterm `onData` handler with a fresh closure that captures
+         * the bound `agentId` and `officeId` at registration time. Disposes any
+         * previous registration so stale closures cannot send user keystrokes to
+         * the wrong agent during an agent switch (feature 002, C3/V6).
+         */
+        registerOnDataHandler(boundAgentId, boundOfficeId) {
+          if (!this.terminal) return;
+          this.onDataDisposable?.dispose();
+          this.onDataDisposable = null;
+          const result = this.terminal.onData((data) => {
             if (this.isReadOnly) return;
-            if (!this.currentAgentId || !window.copilotBridge) return;
+            if (this.isSwitchingAgent) return;
+            if (!window.copilotBridge) return;
             let outbound = "";
             let shouldStartSlashNewSession = false;
             for (const ch of data) {
@@ -149557,30 +150224,98 @@ WARNING: This link could potentially be dangerous`)) {
               outbound += ch;
             }
             if (outbound.length > 0) {
-              window.copilotBridge.terminalWrite(this.getOfficeId(), this.currentAgentId, outbound);
+              window.copilotBridge.terminalWrite(boundOfficeId, boundAgentId, outbound);
             }
             if (shouldStartSlashNewSession) {
-              this.fetchSessionId(this.currentAgentId);
+              this.fetchSessionId(boundAgentId);
             }
           });
-          this.resizeHandler = () => {
-            if (this.isVisible) {
-              this.applySpriteCardResponsiveStyles();
-              this.updateMobileKeyboardButtonVisibility();
-              this.debouncedRefit();
-            }
+          this.onDataDisposable = result && typeof result.dispose === "function" ? result : null;
+        }
+        /**
+         * Spec 004: terminal right-click context menu with Copy (enabled iff
+         * non-empty selection) and Paste (always enabled). Built once, reused
+         * across selections; dismissed on any outside mousedown or Escape.
+         */
+        installTerminalContextMenu() {
+          if (!this.terminal || !this.terminalDiv) return;
+          const menu = document.createElement("div");
+          menu.id = "terminal-context-menu";
+          menu.style.cssText = `
+      position: fixed;
+      display: none;
+      z-index: ${ZIndex.TERMINAL_SPRITE_CARD + 10};
+      min-width: 160px;
+      background: #1c1c2a;
+      border: 1px solid #3a3a55;
+      border-radius: 6px;
+      box-shadow: 0 6px 18px rgba(0, 0, 0, 0.55);
+      padding: 4px 0;
+      font-family: 'Cascadia Code', Consolas, monospace;
+      font-size: 13px;
+      color: #cfd0e0;
+      user-select: none;
+    `;
+          const makeItem = (label, onClick) => {
+            const item = document.createElement("div");
+            item.textContent = label;
+            item.style.cssText = `
+        padding: 6px 14px;
+        cursor: pointer;
+      `;
+            item.dataset.enabled = "true";
+            item.addEventListener("mouseenter", () => {
+              if (item.dataset.enabled === "true") item.style.background = "#2a2a45";
+            });
+            item.addEventListener("mouseleave", () => {
+              item.style.background = "";
+            });
+            item.addEventListener("mousedown", (e) => {
+              e.preventDefault();
+              e.stopPropagation();
+            });
+            item.addEventListener("click", (e) => {
+              e.preventDefault();
+              e.stopPropagation();
+              if (item.dataset.enabled !== "true") return;
+              this.hideTerminalContextMenu();
+              onClick();
+            });
+            return item;
           };
-          window.addEventListener("resize", this.resizeHandler);
-          this.resizeObserver = new ResizeObserver(() => {
-            if (this.isVisible) {
-              this.applySpriteCardResponsiveStyles();
-              this.updateMobileKeyboardButtonVisibility();
-              this.debouncedRefit();
-            }
+          const copyItem = makeItem("Copy", () => {
+            const selection = this.terminal?.hasSelection() ? this.terminal.getSelection() ?? "" : "";
+            void this.copyToClipboard(selection, "live");
           });
-          if (this.terminalDiv) {
-            this.resizeObserver.observe(this.terminalDiv);
-          }
+          const pasteItem = makeItem("Paste", () => {
+            void this.pasteFromClipboardToTerminal();
+          });
+          menu.appendChild(copyItem);
+          menu.appendChild(pasteItem);
+          document.body.appendChild(menu);
+          this.terminalContextMenu = menu;
+          this.terminalDiv.addEventListener("contextmenu", (event) => {
+            if (!this.isVisible) return;
+            event.preventDefault();
+            const vw = window.innerWidth;
+            const vh = window.innerHeight;
+            menu.style.display = "block";
+            const rect = menu.getBoundingClientRect();
+            const left = Math.min(event.clientX, vw - rect.width - 4);
+            const top = Math.min(event.clientY, vh - rect.height - 4);
+            menu.style.left = `${Math.max(0, left)}px`;
+            menu.style.top = `${Math.max(0, top)}px`;
+          });
+          this.terminalContextMenuDismiss = (e) => {
+            if (!this.terminalContextMenu || this.terminalContextMenu.style.display === "none") return;
+            if (e instanceof KeyboardEvent && e.key !== "Escape") return;
+            this.hideTerminalContextMenu();
+          };
+          document.addEventListener("mousedown", this.terminalContextMenuDismiss, true);
+          document.addEventListener("keydown", this.terminalContextMenuDismiss, true);
+        }
+        hideTerminalContextMenu() {
+          if (this.terminalContextMenu) this.terminalContextMenu.style.display = "none";
         }
         /** Toggle between half-width and full-width terminal panel. */
         toggleFullWidth() {
@@ -149681,15 +150416,12 @@ WARNING: This link could potentially be dangerous`)) {
         }
         /** Give keyboard focus to the terminal. Safe to call when already focused. */
         focusTerminal() {
-          console.log("[TerminalOverlay] focusTerminal() \u2014 delegating to InputManager");
           this.inputManager.switchToTerminal(
             "TerminalOverlay.focusTerminal()",
             () => this.handleNewSession(),
             () => this.toggleFullWidth()
           );
-          if (window.__copilotOfficeMobileModeActive?.() === true) {
-            this.terminal?.focus();
-          }
+          this.terminal?.focus();
           this.inputManager.focusTerminalXterm(this.terminal);
           if (this.currentAgent) {
             this.scene.game.events.emit("npc:highlight", this.currentAgent.id);
@@ -149704,7 +150436,6 @@ WARNING: This link could potentially be dangerous`)) {
         }
         /** Give keyboard focus back to the game canvas. Safe to call when already blurred. */
         blurTerminal() {
-          console.log("[TerminalOverlay] blurTerminal() \u2014 delegating to InputManager");
           const mobileLocked = window.__copilotOfficeMobileModeActive?.() === true;
           if (mobileLocked) {
             this.inputManager.switchToNone("TerminalOverlay.blurTerminal() mobile lock");
@@ -149734,7 +150465,12 @@ WARNING: This link could potentially be dangerous`)) {
         }
         setupKeyboardHandler() {
         }
+        // Spec 008-smoke: expose state for the e2e debug hook.
+        getActiveAgentId() {
+          return this.currentAgentId;
+        }
         hide() {
+          this.hideTerminalContextMenu();
           if (this.container) {
             this.container.style.display = "none";
           }
@@ -149745,8 +150481,6 @@ WARNING: This link could potentially be dangerous`)) {
           this.isVisible = false;
           this.isReadOnly = false;
           this.pendingInputLine = "";
-          this.awaitingSessionIdRefresh = false;
-          this.clearSessionRefreshTimers();
           this.closeHistoryPopover();
           this.restorePanelLayout();
           this.inputManager.deactivateTerminalF10();
@@ -149785,9 +150519,26 @@ WARNING: This link could potentially be dangerous`)) {
           return false;
         }
         destroy() {
+          this.hideTerminalContextMenu();
+          if (this.clipboardHandler) {
+            document.removeEventListener("keydown", this.clipboardHandler, true);
+            this.clipboardHandler = null;
+          }
+          if (this.terminalContextMenuDismiss) {
+            document.removeEventListener("mousedown", this.terminalContextMenuDismiss, true);
+            document.removeEventListener("keydown", this.terminalContextMenuDismiss, true);
+            this.terminalContextMenuDismiss = null;
+          }
+          if (this.terminalContextMenu && this.terminalContextMenu.parentNode) {
+            try {
+              this.terminalContextMenu.parentNode.removeChild(this.terminalContextMenu);
+            } catch {
+            }
+          }
+          this.terminalContextMenu = null;
+          this.onDataDisposable?.dispose();
+          this.onDataDisposable = null;
           this.clearRefitTimers();
-          this.awaitingSessionIdRefresh = false;
-          this.clearSessionRefreshTimers();
           if (this.resizeHandler) {
             window.removeEventListener("resize", this.resizeHandler);
             this.resizeHandler = null;
@@ -149800,11 +150551,23 @@ WARNING: This link could potentially be dangerous`)) {
             this.terminal.dispose();
           }
           if (this.container && this.container.parentNode) {
-            this.container.parentNode.removeChild(this.container);
+            try {
+              this.container.parentNode.removeChild(this.container);
+            } catch {
+            }
           }
-          if (this.spriteCardElement && this.spriteCardElement.parentNode) {
-            this.spriteCardElement.parentNode.removeChild(this.spriteCardElement);
+          try {
+            if (this.spriteCardElement && this.spriteCardElement.parentNode) {
+              this.spriteCardElement.parentNode.removeChild(this.spriteCardElement);
+            }
+          } catch {
           }
+          try {
+            const fallback = document.getElementById("sprite-card");
+            if (fallback) fallback.remove();
+          } catch {
+          }
+          this.spriteCardElement = null;
           if (window.copilotBridge) {
             window.copilotBridge.removeTerminalListeners();
           }
@@ -150949,6 +151712,16 @@ WARNING: This link could potentially be dangerous`)) {
             const meta = cachedSessionMeta[agent.id];
             const hasSession = liveStatus?.state === "active";
             const metaTitle = meta?.title || "";
+            const metaSessionId = meta?.sessionId || "";
+            const sessionIdBadgeHtml = metaSessionId ? `<div class="session-id-badge" data-agent="${agent.id}" data-session-id="${metaSessionId}" title="Click to copy: ${metaSessionId}" style="
+            display: inline-block; align-self: flex-start;
+            font-family: ui-monospace, Menlo, Consolas, monospace;
+            font-size: 10px; color: #8ec3ff;
+            background: #1a2030; border: 1px solid #2a3550;
+            padding: 1px 6px; border-radius: 3px;
+            cursor: pointer; user-select: text;
+            max-width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
+          ">${metaSessionId}</div>` : "";
             const sessionPanelHtml = hasSession ? `
         <div class="session-meta-panel" data-agent="${agent.id}" style="
           flex: 2; min-width: 0;
@@ -150965,6 +151738,7 @@ WARNING: This link could potentially be dangerous`)) {
             overflow: hidden; text-overflow: ellipsis;
             display: -webkit-box; -webkit-line-clamp: 3; -webkit-box-orient: vertical;
           " title="${metaTitle ? metaTitle.replace(/"/g, "&quot;") : "Click to set title"}">${metaTitle || "Untitled session"}</div>
+          ${sessionIdBadgeHtml}
           <button class="session-new-btn" data-agent="${agent.id}" style="
             margin-top: 2px;
             align-self: flex-start;
@@ -150972,6 +151746,12 @@ WARNING: This link could potentially be dangerous`)) {
             font-size: ${t.sessionButton}; padding: 4px 10px; border-radius: 4px;
             cursor: pointer; transition: background 0.15s, border-color 0.15s;
           " title="Start a new session for this agent">\u{1F504} New Session</button>
+          <button class="session-close-btn" data-agent="${agent.id}" style="
+            align-self: flex-start;
+            background: #3a2a2a; border: 1px solid #6a4a4a; color: #f7a9a9;
+            font-size: ${t.sessionButton}; padding: 4px 10px; border-radius: 4px;
+            cursor: pointer; transition: background 0.15s, border-color 0.15s;
+          " title="Close this agent's session (agent returns to slacking)">\u2716 Close Session</button>
           <div style="display: flex; justify-content: flex-end;">
             <button class="session-edit-btn" data-agent="${agent.id}" style="
               background: none; border: 1px solid #333; color: #667;
@@ -151090,6 +151870,10 @@ WARNING: This link could potentially be dangerous`)) {
           context.emitOpenTerminal(agentId);
         },
         handleMetaPanelClick(target, agentId, context) {
+          if (target.closest(".session-close-btn")) {
+            context.closeSession(agentId);
+            return;
+          }
           if (target.closest(".session-new-btn")) {
             context.startNewSession(agentId);
             return;
@@ -151108,6 +151892,7 @@ WARNING: This link could potentially be dangerous`)) {
     "src/layouts/fleet/FleetDashboard.ts"() {
       "use strict";
       init_types();
+      init_agents();
       fleetDashboard = {
         renderCards(ctx) {
           const { agents, office, selectedAgentId, formatElapsed, formatRelativeTime } = ctx;
@@ -151157,7 +151942,7 @@ WARNING: This link could potentially be dangerous`)) {
             }
             const colorHex = "#" + agent.color.toString(16).padStart(6, "0");
             const isSelected = agent.id === selectedAgentId;
-            const isArthur = agent.id === "architect";
+            const isArthur = agent.id === ARCHITECT_AGENT_ID;
             const borderColor = isSelected ? "#4a5a7a" : "#252540";
             const bgColor = isSelected ? "#1a1e2e" : "#13131f";
             const cursor = isArthur ? "pointer" : "default";
@@ -151260,9 +152045,10 @@ WARNING: This link could potentially be dangerous`)) {
   var init_FleetClickHandler = __esm({
     "src/layouts/fleet/FleetClickHandler.ts"() {
       "use strict";
+      init_agents();
       fleetClickHandler = {
         handleCardClick(agentId, context) {
-          if (agentId === "architect") {
+          if (agentId === ARCHITECT_AGENT_ID) {
             context.setSelectedAgent(agentId);
             context.emitOpenTerminal(agentId);
             return;
@@ -151278,7 +152064,7 @@ WARNING: This link could potentially be dangerous`)) {
   function getLayout(layout) {
     return layouts[layout] ?? layouts["default"];
   }
-  var layouts;
+  var defaultBehaviors, fleetBehaviors, layouts;
   var init_layouts = __esm({
     "src/layouts/index.ts"() {
       "use strict";
@@ -151287,16 +152073,30 @@ WARNING: This link could potentially be dangerous`)) {
       init_DefaultClickHandler();
       init_FleetDashboard();
       init_FleetClickHandler();
+      defaultBehaviors = {
+        supportsReserveAgents: true,
+        restrictsInteractionToArchitect: false,
+        hasPlayerPcTerminal: true,
+        supportsFleetExecution: false
+      };
+      fleetBehaviors = {
+        supportsReserveAgents: false,
+        restrictsInteractionToArchitect: true,
+        hasPlayerPcTerminal: false,
+        supportsFleetExecution: true
+      };
       layouts = {
         "default": {
           agents: AGENTS,
           dashboard: defaultDashboard,
-          clickHandler: defaultClickHandler
+          clickHandler: defaultClickHandler,
+          behaviors: defaultBehaviors
         },
         "fleet-vteam": {
           agents: FLEET_AGENTS,
           dashboard: fleetDashboard,
-          clickHandler: fleetClickHandler
+          clickHandler: fleetClickHandler,
+          behaviors: fleetBehaviors
         }
       };
     }
@@ -151640,30 +152440,27 @@ WARNING: This link could potentially be dangerous`)) {
           this.terminal.deactivateF10();
         }
         /**
-         * Focus the xterm Terminal instance with retry.  Includes the 100 ms delay
-         * required for reliable focus transfer after the DOM has updated, plus up to
-         * 2 retries with increasing backoff if initial focus doesn't stick.
+         * Focus the xterm Terminal instance.  Calls focus() synchronously for
+         * immediate keyboard capture, then verifies after a short delay and retries
+         * if the DOM wasn't ready (e.g. display transition still in flight).
          */
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         focusTerminalXterm(terminal) {
-          console.log(`[InputManager] focusTerminalXterm() scheduled (+100ms) | time: ${Date.now()}`);
-          const attempt = (n, delay) => {
+          terminal?.focus();
+          const verify = (n, delay) => {
             setTimeout(() => {
-              terminal?.focus();
-              console.log(`[InputManager] focusTerminalXterm() attempt ${n} executed | time: ${Date.now()}`);
               const textarea = terminal?.textarea;
-              if (textarea && document.activeElement !== textarea && n < 3) {
-                console.warn(`[InputManager] focus attempt ${n} didn't stick \u2014 retrying (+${delay * 2}ms)`);
-                attempt(n + 1, delay * 2);
+              if (textarea && document.activeElement !== textarea) {
+                terminal?.focus();
+                if (n < 3) verify(n + 1, delay * 2);
               }
             }, delay);
           };
-          attempt(1, 100);
+          verify(1, 50);
         }
         /** Blur the xterm Terminal instance (return DOM focus away from xterm). */
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         blurTerminalXterm(terminal) {
-          console.log(`[InputManager] blurTerminalXterm() | time: ${Date.now()}`);
           terminal?.blur();
         }
         /** Enable or disable verbose per-keydown logging in GlobalInputListener. */
@@ -152323,11 +153120,72 @@ WARNING: This link could potentially be dangerous`)) {
     }
   });
 
+  // src/config/agentAutoStart.ts
+  function clone() {
+    return { ...DEFAULT_AGENT_AUTO_START_SETTINGS };
+  }
+  function readStorage() {
+    try {
+      if (typeof localStorage !== "undefined") return localStorage;
+    } catch {
+    }
+    return null;
+  }
+  function getAgentAutoStartSettings() {
+    const storage = readStorage();
+    if (!storage) return clone();
+    let raw;
+    try {
+      raw = storage.getItem(STORAGE_KEY2);
+    } catch {
+      return clone();
+    }
+    if (raw === null || raw === void 0) return clone();
+    let parsed;
+    try {
+      parsed = JSON.parse(raw);
+    } catch {
+      try {
+        storage.removeItem(STORAGE_KEY2);
+      } catch {
+      }
+      return clone();
+    }
+    if (!parsed || typeof parsed !== "object") return clone();
+    const candidate = parsed.autoStartKnownAgents;
+    if (typeof candidate !== "boolean") return clone();
+    return { autoStartKnownAgents: candidate };
+  }
+  function setAgentAutoStartSettings(next) {
+    const storage = readStorage();
+    if (!storage) return;
+    try {
+      storage.setItem(
+        STORAGE_KEY2,
+        JSON.stringify({ autoStartKnownAgents: !!next.autoStartKnownAgents })
+      );
+    } catch {
+    }
+  }
+  function shouldAutoStart() {
+    return getAgentAutoStartSettings().autoStartKnownAgents === true;
+  }
+  var DEFAULT_AGENT_AUTO_START_SETTINGS, STORAGE_KEY2;
+  var init_agentAutoStart = __esm({
+    "src/config/agentAutoStart.ts"() {
+      "use strict";
+      DEFAULT_AGENT_AUTO_START_SETTINGS = {
+        autoStartKnownAgents: true
+      };
+      STORAGE_KEY2 = "copilot-office-agent-auto-start";
+    }
+  });
+
   // src/scenes/OfficeScene.ts
   function debugLog(scene, ...args) {
     if (scene.physics.world.drawDebug) console.log("[Debug]", ...args);
   }
-  var import_phaser8, ENABLE_DECORATIONS, ENABLE_BASKETBALL, ENABLE_GALAXIAN, ENABLE_ZOOM_BAR, PC_TERMINAL_ID, OfficeScene;
+  var import_phaser8, DEBUG_COLD_START2, ENABLE_DECORATIONS, ENABLE_BASKETBALL, ENABLE_GALAXIAN, ENABLE_ZOOM_BAR, PC_TERMINAL_ID, OfficeScene;
   var init_OfficeScene = __esm({
     "src/scenes/OfficeScene.ts"() {
       "use strict";
@@ -152340,12 +153198,15 @@ WARNING: This link could potentially be dangerous`)) {
       init_agents();
       init_layouts();
       init_depths();
+      init_zIndex();
       init_InputManager();
       init_officeManager();
       init_fleetTracker();
       init_fleetVisualizer();
       init_DirectionalSprite();
       init_CameraDragController();
+      init_agentAutoStart();
+      DEBUG_COLD_START2 = typeof window !== "undefined" && window.__COPILOT_OFFICE_DEBUG_COLD_START__ === true || false;
       ENABLE_DECORATIONS = false;
       ENABLE_BASKETBALL = false;
       ENABLE_GALAXIAN = true;
@@ -152386,6 +153247,10 @@ WARNING: This link could potentially be dangerous`)) {
           this.skipButton = null;
           this.isPortraitDashboardMode = false;
         }
+        // Spec 008-smoke: accessor for the e2e debug hook in src/main.ts.
+        getTerminalOverlay() {
+          return this.terminalOverlay;
+        }
         setAnimating(value) {
           this.animating = value;
           this.game.registry.set("animating", value);
@@ -152471,13 +153336,13 @@ WARNING: This link could potentially be dangerous`)) {
               } else {
                 this.triggerEntrance();
               }
-              const arthurNPC = this.npcs.find((n) => n.config.id === "architect");
+              const arthurNPC = this.npcs.find((n) => n.config.id === ARCHITECT_AGENT_ID);
               if (arthurNPC) {
                 arthurNPC.updateAgentStatus(void 0);
               }
               const seatedNpcs = [];
               for (const agent of AGENTS) {
-                if (agent.id === "architect") continue;
+                if (agent.id === ARCHITECT_AGENT_ID) continue;
                 const npc = this.npcs.find((n) => n.config.id === agent.id);
                 if (!npc) continue;
                 const deskX = npc.config.position.x * this.tileSize + this.tileSize / 2;
@@ -152491,7 +153356,7 @@ WARNING: This link could potentially be dangerous`)) {
               const showAllBadges = () => {
                 seatedNpcs.forEach((n) => n.setBadgeVisible(true));
               };
-              this.triggerAgentWalkIn(["architect"], showAllBadges);
+              this.triggerAgentWalkIn([ARCHITECT_AGENT_ID], showAllBadges);
             }
           });
           this.basketballGame = new BasketballGame(this);
@@ -152592,7 +153457,7 @@ WARNING: This link could potentially be dangerous`)) {
               this.openPlayerPcTerminal();
               return;
             }
-            if (this.currentLayout === "fleet-vteam" && agentId !== "architect") return;
+            if (getLayout(this.currentLayout).behaviors.restrictsInteractionToArchitect && agentId !== ARCHITECT_AGENT_ID) return;
             const agents = getLayout(this.currentLayout).agents;
             const agent = agents.find((a) => a.id === agentId);
             if (agent) this.startConversation(agent);
@@ -152787,6 +153652,14 @@ WARNING: This link could potentially be dangerous`)) {
             this.game.events.off("zoom:change");
             this.cameraDrag?.destroy();
             this.inputManager.destroy();
+            if (DEBUG_SPRITE_SERIOUS) {
+              console.log("[OfficeScene] shutdown destroying terminalOverlay");
+            }
+            try {
+              this.terminalOverlay?.destroy();
+            } catch (e) {
+              console.warn("[OfficeScene] shutdown overlay destroy failed", e);
+            }
           }, this);
         }
         startBackgroundMusic() {
@@ -153682,7 +154555,7 @@ WARNING: This link could potentially be dangerous`)) {
       font-family: 'Cascadia Code', Consolas, monospace;
       font-size: 16px;
       font-weight: bold;
-      z-index: 150;
+      z-index: ${ZIndex.OFFICE_SCENE_OVERLAY};
       transition: background 0.15s;
     `;
           btn.addEventListener("mouseenter", () => {
@@ -153808,7 +154681,7 @@ WARNING: This link could potentially be dangerous`)) {
           const isReEntry = !this.fleetPrompt;
           console.log(`[OfficeScene] initFleetPipeline: attachOfficeId=${attachOfficeId}, sourceOfficeId=${this.fleetSourceOfficeId}, currentOfficeId=${officeManager.currentOfficeId}, isReEntry=${isReEntry}`);
           try {
-            this.fleetTracker = new FleetTracker("architect", attachOfficeId);
+            this.fleetTracker = new FleetTracker(ARCHITECT_AGENT_ID, attachOfficeId);
             await this.fleetTracker.startTracking();
             this.fleetVisualizer = new FleetVisualizer(
               this.fleetTracker,
@@ -153821,8 +154694,8 @@ WARNING: This link could potentially be dangerous`)) {
               const fleetOfficeId = officeManager.currentOfficeId;
               if (fleetOfficeId && window.copilotBridge?.terminalWrite) {
                 const fleetCmd = `/fleet ${this.fleetPrompt}\r`;
-                console.log(`[OfficeScene] Sending /fleet to ${fleetOfficeId}:architect (${fleetCmd.length} chars)`);
-                const result = await window.copilotBridge.terminalWrite(fleetOfficeId, "architect", fleetCmd);
+                console.log(`[OfficeScene] Sending /fleet to ${fleetOfficeId}:${ARCHITECT_AGENT_ID} (${fleetCmd.length} chars)`);
+                const result = await window.copilotBridge.terminalWrite(fleetOfficeId, ARCHITECT_AGENT_ID, fleetCmd);
                 console.log(`[OfficeScene] /fleet command result:`, result);
               } else {
                 console.warn("[OfficeScene] Cannot send /fleet \u2014 no officeId or copilotBridge");
@@ -153872,23 +154745,49 @@ WARNING: This link could potentially be dangerous`)) {
           });
         }
         async preStartAgentSessions() {
+          if (!shouldAutoStart()) {
+            if (DEBUG_COLD_START2) {
+              console.log("[OfficeScene] preStart skipped (autoStartKnownAgents=false)");
+            }
+            return;
+          }
           if (typeof window !== "undefined" && window.copilotBridge) {
             const oid = officeManager.currentOfficeId || "office-0";
-            const startAgent = async (agentId, label) => {
-              const agent = AGENTS.find((a) => a.id === agentId);
-              const savedSessionId = await window.copilotBridge.getSessionId(oid, agentId);
+            const startAgent = async (agentConfig, label) => {
+              const startedAt = Date.now();
+              const savedSessionId = await window.copilotBridge.getSessionId(oid, agentConfig.id);
               if (savedSessionId) {
                 console.log(`[CopilotOffice] Resuming ${label} session: ${savedSessionId}`);
               } else {
                 console.log(`[CopilotOffice] Starting new ${label} session (no saved session found)`);
               }
-              await window.copilotBridge.terminalStart(oid, agentId, agent?.workingDir || officeManager.getCurrentWorkingDirectory());
+              const result = await window.copilotBridge.terminalStart(
+                oid,
+                agentConfig.id,
+                agentConfig.workingDir || officeManager.getCurrentWorkingDirectory()
+              );
               console.log(`[CopilotOffice] ${label} session ready`);
+              if (DEBUG_COLD_START2) {
+                const sessionId = (result && result.sessionId) ?? "unknown";
+                const elapsedMs = Date.now() - startedAt;
+                console.log(
+                  `[OfficeScene] preStart agent=${agentConfig.id} sessionId=${sessionId} elapsedMs=${elapsedMs}`
+                );
+              }
             };
-            const agentsToStart = AGENTS.slice(0, 2);
-            await Promise.all(
-              agentsToStart.map((a) => startAgent(a.id, `${a.name} (${a.description})`))
+            const roster = getLayout(this.currentLayout).agents;
+            const agentsToStart = roster.length > 0 ? roster : AGENTS;
+            const results = await Promise.allSettled(
+              agentsToStart.map((a) => startAgent(a, `${a.name} (${a.description})`))
             );
+            for (let i = 0; i < results.length; i++) {
+              const r = results[i];
+              if (r.status === "rejected") {
+                console.warn(
+                  `[CopilotOffice] preStart failed for ${agentsToStart[i].id}: ${String(r.reason)}`
+                );
+              }
+            }
           }
         }
         update() {
@@ -153941,7 +154840,7 @@ WARNING: This link could potentially be dangerous`)) {
               }
             }
           }
-          if (import_phaser8.default.Input.Keyboard.JustDown(this.dismissKey) && this.currentLayout === "default") {
+          if (import_phaser8.default.Input.Keyboard.JustDown(this.dismissKey) && getLayout(this.currentLayout).behaviors.supportsReserveAgents) {
             const targetNPC = this.nearestNPC ?? (this.nearestDesk ? this.npcs.find((n) => n.config.id === this.nearestDesk.agentId) ?? null : null);
             if (targetNPC && !CORE_AGENT_IDS.has(targetNPC.config.id) && RESERVE_AGENT_DESK[targetNPC.config.id]) {
               this.dismissReserveAgent(targetNPC);
@@ -154129,7 +155028,7 @@ WARNING: This link could potentially be dangerous`)) {
         }
         startConversation(agent) {
           if (this.currentLayout === "fleet-vteam") {
-            if (agent.id !== "architect") return;
+            if (agent.id !== ARCHITECT_AGENT_ID) return;
             this.game.events.emit("agent:interact", agent.id);
             this.terminalOverlay.show(
               agent,
@@ -154139,7 +155038,7 @@ WARNING: This link could potentially be dangerous`)) {
             );
             return;
           }
-          if (agent.id === "architect") {
+          if (agent.id === ARCHITECT_AGENT_ID) {
             this.enterMeeting();
             return;
           }
@@ -154170,7 +155069,7 @@ WARNING: This link could potentially be dangerous`)) {
           );
         }
         openPlayerPcTerminal() {
-          if (this.currentLayout !== "default") return;
+          if (!getLayout(this.currentLayout).behaviors.hasPlayerPcTerminal) return;
           const workingDir = officeManager.getCurrentWorkingDirectory();
           const pcTerminalConfig = {
             id: PC_TERMINAL_ID,
@@ -154494,7 +155393,8 @@ WARNING: This link could potentially be dangerous`)) {
   var init_planParser = __esm({
     "src/meeting/planParser.ts"() {
       "use strict";
-      DEFAULT_VALID_AGENT_IDS = ["generalist", "debugger", "admin"];
+      init_agents();
+      DEFAULT_VALID_AGENT_IDS = DEFAULT_PLAN_AGENT_IDS;
     }
   });
 
@@ -154563,7 +155463,7 @@ WARNING: This link could potentially be dangerous`)) {
           this.inputManager = new InputManager(this);
           this.planApproval = new PlanApprovalOverlay();
           this.terminalOverlay = new TerminalOverlay(this, this.inputManager, () => officeManager.currentOfficeId || "office-0");
-          const arthur = AGENTS.find((a) => a.id === "architect");
+          const arthur = AGENTS.find((a) => a.id === ARCHITECT_AGENT_ID);
           if (arthur) {
             this.terminalOverlay.show(arthur, () => {
               console.log("[MeetingScene] Terminal closed");
@@ -154720,7 +155620,7 @@ WARNING: This link could potentially be dangerous`)) {
           if (typeof window === "undefined" || !window.copilotBridge) return;
           const handler = (_agentId, data) => {
             if (this.isExiting) return;
-            if (_agentId !== "architect") return;
+            if (_agentId !== ARCHITECT_AGENT_ID) return;
             this.terminalOutputBuffer += data;
             this.time.delayedCall(500, () => {
               if (this.isExiting) return;
@@ -154746,7 +155646,7 @@ WARNING: This link could potentially be dangerous`)) {
             onRevise: (feedback) => {
               console.log("[MeetingScene] Revision requested:", feedback);
               if (window.copilotBridge) {
-                window.copilotBridge.terminalWrite(officeManager.currentOfficeId || "office-0", "architect", feedback + "\r");
+                window.copilotBridge.terminalWrite(officeManager.currentOfficeId || "office-0", ARCHITECT_AGENT_ID, feedback + "\r");
               }
               this.meetingPlan = null;
               this.terminalOutputBuffer = "";
@@ -154859,6 +155759,14 @@ WARNING: This link could potentially be dangerous`)) {
             this.terminalOverlay?.hide();
           }
           this.inputManager?.destroy();
+          if (DEBUG_SPRITE_SERIOUS) {
+            console.log("[MeetingScene] shutdown destroying terminalOverlay");
+          }
+          try {
+            this.terminalOverlay?.destroy();
+          } catch (e) {
+            console.warn("[MeetingScene] shutdown overlay destroy failed", e);
+          }
           this.meetingPlan = null;
           this.terminalOutputBuffer = "";
           this.isExiting = false;
@@ -154889,6 +155797,7 @@ WARNING: This link could potentially be dangerous`)) {
   var init_ToastNotification = __esm({
     "src/ui/ToastNotification.ts"() {
       "use strict";
+      init_zIndex();
       MAX_VISIBLE = 3;
       AUTO_DISMISS_MS = 5e3;
       ANIMATION_MS = 300;
@@ -154905,7 +155814,7 @@ WARNING: This link could potentially be dangerous`)) {
       top: 80px;
       left: 16px;
       width: calc(50% - 32px);
-      z-index: 9000;
+      z-index: ${ZIndex.TOAST};
       pointer-events: none;
       display: flex;
       flex-direction: column;
@@ -155002,7 +155911,7 @@ WARNING: This link could potentially be dangerous`)) {
   // src/config/notifications.ts
   function loadNotificationSettings() {
     try {
-      const raw = localStorage.getItem(STORAGE_KEY2);
+      const raw = localStorage.getItem(STORAGE_KEY3);
       if (!raw) return structuredClone(DEFAULT_SETTINGS);
       const parsed = JSON.parse(raw);
       const merged = structuredClone(DEFAULT_SETTINGS);
@@ -155022,13 +155931,13 @@ WARNING: This link could potentially be dangerous`)) {
     }
   }
   function saveNotificationSettings(settings) {
-    localStorage.setItem(STORAGE_KEY2, JSON.stringify(settings));
+    localStorage.setItem(STORAGE_KEY3, JSON.stringify(settings));
   }
   function resetNotificationSettings() {
-    localStorage.removeItem(STORAGE_KEY2);
+    localStorage.removeItem(STORAGE_KEY3);
     return structuredClone(DEFAULT_SETTINGS);
   }
-  var NOTIFICATION_EVENT_LABELS, DEFAULT_SETTINGS, STORAGE_KEY2;
+  var NOTIFICATION_EVENT_LABELS, DEFAULT_SETTINGS, STORAGE_KEY3;
   var init_notifications = __esm({
     "src/config/notifications.ts"() {
       "use strict";
@@ -155088,7 +155997,7 @@ WARNING: This link could potentially be dangerous`)) {
           }
         }
       };
-      STORAGE_KEY2 = "copilot-notification-settings";
+      STORAGE_KEY3 = "copilot-notification-settings";
     }
   });
 
@@ -155189,6 +156098,8 @@ WARNING: This link could potentially be dangerous`)) {
     "src/ui/SettingsPanel.ts"() {
       "use strict";
       init_notifications();
+      init_agentAutoStart();
+      init_zIndex();
       ALL_EVENT_TYPES = [
         "turnEnd",
         "askUser",
@@ -155222,7 +156133,7 @@ WARNING: This link could potentially be dangerous`)) {
       position: fixed;
       inset: 0;
       background: rgba(0,0,0,0.6);
-      z-index: 20000;
+      z-index: ${ZIndex.SETTINGS};
       display: flex;
       align-items: center;
       justify-content: center;
@@ -155273,8 +156184,31 @@ WARNING: This link could potentially be dangerous`)) {
       </div>
 
       ${this.renderAudioSection()}
+      ${this.renderAgentsSection()}
       ${this.renderNotificationsSection()}
       ${this.renderAboutSection()}
+    `;
+        }
+        renderAgentsSection() {
+          const settings = getAgentAutoStartSettings();
+          return `
+      <div class="settings-section" style="margin-bottom: 20px;">
+        <h3 style="margin: 0 0 12px; font-size: 14px; color: #889; border-bottom: 1px solid #2a2a3e; padding-bottom: 8px;">
+          \u{1F916} Agents
+        </h3>
+        <label style="display: flex; align-items: center; gap: 10px; padding: 8px 0; cursor: pointer;">
+          <input
+            type="checkbox"
+            id="settings-agent-auto-start"
+            ${settings.autoStartKnownAgents ? "checked" : ""}
+            style="cursor: pointer; width: 15px; height: 15px;"
+          />
+          <span style="color: #aab; font-size: 13px;">Auto-start known agents</span>
+        </label>
+        <p style="margin: 4px 0 0 25px; font-size: 10px; color: #556;">
+          When ON, agents with a saved session resume automatically on launch, office switch, and New Session.
+        </p>
+      </div>
     `;
         }
         renderAudioSection() {
@@ -155423,8 +156357,16 @@ WARNING: This link could potentially be dangerous`)) {
         bindEvents(panel) {
           panel.querySelector("#settings-close-btn")?.addEventListener("click", () => this.close());
           this.bindAudioEvents(panel);
+          this.bindAgentsEvents(panel);
           this.bindNotificationEvents(panel);
         }
+        bindAgentsEvents(panel) {
+          const cb = panel.querySelector("#settings-agent-auto-start");
+          if (!cb) return;
+          cb.addEventListener("change", () => {
+            setAgentAutoStartSettings({ autoStartKnownAgents: cb.checked });
+          });
+        }
         bindAudioEvents(panel) {
           const muteBtn = panel.querySelector("#settings-bgm-mute-btn");
           const slider = panel.querySelector("#settings-bgm-slider");
@@ -155463,7 +156405,7 @@ WARNING: This link could potentially be dangerous`)) {
               settings.events[eventType].enabled = checkbox.checked;
             });
           });
-          panel.querySelectorAll('input[type="checkbox"]:not([data-field="enabled"])').forEach((checkbox) => {
+          panel.querySelectorAll('input[type="checkbox"][data-event]:not([data-field="enabled"])').forEach((checkbox) => {
             checkbox.addEventListener("change", () => {
               const eventType = checkbox.dataset.event;
               const field = checkbox.dataset.field;
@@ -155518,6 +156460,7 @@ WARNING: This link could potentially be dangerous`)) {
     "src/ui/SpriteCustomizerPanel.ts"() {
       "use strict";
       init_playerCustomization();
+      init_zIndex();
       COLOR_REGIONS = ["hair", "skin", "suit", "tie", "pants", "shoes"];
       SpriteCustomizerPanel = class {
         constructor(options) {
@@ -155526,15 +156469,18 @@ WARNING: This link could potentially be dangerous`)) {
           this.outsideClickHandler = null;
           this.escapeHandler = null;
           this.onColorsChanged = options.onColorsChanged;
+          this.onOpenCallback = options.onOpen;
+          this.onCloseCallback = options.onClose;
           this.currentColors = loadPlayerColors();
         }
         show(anchorElement) {
+          const wasOpen = this.container !== null;
           if (this.container) this.hide();
           this.currentColors = loadPlayerColors();
           this.container = document.createElement("div");
           this.container.style.cssText = `
       position: fixed;
-      z-index: 15000;
+      z-index: ${ZIndex.SPRITE_CUSTOMIZER};
       width: 320px;
       background: #1a1a2e;
       border: 2px solid #333;
@@ -155558,8 +156504,10 @@ WARNING: This link could potentially be dangerous`)) {
           }
           this.previewImg = this.container.querySelector("#sprite-preview-img");
           this.bindEvents();
+          if (!wasOpen) this.onOpenCallback?.();
         }
         hide() {
+          const wasOpen = this.container !== null;
           if (this.outsideClickHandler) {
             document.removeEventListener("mousedown", this.outsideClickHandler, true);
             this.outsideClickHandler = null;
@@ -155573,6 +156521,7 @@ WARNING: This link could potentially be dangerous`)) {
             this.container = null;
           }
           this.previewImg = null;
+          if (wasOpen) this.onCloseCallback?.();
         }
         toggle(anchorElement) {
           if (this.container) {
@@ -155746,6 +156695,12 @@ WARNING: This link could potentially be dangerous`)) {
       "use strict";
       import_xterm2 = __toESM(require_xterm());
       import_addon_fit2 = __toESM(require_addon_fit());
+      init_zIndex();
+      init_TerminalOverlay();
+      init_clipboardToast();
+      init_xtermStyles();
+      init_terminalWheel();
+      init_AutoStartCoordinator();
       SeriousTerminalController = class _SeriousTerminalController {
         constructor(host, options = {}) {
           this.historyPopover = null;
@@ -155761,6 +156716,15 @@ WARNING: This link could potentially be dangerous`)) {
           this.sessionId = null;
           this.activeOptions = null;
           this.isFullWidth = false;
+          this.terminalContextMenu = null;
+          this.terminalContextMenuDismiss = null;
+          this.seriousInstanceId = String(_SeriousTerminalController.nextSeriousId++);
+          // Spec 003 V13/V14: the onData callback registered on the xterm closes
+          // over the office/agent ids captured at openAgentTerminal time, not the
+          // live this.activeOfficeId/this.activeAgentId. Holding the disposable
+          // here lets the next open() drop the previous binding before installing
+          // a new one — exactly one live onData per controller at any moment.
+          this.onDataDisposable = null;
           this.host = host;
           this.onClose = options.onClose;
           this.isFullWidth = localStorage.getItem(_SeriousTerminalController.FULL_WIDTH_STORAGE_KEY) === "true";
@@ -155819,13 +156783,13 @@ WARNING: This link could potentially be dangerous`)) {
           this.terminalOuterEl.style.cssText = `
       flex: 1;
       min-height: 0;
-      overflow: hidden;
+      overflow: auto;
       background: #0d111b;
       padding: 10px;
       box-sizing: border-box;
     `;
           this.terminalDivEl = document.createElement("div");
-          this.terminalDivEl.style.cssText = "width: 100%; height: 100%; overflow: hidden;";
+          this.terminalDivEl.style.cssText = "width: 100%; height: 100%;";
           this.terminalOuterEl.appendChild(this.terminalDivEl);
           this.terminalOuterEl.addEventListener("mousedown", () => this.terminal?.focus());
           this.spriteCardEl = document.createElement("div");
@@ -155969,9 +156933,29 @@ WARNING: This link could potentially be dangerous`)) {
         static {
           this.FULL_WIDTH_STORAGE_KEY = "agencyOffice:seriousTerminalFullWidth";
         }
+        static {
+          this.nextSeriousId = 0;
+        }
         isVisible() {
           return this.visible;
         }
+        // Spec 008-smoke: expose active agent id for the e2e debug hook.
+        getActiveAgentId() {
+          return this.activeAgentId ?? null;
+        }
+        // Spec 008-smoke (T10): expose the visible sprite-card + session-id panel
+        // text so e2e tests can assert what the operator actually sees after agent
+        // switches. Used to repro the user-reported "locked to one agent" symptom.
+        getPanelSnapshot() {
+          return {
+            activeAgentId: this.activeAgentId ?? null,
+            titleText: this.titleEl.textContent ?? "",
+            spriteName: this.spriteNameEl.textContent ?? "",
+            spriteSubtitle: this.spriteSubtitleEl.textContent ?? "",
+            sessionIdText: this.sessionIdEl.textContent ?? "",
+            sessionIdField: this.sessionId ?? null
+          };
+        }
         refreshCardFromOverview() {
           if (!this.visible || !this.activeAgentId) return;
           this.renderExactOverviewCard(this.activeAgentId);
@@ -155989,15 +156973,51 @@ WARNING: This link could potentially be dangerous`)) {
           this.openedAt = Date.now();
           this.sessionId = null;
           this.container.style.display = "flex";
-          this.terminal.clear();
-          this.titleEl.textContent = `${options.name} (${options.agentId})`;
-          this.subtitleEl.textContent = options.description;
-          this.updateSpriteCard(options);
-          void this.updateSessionTitle(options.officeId, options.agentId);
-          this.updateSessionIdDisplay();
-          this.setStatus("Opening...");
-          this.applyPanelLayout();
-          this.refitAndResize(options.officeId, options.agentId);
+          try {
+            this.terminal.clear();
+            this.titleEl.textContent = `${options.name} (${options.agentId})`;
+            this.subtitleEl.textContent = options.description;
+            this.updateSpriteCard(options);
+            void this.updateSessionTitle(options.officeId, options.agentId);
+            this.updateSessionIdDisplay();
+            this.setStatus("Opening...");
+            this.applyPanelLayout();
+            this.refitAndResize(options.officeId, options.agentId);
+          } catch (err) {
+            const message = `serious-mode open failed during render: ${err?.message || String(err)}`;
+            try {
+              this.setStatus(message);
+            } catch {
+            }
+            try {
+              this.terminal.writeln(`\r
+[render error: ${message}]\r
+`);
+            } catch {
+            }
+            if (DEBUG_SPRITE_SERIOUS) {
+              console.log(
+                `[SeriousTerminalController] openAgentTerminal render failure (officeId=${options.officeId} agentId=${options.agentId}): ${message}`
+              );
+            } else {
+              console.warn("[SeriousTerminalController] openAgentTerminal render failure", err);
+            }
+          }
+          const boundOfficeId = options.officeId;
+          const boundAgentId = options.agentId;
+          try {
+            this.onDataDisposable?.dispose();
+          } catch {
+          }
+          this.onDataDisposable = this.terminal.onData((data) => {
+            if (!window.copilotBridge) return;
+            void window.copilotBridge.terminalWrite(boundOfficeId, boundAgentId, data);
+          });
+          if (DEBUG_SPRITE_SERIOUS) {
+            console.log(
+              `[SeriousTerminalController] onData rebound officeId=${boundOfficeId} agentId=${boundAgentId}`
+            );
+          }
           try {
             const exists = await window.copilotBridge.terminalExists(options.officeId, options.agentId);
             if (!exists) {
@@ -156049,6 +157069,21 @@ Terminal error: ${error?.message || String(error)}`);
         }
         async startNewSession(options) {
           if (!window.copilotBridge) return;
+          const coordinator = getAutoStartCoordinator();
+          if (coordinator) {
+            try {
+              await coordinator.replaceSession(options.officeId, options.agentId);
+            } catch (err) {
+              console.warn(
+                `[SeriousTerminalController] replaceSession failed for ${options.agentId}: ${err?.message || String(err)}`
+              );
+            }
+            const isCurrentView2 = this.visible && this.activeOfficeId === options.officeId && this.activeAgentId === options.agentId;
+            if (isCurrentView2) {
+              await this.openAgentTerminal(options);
+            }
+            return;
+          }
           try {
             await window.copilotBridge.resetSession(options.officeId, options.agentId);
           } catch {
@@ -156083,6 +157118,12 @@ Terminal error: ${error?.message || String(error)}`);
           }
           this.visible = false;
           this.container.style.display = "none";
+          this.hideTerminalContextMenu();
+          try {
+            this.onDataDisposable?.dispose();
+          } catch {
+          }
+          this.onDataDisposable = null;
           this.activeOfficeId = null;
           this.activeAgentId = null;
           this.activeOptions = null;
@@ -156208,7 +157249,7 @@ Terminal error: ${error?.message || String(error)}`);
       border-radius: 8px;
       box-shadow: 0 12px 28px rgba(0, 0, 0, 0.45);
       padding: 10px 12px;
-      z-index: 10003;
+      z-index: ${ZIndex.SERIOUS_TERMINAL};
       color: #c8d4ff;
       font-size: 12px;
       white-space: pre-wrap;
@@ -156244,17 +157285,166 @@ Terminal error: ${error?.message || String(error)}`);
         }
         copySessionId() {
           if (!this.sessionId) return;
-          navigator.clipboard.writeText(this.sessionId).then(() => {
+          void this.copyToClipboard(this.sessionId, "session").then((success) => {
             const original = this.sessionIdEl.textContent;
-            this.sessionIdEl.textContent = "Copied!";
-            this.sessionIdEl.style.color = "#61d394";
+            this.sessionIdEl.textContent = success ? "Copied!" : "Copy failed";
+            this.sessionIdEl.style.color = success ? "#61d394" : "#ff6b6b";
             setTimeout(() => {
               this.sessionIdEl.textContent = original;
               this.sessionIdEl.style.color = "#8ec3ff";
             }, 900);
-          }).catch(() => {
           });
         }
+        // Spec 006: diagnostic prefix so multi-instance and channel issues
+        // are visible in the toast UI without opening DevTools.
+        tag() {
+          return `[S${this.seriousInstanceId}]`;
+        }
+        // Spec 005 + 006: single canonical clipboard write path via Electron main.
+        // Diagnostic toast on every outcome.
+        async copyToClipboard(text, source = "live") {
+          const t = this.tag();
+          if (!text) {
+            showClipboardToast(`${t} empty selection`, "info");
+            return false;
+          }
+          const bridge = window.copilotBridge;
+          if (!bridge?.clipboardWriteText) {
+            try {
+              await navigator.clipboard.writeText(text);
+              showClipboardToast(`${t} OK ${text.length} (fallback)`, "success");
+              return true;
+            } catch {
+              showClipboardToast(`${t} no-bridge`, "error");
+              return false;
+            }
+          }
+          try {
+            const r = await bridge.clipboardWriteText(text);
+            if (r?.success === true) {
+              showClipboardToast(`${t} OK ${text.length} (verified)`, "success");
+              return true;
+            }
+            if (r?.verified === false) {
+              showClipboardToast(`${t} verify-fail (wrote=${text.length})`, "error");
+            } else {
+              showClipboardToast(`${t} bridge-err: ${r?.error || "unknown"}`, "error");
+            }
+            return false;
+          } catch (e) {
+            showClipboardToast(`${t} bridge-err: ${e?.message || "threw"}`, "error");
+            return false;
+          }
+        }
+        // Spec 005: read OS clipboard via Electron main, forward to PTY.
+        async pasteFromClipboardToTerminal() {
+          if (!this.activeOfficeId || !this.activeAgentId || !window.copilotBridge) return;
+          let text = "";
+          try {
+            const bridge = window.copilotBridge;
+            if (bridge?.clipboardReadText) {
+              const r = await bridge.clipboardReadText();
+              if (r?.success) text = r.text || "";
+            } else if (navigator.clipboard?.readText) {
+              text = await navigator.clipboard.readText();
+            }
+          } catch (e) {
+            showClipboardToast(`Paste failed: ${e?.message || "bridge threw"}`, "error");
+            return;
+          }
+          if (!text) {
+            showClipboardToast("Clipboard is empty", "info");
+            return;
+          }
+          try {
+            await window.copilotBridge.terminalWrite(this.activeOfficeId, this.activeAgentId, text);
+            showClipboardToast(`Pasted ${text.length} char${text.length === 1 ? "" : "s"}`, "success");
+          } catch (e) {
+            showClipboardToast(`Paste failed: ${e?.message || "terminalWrite threw"}`, "error");
+          }
+        }
+        /**
+         * Spec 004: terminal right-click context menu (Copy / Paste). Built once
+         * during attachTerminal, reused per right-click. Dismissed on outside
+         * mousedown or Escape.
+         */
+        installTerminalContextMenu() {
+          if (!this.terminal || !this.terminalDivEl) return;
+          const menu = document.createElement("div");
+          menu.id = "serious-terminal-context-menu";
+          menu.style.cssText = `
+      position: fixed;
+      display: none;
+      z-index: ${ZIndex.TERMINAL_SPRITE_CARD + 10};
+      min-width: 160px;
+      background: #1c1c2a;
+      border: 1px solid #3a3a55;
+      border-radius: 6px;
+      box-shadow: 0 6px 18px rgba(0, 0, 0, 0.55);
+      padding: 4px 0;
+      font-family: 'Cascadia Code', Consolas, monospace;
+      font-size: 13px;
+      color: #cfd0e0;
+      user-select: none;
+    `;
+          const makeItem = (label, onClick) => {
+            const item = document.createElement("div");
+            item.textContent = label;
+            item.style.cssText = `padding: 6px 14px; cursor: pointer;`;
+            item.dataset.enabled = "true";
+            item.addEventListener("mouseenter", () => {
+              if (item.dataset.enabled === "true") item.style.background = "#2a2a45";
+            });
+            item.addEventListener("mouseleave", () => {
+              item.style.background = "";
+            });
+            item.addEventListener("mousedown", (e) => {
+              e.preventDefault();
+              e.stopPropagation();
+            });
+            item.addEventListener("click", (e) => {
+              e.preventDefault();
+              e.stopPropagation();
+              if (item.dataset.enabled !== "true") return;
+              this.hideTerminalContextMenu();
+              onClick();
+            });
+            return item;
+          };
+          const copyItem = makeItem("Copy", () => {
+            const selection = this.terminal?.hasSelection() ? this.terminal.getSelection() ?? "" : "";
+            void this.copyToClipboard(selection, "live");
+          });
+          const pasteItem = makeItem("Paste", () => {
+            void this.pasteFromClipboardToTerminal();
+          });
+          menu.appendChild(copyItem);
+          menu.appendChild(pasteItem);
+          document.body.appendChild(menu);
+          this.terminalContextMenu = menu;
+          this.terminalDivEl.addEventListener("contextmenu", (event) => {
+            if (!this.visible) return;
+            event.preventDefault();
+            const vw = window.innerWidth;
+            const vh = window.innerHeight;
+            menu.style.display = "block";
+            const rect = menu.getBoundingClientRect();
+            const left = Math.min(event.clientX, vw - rect.width - 4);
+            const top = Math.min(event.clientY, vh - rect.height - 4);
+            menu.style.left = `${Math.max(0, left)}px`;
+            menu.style.top = `${Math.max(0, top)}px`;
+          });
+          this.terminalContextMenuDismiss = (e) => {
+            if (!this.terminalContextMenu || this.terminalContextMenu.style.display === "none") return;
+            if (e instanceof KeyboardEvent && e.key !== "Escape") return;
+            this.hideTerminalContextMenu();
+          };
+          document.addEventListener("mousedown", this.terminalContextMenuDismiss, true);
+          document.addEventListener("keydown", this.terminalContextMenuDismiss, true);
+        }
+        hideTerminalContextMenu() {
+          if (this.terminalContextMenu) this.terminalContextMenu.style.display = "none";
+        }
         renderAgentSprite(seed, baseColor) {
           const ctx = this.spriteCanvasEl.getContext("2d");
           if (!ctx) return;
@@ -156292,15 +157482,7 @@ Terminal error: ${error?.message || String(error)}`);
           return r << 16 | g << 8 | b;
         }
         ensureXtermStyles() {
-          if (document.getElementById("xterm-styles")) return;
-          const style = document.createElement("style");
-          style.id = "xterm-styles";
-          style.textContent = `
-      .xterm { height: 100%; }
-      .xterm-viewport { overflow-y: auto !important; }
-      #serious-terminal-container .xterm { height: 100%; }
-    `;
-          document.head.appendChild(style);
+          ensureXtermStyles();
         }
         createTerminal() {
           this.terminal = new import_xterm2.Terminal({
@@ -156323,28 +157505,43 @@ Terminal error: ${error?.message || String(error)}`);
           this.terminal.loadAddon(this.fitAddon);
           this.terminalDivEl.id = "serious-terminal-container";
           this.terminal.open(this.terminalDivEl);
+          const MOUSE_MODES = /* @__PURE__ */ new Set([1e3, 1002, 1003, 1006]);
+          this.terminal.parser.registerCsiHandler({ prefix: "?", final: "h" }, (params) => {
+            for (const p of params) {
+              if (typeof p === "number" && MOUSE_MODES.has(p)) return true;
+            }
+            return false;
+          });
+          this.terminal.attachCustomWheelEventHandler((event) => {
+            const term = this.terminal;
+            if (!term) return true;
+            if (term.buffer.active.type !== "alternate") return true;
+            const seq = wheelToPtySequence(event.deltaY);
+            if (!seq) return true;
+            if (this.activeOfficeId && this.activeAgentId && window.copilotBridge) {
+              void window.copilotBridge.terminalWrite(this.activeOfficeId, this.activeAgentId, seq);
+            }
+            return false;
+          });
+          this.installTerminalContextMenu();
           this.terminal.attachCustomKeyEventHandler((event) => {
             const isModifierPressed = event.ctrlKey || event.metaKey;
             const key = event.key.toLowerCase();
             if (event.type !== "keydown" || !isModifierPressed) return true;
             if (key === "c") {
-              const selectedText = this.terminal?.hasSelection() ? this.terminal.getSelection() : "";
-              if (!selectedText) {
+              const selection = this.terminal?.hasSelection() ? this.terminal.getSelection() ?? "" : "";
+              if (!selection) {
                 return true;
               }
               event.preventDefault();
               event.stopPropagation();
-              navigator.clipboard.writeText(selectedText).catch(() => {
-              });
+              void this.copyToClipboard(selection, "live");
               return false;
             }
             if (key === "v") {
               event.preventDefault();
               event.stopPropagation();
-              navigator.clipboard.readText().then((text) => {
-                if (text) this.terminal?.paste(text);
-              }).catch(() => {
-              });
+              void this.pasteFromClipboardToTerminal();
               return false;
             }
             if (key === "f") {
@@ -156355,9 +157552,7 @@ Terminal error: ${error?.message || String(error)}`);
             }
             return true;
           });
-          this.terminal.onData((data) => {
-            if (!window.copilotBridge || !this.activeOfficeId || !this.activeAgentId) return;
-            void window.copilotBridge.terminalWrite(this.activeOfficeId, this.activeAgentId, data);
+          this.terminal.onData((_data) => {
           });
           this.resizeHandler = () => {
             if (!this.visible || !this.activeOfficeId || !this.activeAgentId) return;
@@ -156443,6 +157638,48 @@ Terminal error: ${error?.message || String(error)}`);
     }
   });
 
+  // src/util/toolStatus.ts
+  function normalizeToolName(toolName) {
+    return (toolName ?? "").trim().toLowerCase().replace(/[\s-]+/g, "_");
+  }
+  function isAskUserTool(toolName, status) {
+    const normalized = normalizeToolName(toolName);
+    if (normalized === "ask_user" || normalized === "askuser") return true;
+    const statusText = (status ?? "").toLowerCase();
+    return statusText.includes("waiting for your answer") || statusText.includes("waiting on user input");
+  }
+  function nextSubStateAfterToolComplete(remainingTools) {
+    if (remainingTools.length === 0) return { kind: "idle" };
+    if (remainingTools.some((t) => isAskUserTool(t.name, t.status))) {
+      return { kind: "waiting" };
+    }
+    const last = remainingTools[remainingTools.length - 1];
+    return { kind: "thinking", detail: String(last.name ?? "") };
+  }
+  var init_toolStatus = __esm({
+    "src/util/toolStatus.ts"() {
+      "use strict";
+    }
+  });
+
+  // src/util/startupTimeoutGuard.ts
+  function decideStartupTimeoutTransition(inputs) {
+    if (inputs.subState !== "starting") return { kind: "no-transition" };
+    if (!inputs.activityStartTime) return { kind: "no-transition" };
+    if (inputs.now - inputs.activityStartTime <= inputs.timeoutMs) {
+      return { kind: "no-transition" };
+    }
+    if (inputs.serverAlive === true) {
+      return { kind: "recover-to-ready" };
+    }
+    return { kind: "transition-to-error", reason: "Startup timed out" };
+  }
+  var init_startupTimeoutGuard = __esm({
+    "src/util/startupTimeoutGuard.ts"() {
+      "use strict";
+    }
+  });
+
   // src/main.ts
   var require_main = __commonJS({
     "src/main.ts"() {
@@ -156453,6 +157690,7 @@ Terminal error: ${error?.message || String(error)}`);
       init_officeManager();
       init_agents();
       init_responsiveLayout();
+      init_zIndex();
       init_layouts();
       init_ToastNotification();
       init_NotificationService();
@@ -156460,7 +157698,12 @@ Terminal error: ${error?.message || String(error)}`);
       init_SpriteCustomizerPanel();
       init_SeriousTerminalController();
       init_SpriteGenerator();
+      init_toolStatus();
+      init_startupTimeoutGuard();
+      init_AutoStartCoordinator();
+      init_agentAutoStart();
       officeManager.ensureDefaultOffice();
+      recordOfficeAccess(officeManager.currentOfficeId);
       function getCurrentLayout() {
         return officeManager.currentOffice?.config.layout ?? "default";
       }
@@ -156478,15 +157721,6 @@ Terminal error: ${error?.message || String(error)}`);
           restoreSeatedReserveAgents(officeManager.getSeatedAgents(office.config.id));
         }
       }
-      function normalizeToolName(toolName) {
-        return (toolName ?? "").trim().toLowerCase().replace(/[\s-]+/g, "_");
-      }
-      function isAskUserTool(toolName, status) {
-        const normalized = normalizeToolName(toolName);
-        if (normalized === "ask_user" || normalized === "askuser") return true;
-        const statusText = (status ?? "").toLowerCase();
-        return statusText.includes("waiting for your answer") || statusText.includes("waiting on user input");
-      }
       function isDonePendingAck(status) {
         return !!status?.completionPendingAck;
       }
@@ -156500,6 +157734,25 @@ Terminal error: ${error?.message || String(error)}`);
       var SESSION_META_CACHE_STORAGE_KEY = "agencyOffice:sessionMetaCacheByOffice";
       var OVERVIEW_SPRITE_CACHE_STORAGE_KEY = "agencyOffice:overviewSpriteCache";
       var PC_TERMINAL_ID2 = "pc-terminal";
+      var OFFICE_SORT_STORAGE_KEY = "agencyOffice:officeSortMode";
+      var OFFICE_ACCESS_TIMES_KEY = "agencyOffice:officeAccessTimes";
+      var officeSortMode = localStorage.getItem(OFFICE_SORT_STORAGE_KEY) || "default";
+      function getOfficeAccessTimes() {
+        try {
+          const raw = localStorage.getItem(OFFICE_ACCESS_TIMES_KEY);
+          return raw ? JSON.parse(raw) : {};
+        } catch {
+          return {};
+        }
+      }
+      function recordOfficeAccess(officeId) {
+        const times = getOfficeAccessTimes();
+        times[officeId] = Date.now();
+        try {
+          localStorage.setItem(OFFICE_ACCESS_TIMES_KEY, JSON.stringify(times));
+        } catch {
+        }
+      }
       function sanitizeAppMode(value) {
         return value === "serious" ? "serious" : "game";
       }
@@ -156725,6 +157978,17 @@ Terminal error: ${error?.message || String(error)}`);
         if (previousMode === "serious" && appMode === "game") {
           void seriousTerminalController?.closeView({ detach: true, silent: true });
         }
+        if (previousMode === "game" && appMode === "serious") {
+          try {
+            const scene = phaserGameRef?.scene.getScene("OfficeScene");
+            const overlay = scene?.getTerminalOverlay?.();
+            if (overlay?.getIsVisible?.()) {
+              overlay.hide?.();
+            }
+          } catch (err) {
+            console.warn("[main] failed to hide game-mode terminal overlay on mode flip", err);
+          }
+        }
         if (appMode === "serious") {
           prewarmOverviewSpriteCacheFromTextures();
           teardownPhaserGame();
@@ -156763,9 +158027,86 @@ Terminal error: ${error?.message || String(error)}`);
       if (typeof window !== "undefined") {
         window.__copilotOfficeMobileModeActive = isMobileModeActive;
       }
+      if (typeof window !== "undefined" && window.__copilotOfficeE2E === true) {
+        installE2eDebugHook();
+      }
+      function installE2eDebugHook() {
+        const debugApi = {
+          getActiveMode: () => appMode,
+          setMode: (mode) => {
+            if (mode === appMode) return;
+            applyAppMode(mode, { persist: true, refreshTabs: true });
+          },
+          getCurrentOfficeId: () => officeManager.currentOfficeId,
+          listAgents: () => {
+            return getCurrentAgents().map((a) => ({
+              id: a.id,
+              name: a.name,
+              tileX: a.tileX,
+              tileY: a.tileY
+            }));
+          },
+          getActiveTerminalAgentId: () => {
+            if (appMode === "serious") {
+              return seriousTerminalController?.getActiveAgentId?.() ?? null;
+            }
+            const scene = phaserGameRef?.scene.getScene("OfficeScene");
+            const overlay = scene?.getTerminalOverlay?.();
+            if (!overlay || !overlay.getIsVisible()) return null;
+            return overlay.getActiveAgentId();
+          },
+          openAgentTerminal: async (agentId) => {
+            await openAgentTerminal(agentId);
+          },
+          closeActiveTerminal: async () => {
+            if (appMode === "serious") {
+              await seriousTerminalController?.closeView({ detach: true });
+              return;
+            }
+            const scene = phaserGameRef?.scene.getScene("OfficeScene");
+            scene?.getTerminalOverlay?.()?.hide();
+          },
+          switchOffice: (officeId) => {
+            switchToOffice(officeId);
+          },
+          getCachedSessionMetaForRender: () => {
+            return { ...cachedSessionMeta };
+          },
+          getSeriousPanelSnapshot: () => {
+            if (appMode !== "serious") return null;
+            const snap = seriousTerminalController?.getPanelSnapshot?.();
+            return snap ?? null;
+          },
+          getWarmedOfficeIds: () => autoStartCoordinator.warmedOffices.snapshot(),
+          getAutoStartTerminalStartCount: () => autoStartTerminalStartCount,
+          triggerAutoStartForCurrentOffice: () => autoStartCoordinator.tryWarmCurrentOffice(),
+          replaceAgentSession: (officeId, agentId) => autoStartCoordinator.replaceSession(officeId, agentId),
+          setAutoStartEnabled: (enabled) => {
+            setAgentAutoStartSettings({ autoStartKnownAgents: enabled });
+          },
+          getAutoStartEnabled: () => getAgentAutoStartSettings().autoStartKnownAgents,
+          clearWarmedOfficeRegistry: () => {
+            autoStartCoordinator.warmedOffices.clearAll();
+          },
+          getCurrentSessionIdForAgent: async (officeId, agentId) => {
+            if (!window.copilotBridge?.getSessionId) return null;
+            try {
+              return await window.copilotBridge.getSessionId(officeId, agentId);
+            } catch {
+              return null;
+            }
+          }
+        };
+        window.__copilotOfficeDebug = debugApi;
+        console.log("[main] Spec 008-smoke: __copilotOfficeDebug installed");
+      }
       function renderOfficeTabs() {
-        const offices = officeManager.getAllOffices();
+        let offices = officeManager.getAllOffices();
         const currentId = officeManager.currentOfficeId;
+        if (officeSortMode === "recent") {
+          const accessTimes = getOfficeAccessTimes();
+          offices = [...offices].sort((a, b) => (accessTimes[b.id] || 0) - (accessTimes[a.id] || 0));
+        }
         let html = "";
         for (const office of offices) {
           const isActive = office.id === currentId;
@@ -156976,6 +158317,7 @@ Terminal error: ${error?.message || String(error)}`);
         selectedAgentId = null;
         void seriousTerminalController?.closeView({ detach: true });
         officeManager.switchOffice(officeId);
+        recordOfficeAccess(officeId);
         cachedSessionMeta = getSessionMetaCacheForOffice(officeId);
         syncActiveRosterForCurrentOffice();
         phaserGameRef?.events.emit("office:switch", officeId, officeManager.currentOffice?.config.workingDirectory);
@@ -156984,6 +158326,7 @@ Terminal error: ${error?.message || String(error)}`);
         updateStatusBar();
         void reconnectAgentStatuses();
         fetchSessionMeta();
+        void autoStartCoordinator.tryWarmCurrentOffice();
         console.log(`[Office] Switched to office: ${officeManager.currentOffice?.config.name}`);
       }
       function showNewOfficeDialog() {
@@ -156991,7 +158334,7 @@ Terminal error: ${error?.message || String(error)}`);
         const overlay = document.createElement("div");
         overlay.style.cssText = `
     position: fixed; top: 0; left: 0; width: 100%; height: 100%;
-    background: rgba(0,0,0,0.7); z-index: 99999;
+    background: rgba(0,0,0,0.7); z-index: ${ZIndex.MODAL_DIALOG};
     display: flex; align-items: center; justify-content: center;
   `;
         const dialog = document.createElement("div");
@@ -157104,7 +158447,7 @@ Terminal error: ${error?.message || String(error)}`);
     min-width: 280px;
     font-family: 'Cascadia Code', Consolas, monospace;
     color: #eee;
-    z-index: 100000;
+    z-index: ${ZIndex.TOP_MODAL};
     box-shadow: 0 8px 24px rgba(0,0,0,0.5);
   `;
         const escapeHtml = (s) => s.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
@@ -157193,20 +158536,49 @@ Terminal error: ${error?.message || String(error)}`);
     <div id="terminal-title" style="font-size: 18px; font-weight: bold; color: #8af; margin-bottom: 4px;">\u{1F3E2} Office Overview</div>
     <div id="terminal-subtitle" style="font-size: 12px; color: #555;"></div>
   </div>
-  <button id="close-office-btn" style="
-    display: none;
-    padding: 6px 14px;
-    background: #cc3344;
-    color: #fff;
-    border: none;
-    border-radius: 4px;
-    font-family: 'Cascadia Code', Consolas, monospace;
-    font-size: 12px;
-    cursor: pointer;
-    white-space: nowrap;
-  ">\u2715 Close Office</button>
+  <div style="display: flex; align-items: center; gap: 8px;">
+    <button id="office-sort-btn" style="
+      padding: 6px 12px;
+      background: ${officeSortMode === "recent" ? "#2a3a5a" : "#252538"};
+      color: ${officeSortMode === "recent" ? "#8af" : "#666"};
+      border: 1px solid ${officeSortMode === "recent" ? "#4488ff" : "#444"};
+      border-radius: 4px;
+      font-family: 'Cascadia Code', Consolas, monospace;
+      font-size: 12px;
+      cursor: pointer;
+      white-space: nowrap;
+      transition: all 0.2s;
+    " title="Sort office tabs">\u21C5 ${officeSortMode === "recent" ? "Recent" : "Default"}</button>
+    <button id="close-office-btn" style="
+      display: none;
+      padding: 6px 14px;
+      background: #cc3344;
+      color: #fff;
+      border: none;
+      border-radius: 4px;
+      font-family: 'Cascadia Code', Consolas, monospace;
+      font-size: 12px;
+      cursor: pointer;
+      white-space: nowrap;
+    ">\u2715 Close Office</button>
+  </div>
 `;
       overviewHost.appendChild(overviewHeader);
+      document.getElementById("office-sort-btn").addEventListener("click", () => {
+        officeSortMode = officeSortMode === "default" ? "recent" : "default";
+        try {
+          localStorage.setItem(OFFICE_SORT_STORAGE_KEY, officeSortMode);
+        } catch {
+        }
+        renderOfficeTabs();
+        const sortBtn = document.getElementById("office-sort-btn");
+        if (sortBtn) {
+          sortBtn.textContent = `\u21C5 ${officeSortMode === "recent" ? "Recent" : "Default"}`;
+          sortBtn.style.background = officeSortMode === "recent" ? "#2a3a5a" : "#252538";
+          sortBtn.style.color = officeSortMode === "recent" ? "#8af" : "#666";
+          sortBtn.style.borderColor = officeSortMode === "recent" ? "#4488ff" : "#444";
+        }
+      });
       document.getElementById("close-office-btn").addEventListener("click", () => {
         const currentId = officeManager.currentOfficeId;
         const office = officeManager.currentOffice;
@@ -157244,7 +158616,7 @@ Terminal error: ${error?.message || String(error)}`);
   font-family: monospace;
   font-size: 16px;
   color: #888;
-  z-index: 100;
+  z-index: ${ZIndex.STATUS_BAR};
 `;
       document.body.appendChild(statusBar);
       var bgmMuted = localStorage.getItem("copilot-office-bgm-muted") !== "false";
@@ -157324,6 +158696,7 @@ Terminal error: ${error?.message || String(error)}`);
         seriousPlaceholder.style.display = "none";
       }
       async function openAgentTerminal(agentId) {
+        selectedAgentId = agentId;
         if (appMode === "game") {
           phaserGameRef?.events.emit("open:agent:terminal", agentId);
           return;
@@ -157353,6 +158726,80 @@ Terminal error: ${error?.message || String(error)}`);
           updateTerminalContent();
         }
       });
+      var autoStartTerminalStartCount = 0;
+      async function warmAgentSession(officeId, agentId) {
+        if (!window.copilotBridge) return;
+        const launchConfig = getSeriousLaunchConfig(agentId);
+        if (!launchConfig) return;
+        const workingDir = launchConfig.workingDir;
+        const launchMode = launchConfig.launchMode;
+        const officeStatus = officeManager.getAgentStatus(officeId, agentId);
+        if (officeStatus?.state === "slacking") {
+          officeManager.setAgentStarting(officeId, agentId);
+          phaserGameRef?.events.emit("agent:status:changed", agentId);
+          updateStatusBar();
+          updateTerminalContent();
+        }
+        autoStartTerminalStartCount += 1;
+        await window.copilotBridge.terminalStart(
+          officeId,
+          agentId,
+          workingDir,
+          void 0,
+          void 0,
+          void 0,
+          launchMode
+        );
+      }
+      function buildCanonicalAgentIdsForOffice(officeId) {
+        const office = officeManager.currentOfficeId === officeId ? officeManager.currentOffice : null;
+        if (office && officeManager.currentOfficeId === officeId) {
+          return getCurrentAgents().map((a) => a.id);
+        }
+        const layoutKey = officeManager.currentOffice?.config.layout ?? "default";
+        const layoutAgents = getLayout(layoutKey).agents.map((a) => a.id);
+        const customIds = (officeManager.currentOffice?.config.customAgents ?? []).map(
+          (a) => a.id
+        );
+        return Array.from(/* @__PURE__ */ new Set([...layoutAgents, ...customIds]));
+      }
+      var autoStartCoordinator = new AutoStartCoordinator({
+        getCurrentOfficeId: () => officeManager.currentOfficeId,
+        getCanonicalAgentIds: (oid) => buildCanonicalAgentIdsForOffice(oid),
+        getSessionMeta: async (oid) => {
+          if (!window.copilotBridge?.getAllSessionMeta) {
+            return officeManager.currentOfficeId === oid ? cachedSessionMeta : getSessionMetaCacheForOffice(oid);
+          }
+          try {
+            const fresh = await window.copilotBridge.getAllSessionMeta(oid);
+            return fresh || {};
+          } catch {
+            return officeManager.currentOfficeId === oid ? cachedSessionMeta : getSessionMetaCacheForOffice(oid);
+          }
+        },
+        getCurrentSessionId: async (oid, aid) => {
+          if (!window.copilotBridge?.getSessionId) return null;
+          try {
+            return await window.copilotBridge.getSessionId(oid, aid);
+          } catch {
+            return null;
+          }
+        },
+        getAgentLaunchConfig: (_oid, aid) => {
+          const cfg = getSeriousLaunchConfig(aid);
+          return {
+            workingDir: cfg?.workingDir ?? officeManager.getCurrentWorkingDirectory(),
+            launchMode: cfg?.launchMode ?? "copilot"
+          };
+        },
+        resetSession: async (oid, aid) => {
+          if (!window.copilotBridge) return;
+          await window.copilotBridge.resetSession(oid, aid);
+        },
+        warmAgentSession: (oid, aid) => warmAgentSession(oid, aid),
+        getSettings: () => getAgentAutoStartSettings()
+      });
+      setAutoStartCoordinator(autoStartCoordinator);
       var notificationService = new NotificationService(
         toastManager,
         (agentId) => {
@@ -157408,6 +158855,14 @@ Terminal error: ${error?.message || String(error)}`);
             const base64 = scene.textures.getBase64("player");
             spriteCustomizerPanel.updatePreview(base64);
           }
+        },
+        // Route focus through InputManager: reuse the settings:open / settings:close
+        // bus that OfficeScene already wires to suspendGameInput / resumeGameInput.
+        onOpen: () => {
+          phaserGameRef?.events.emit("settings:open");
+        },
+        onClose: () => {
+          phaserGameRef?.events.emit("settings:close");
         }
       });
       var lastTerminalContentHtml = "";
@@ -157593,10 +159048,27 @@ Terminal error: ${error?.message || String(error)}`);
             e.stopPropagation();
             const agentId = metaPanel.dataset.agent;
             if (!agentId) return;
+            const idBadge = target.closest(".session-id-badge");
+            if (idBadge) {
+              const fullId = idBadge.dataset.sessionId ?? idBadge.textContent?.trim() ?? "";
+              if (fullId) {
+                void navigator.clipboard?.writeText(fullId).catch(() => {
+                });
+                const original = idBadge.textContent;
+                idBadge.textContent = "\u2713 copied";
+                setTimeout(() => {
+                  if (idBadge) idBadge.textContent = original;
+                }, 700);
+              }
+              return;
+            }
             layout.clickHandler.handleMetaPanelClick(target, agentId, {
               startSessionMetaEdit,
               startNewSession: (id) => {
                 void startSessionFromOverview(id);
+              },
+              closeSession: (id) => {
+                void closeSessionFromOverview(id);
               }
             });
             return;
@@ -157656,6 +159128,25 @@ Terminal error: ${error?.message || String(error)}`);
         updateStatusBar();
         updateTerminalContent();
       }
+      async function closeSessionFromOverview(agentId) {
+        if (!window.copilotBridge) return;
+        const officeId = officeManager.currentOfficeId || "office-0";
+        try {
+          await window.copilotBridge.resetSession(officeId, agentId);
+        } catch (error) {
+          console.warn(`[Office] Failed to close session from overview for ${agentId}:`, error);
+          return;
+        }
+        const meta = cachedSessionMeta[agentId];
+        if (meta) {
+          cachedSessionMeta[agentId] = { ...meta, sessionId: void 0 };
+          setSessionMetaCacheForOffice(officeId, cachedSessionMeta);
+        }
+        officeManager.setAgentSlacking(officeId, agentId);
+        phaserGameRef?.events.emit("agent:status:changed", agentId);
+        updateStatusBar();
+        updateTerminalContent();
+      }
       function startSessionMetaEdit(agentId) {
         const panel = overviewHost.querySelector(`.session-meta-panel[data-agent="${agentId}"]`);
         if (!panel) return;
@@ -157731,11 +159222,11 @@ Terminal error: ${error?.message || String(error)}`);
             officeManager.setTaskSummary(officeId, agentId, status);
           }
           if (isAskUserTool(toolName, status)) {
-            officeManager.setAgentWaiting(officeId, agentId);
+            officeManager.setAgentWaiting(officeId, agentId, "ask_user");
             console.log(`[Office] Status: ${agentId} \u2192 waiting (ask_user)`);
             notifyAgent(agentId, "askUser");
           } else {
-            officeManager.setAgentThinking(officeId, agentId, `${toolName}`);
+            officeManager.setAgentThinking(officeId, agentId, `${toolName}`, "tool_start");
             console.log(`[Office] Status: ${agentId} \u2192 thinking (${toolName})`);
             notifyAgent(agentId, "toolStart", { toolName });
           }
@@ -157757,18 +159248,18 @@ Terminal error: ${error?.message || String(error)}`);
             officeManager.setLastCompletedAction(officeId, agentId, completedToolName);
             officeManager.pushRecentAction(officeId, agentId, completedToolName, "completed");
             notifyAgent(agentId, "toolComplete", { toolName: completedToolName });
-            if (remaining.length === 0) {
+            const next = nextSubStateAfterToolComplete(remaining);
+            if (next.kind === "idle") {
               const currentStatus = officeManager.getAgentStatus(officeId, agentId);
               if (currentStatus?.subState === "thinking") {
-                officeManager.setAgentThinking(officeId, agentId, currentStatus.thinkingDetail ?? "Processing...");
+                officeManager.setAgentThinking(officeId, agentId, currentStatus.thinkingDetail ?? "Processing...", "tool_complete_settling");
               } else {
-                officeManager.setAgentReady(officeId, agentId);
+                officeManager.setAgentReady(officeId, agentId, "tool_complete");
               }
-            } else if (remaining.some((t) => isAskUserTool(t.name, t.status))) {
-              officeManager.setAgentWaiting(officeId, agentId);
+            } else if (next.kind === "waiting") {
+              officeManager.setAgentWaiting(officeId, agentId, "ask_user_race_guard");
             } else {
-              const last = remaining[remaining.length - 1];
-              officeManager.setAgentThinking(officeId, agentId, `${last.name}`);
+              officeManager.setAgentThinking(officeId, agentId, next.detail, "tool_complete");
             }
           }
           phaserGameRef?.events.emit("agent:status:changed", agentId);
@@ -157787,9 +159278,9 @@ Terminal error: ${error?.message || String(error)}`);
               agentTools.set(agentId, []);
             }
             if (waitingToolActive) {
-              officeManager.setAgentWaiting(officeId, agentId);
+              officeManager.setAgentWaiting(officeId, agentId, "turn_end_ask_user_active");
             } else {
-              officeManager.setAgentDonePendingAck(officeId, agentId);
+              officeManager.setAgentDonePendingAck(officeId, agentId, "turn_end");
             }
             notifyAgent(agentId, "turnEnd");
           }
@@ -157843,10 +159334,10 @@ Terminal error: ${error?.message || String(error)}`);
             const current = officeManager.getAgentStatus(officeId, agentId);
             if (status === "preloading") {
               if (!current || current.state === "slacking") {
-                officeManager.setAgentStarting(officeId, agentId);
+                officeManager.setAgentStarting(officeId, agentId, "preload");
               }
             } else if (status === "ready") {
-              officeManager.setAgentReady(officeId, agentId);
+              officeManager.setAgentReady(officeId, agentId, "preload_ready");
               const agentTools = getCurrentAgentTools();
               if (agentTools.has(agentId)) {
                 agentTools.set(agentId, []);
@@ -157854,7 +159345,7 @@ Terminal error: ${error?.message || String(error)}`);
               notifyAgent(agentId, "sessionReady");
             } else if (status === "failed") {
               console.warn(`[Office] Preload FAILED for ${agentId}`);
-              officeManager.setAgentError(officeId, agentId, "Preload failed");
+              officeManager.setAgentError(officeId, agentId, "Preload failed", "preload_failed");
               notifyAgent(agentId, "sessionError");
             }
           }
@@ -157912,9 +159403,24 @@ Terminal error: ${error?.message || String(error)}`);
             const staleInTurnThinking = Boolean(
               current?.subState === "thinking" && thinkingSince && now - thinkingSince > STALE_IN_TURN_THINKING_TIMEOUT_MS && activeTools.length === 0
             );
-            if (current?.subState === "starting" && current.activityStartTime && now - current.activityStartTime > STARTING_TIMEOUT_MS) {
+            const decision = decideStartupTimeoutTransition({
+              subState: current?.subState,
+              activityStartTime: current?.activityStartTime,
+              now,
+              timeoutMs: STARTING_TIMEOUT_MS,
+              serverAlive: serverStatus?.alive
+            });
+            if (decision.kind === "recover-to-ready") {
+              console.warn(
+                `[Office] Agent ${agent.id} stuck in starting past timeout but PTY alive \u2014 recovering to ready`
+              );
+              officeManager.setAgentReady(officeId, agent.id);
+              changed = true;
+              continue;
+            }
+            if (decision.kind === "transition-to-error") {
               console.warn(`[Office] Agent ${agent.id} stuck in starting for >${STARTING_TIMEOUT_MS / 1e3}s \u2014 transitioning to error`);
-              officeManager.setAgentError(officeId, agent.id, "Startup timed out");
+              officeManager.setAgentError(officeId, agent.id, decision.reason);
               changed = true;
               continue;
             }
@@ -158116,7 +159622,7 @@ Terminal error: ${error?.message || String(error)}`);
       setupTerminalClickHandler();
       function onAgentSessionClosed(agentId) {
         const officeId = officeManager.currentOfficeId;
-        if (officeId) officeManager.setAgentSlacking(officeId, agentId);
+        if (officeId) officeManager.setAgentSlacking(officeId, agentId, "session_closed");
         phaserGameRef?.events.emit("agent:status:changed", agentId);
         updateTerminalContent();
         updateStatusBar();
@@ -158133,7 +159639,7 @@ Terminal error: ${error?.message || String(error)}`);
         console.log(`[Office] Fleet V-Team office created: ${officeId} (source: ${sourceOfficeId ?? "none"})`);
         if (sourceOfficeId && window.copilotBridge?.transferSession) {
           try {
-            const result = await window.copilotBridge.transferSession(sourceOfficeId, officeId, "architect");
+            const result = await window.copilotBridge.transferSession(sourceOfficeId, officeId, ARCHITECT_AGENT_ID);
             console.log(`[Office] Arthur session transfer: ${result.success ? "OK" : result.error ?? "failed"}`);
           } catch (e) {
             console.warn("[Office] Failed to transfer Arthur session:", e);
@@ -158151,7 +159657,7 @@ Terminal error: ${error?.message || String(error)}`);
         console.log(`[Fleet] Created fleet office: ${officeId}`);
         if (window.copilotBridge?.transferSession) {
           try {
-            const result = await window.copilotBridge.transferSession(data.sourceOfficeId, officeId, "architect");
+            const result = await window.copilotBridge.transferSession(data.sourceOfficeId, officeId, ARCHITECT_AGENT_ID);
             console.log(`[Fleet] Arthur session transfer: ${result.success ? "OK" : "failed"}`, result);
           } catch (e) {
             console.warn("[Fleet] Failed to transfer Arthur session:", e);
@@ -158225,6 +159731,7 @@ Terminal error: ${error?.message || String(error)}`);
           scene: [BootScene, OfficeScene, MeetingScene]
         });
         phaserGameRef = game;
+        window.__phaserGame = game;
         bindPhaserEventListeners(game);
       }
       function teardownPhaserGame() {
@@ -158236,9 +159743,18 @@ Terminal error: ${error?.message || String(error)}`);
         } catch (error) {
           console.warn("[main] Failed to destroy Phaser game cleanly:", error);
         }
+        delete window.__phaserGame;
         officePanel.innerHTML = "";
       }
       bindOfficePanelListeners();
+      officeManager.onOfficesUpdated = () => {
+        syncActiveRosterForCurrentOffice();
+        renderOfficeTabs();
+        fetchSessionMeta();
+        updateTerminalContent();
+        updateStatusBar();
+        void autoStartCoordinator.tryWarmCurrentOffice();
+      };
       window.addEventListener("focus", () => {
         catchUpStatusViews("window focus");
       });