copilotoffice 2.1.0 → 2.3.0

package/dist/game.bundle.js

@@ -141772,23 +141772,173 @@ var CopilotOffice = (() => {
     }
   });
 
+  // src/config/agentStatusPresentation.ts
+  function resolveStatusKey(status) {
+    if (!status || status.state === "slacking") return "slacking";
+    switch (status.subState) {
+      case "starting":
+        return "starting";
+      case "ready":
+        return status.completionPendingAck ? "done" : "ready";
+      case "waiting":
+        return "waiting";
+      case "thinking":
+        return "thinking";
+      case "error":
+        return "error";
+      default:
+        return "slacking";
+    }
+  }
+  function computeStall(status, now = Date.now()) {
+    if (!status || !status.activityStartTime) return NOT_STALLED;
+    const key = resolveStatusKey(status);
+    const pres = STATUS_PRESENTATION[key];
+    if (!pres.isActive || key === "error") return NOT_STALLED;
+    if (now - status.activityStartTime < STALL_THRESHOLD_MS) return NOT_STALLED;
+    return {
+      isStalled: true,
+      stallColorHex: STALL_COLOR_HEX,
+      stallColorNum: STALL_COLOR_NUM,
+      stallStrokeNum: STALL_STROKE_NUM
+    };
+  }
+  function describeActivity(status) {
+    if (!status) return "";
+    const key = resolveStatusKey(status);
+    if (key !== "waiting" && key !== "starting") return "";
+    const detail = status.thinkingDetail?.trim();
+    if (detail) return detail;
+    const tool = status.currentTool?.trim();
+    if (tool) return friendlyToolName(tool);
+    return key === "waiting" ? "Waiting for your answer" : "Working\u2026";
+  }
+  function friendlyToolName(tool) {
+    const normalized = tool.trim().toLowerCase();
+    const map = {
+      ask_user: "Waiting for your answer",
+      edit: "Editing a file",
+      create: "Creating a file",
+      view: "Reading a file",
+      grep: "Searching",
+      glob: "Finding files",
+      powershell: "Running a command",
+      bash: "Running a command"
+    };
+    return map[normalized] ?? tool;
+  }
+  function formatElapsedMmSs(startTime, now = Date.now()) {
+    if (!startTime) return "";
+    const totalSeconds = Math.max(0, Math.floor((now - startTime) / 1e3));
+    const minutes = Math.floor(totalSeconds / 60);
+    const seconds = totalSeconds % 60;
+    return `${minutes}:${seconds.toString().padStart(2, "0")}`;
+  }
+  var STATUS_PRESENTATION, STALL_THRESHOLD_MS, STALL_COLOR_HEX, STALL_COLOR_NUM, STALL_STROKE_NUM, NOT_STALLED;
+  var init_agentStatusPresentation = __esm({
+    "src/config/agentStatusPresentation.ts"() {
+      "use strict";
+      STATUS_PRESENTATION = {
+        slacking: {
+          key: "slacking",
+          label: "Slacking",
+          shortLabel: "Slacking",
+          colorHex: "#555555",
+          colorNum: 5592405,
+          strokeNum: 6710886,
+          icon: "\u{1F4A4}",
+          badgeAnimation: "none",
+          isActive: false
+        },
+        starting: {
+          key: "starting",
+          label: "Starting\u2026",
+          shortLabel: "Starting",
+          colorHex: "#ff9944",
+          colorNum: 16750916,
+          strokeNum: 16759654,
+          icon: "\u{1F680}",
+          badgeAnimation: "pulse",
+          isActive: true
+        },
+        ready: {
+          key: "ready",
+          label: "Ready",
+          shortLabel: "Ready",
+          colorHex: "#ffffff",
+          colorNum: 16777215,
+          strokeNum: 14540253,
+          icon: "\u{1F4ED}",
+          badgeAnimation: "none",
+          isActive: false
+        },
+        done: {
+          key: "done",
+          label: "Done",
+          shortLabel: "Done",
+          colorHex: "#4a78ff",
+          colorNum: 4880639,
+          strokeNum: 7049471,
+          icon: "\u{1F4EC}",
+          badgeAnimation: "none",
+          isActive: false
+        },
+        waiting: {
+          key: "waiting",
+          label: "Waiting for input",
+          shortLabel: "Waiting",
+          colorHex: "#ffb86c",
+          colorNum: 16758892,
+          strokeNum: 16764040,
+          icon: "\u23F3",
+          badgeAnimation: "none",
+          isActive: true
+        },
+        thinking: {
+          key: "thinking",
+          label: "Thinking\u2026",
+          shortLabel: "Thinking\u2026",
+          colorHex: "#50fa7b",
+          colorNum: 5307003,
+          strokeNum: 6750105,
+          icon: "\u{1F9E0}",
+          badgeAnimation: "pulse",
+          isActive: true
+        },
+        error: {
+          key: "error",
+          label: "Error",
+          shortLabel: "Error",
+          colorHex: "#ff4444",
+          colorNum: 16729156,
+          strokeNum: 16737894,
+          icon: "\u274C",
+          badgeAnimation: "none",
+          isActive: true
+        }
+      };
+      STALL_THRESHOLD_MS = 6e4;
+      STALL_COLOR_HEX = "#ffb020";
+      STALL_COLOR_NUM = 16756768;
+      STALL_STROKE_NUM = 16762967;
+      NOT_STALLED = {
+        isStalled: false,
+        stallColorHex: STALL_COLOR_HEX,
+        stallColorNum: STALL_COLOR_NUM,
+        stallStrokeNum: STALL_STROKE_NUM
+      };
+    }
+  });
+
   // src/entities/NPC.ts
-  var import_phaser3, BADGE_COLORS, NPC;
+  var import_phaser3, NPC;
   var init_NPC = __esm({
     "src/entities/NPC.ts"() {
       "use strict";
       import_phaser3 = __toESM(require_phaser());
       init_depths();
+      init_agentStatusPresentation();
       init_DirectionalSprite();
-      BADGE_COLORS = {
-        slacking: { fill: 5592405, stroke: 6710886 },
-        starting: { fill: 16750916, stroke: 16759654 },
-        ready: { fill: 16777215, stroke: 14540253 },
-        done: { fill: 4880639, stroke: 7049471 },
-        waiting: { fill: 16758892, stroke: 16764040 },
-        thinking: { fill: 5307003, stroke: 6750105 },
-        error: { fill: 16729156, stroke: 16737894 }
-      };
       NPC = class extends import_phaser3.default.Physics.Arcade.Sprite {
         constructor(scene, config, tileSize, spriteScale = 1) {
           const x = config.position.x * tileSize + tileSize / 2;
@@ -141797,6 +141947,8 @@ var CopilotOffice = (() => {
           this._isHighlighted = false;
           this.highlightTween = null;
           this.badgePulseTween = null;
+          this.stallTween = null;
+          this.isStalled = false;
           this.isNearPlayer = false;
           this.hasActiveSession = false;
           this.currentBadgeState = "slacking";
@@ -141862,13 +142014,19 @@ var CopilotOffice = (() => {
           this.sessionBadge.setPosition(x + 16 * spriteScale, y - 24 * spriteScale);
           this.sessionBadge.setDepth(Depths.BADGES);
           this.updateSessionBadge(spriteScale);
-          this.sessionText = scene.add.text(x + 16 * spriteScale, y - 24 * spriteScale, "\u{1F4A4}", {
+          this.sessionText = scene.add.text(x + 16 * spriteScale, y - 24 * spriteScale, STATUS_PRESENTATION.slacking.icon, {
             font: `bold ${badgeFontSize * 4}px monospace`,
             color: "#ffffff"
           });
           this.sessionText.setOrigin(0.5, 0.5);
           this.sessionText.setVisible(true);
           this.sessionText.setDepth(Depths.BADGES + 1);
+          this.stallRing = scene.add.graphics();
+          this.stallRing.setPosition(x + 16 * spriteScale, y - 24 * spriteScale);
+          this.stallRing.setDepth(Depths.BADGES + 2);
+          this.stallRing.setVisible(false);
+          this.stallRing.lineStyle(2.5, 16756768, 0.95);
+          this.stallRing.strokeCircle(0, 0, 20 * spriteScale);
           this.indicator = scene.add.sprite(x, y - 48 * spriteScale, "indicator");
           this.indicator.setScale(0.6 * spriteScale);
           this.indicator.setVisible(false);
@@ -141887,10 +142045,11 @@ var CopilotOffice = (() => {
         updateSessionBadge(scale = 1) {
           this.sessionBadge.clear();
           const stateKey = this.currentBadgeState;
-          const colors = BADGE_COLORS[stateKey] || BADGE_COLORS.slacking;
-          this.sessionBadge.fillStyle(colors.fill, stateKey === "slacking" ? 0.7 : 1);
+          const pres = STATUS_PRESENTATION[stateKey] ?? STATUS_PRESENTATION.slacking;
+          const isSlacking = stateKey === "slacking";
+          this.sessionBadge.fillStyle(pres.colorNum, isSlacking ? 0.7 : 1);
           this.sessionBadge.fillCircle(0, 0, 16 * scale);
-          this.sessionBadge.lineStyle(2, colors.stroke, stateKey === "slacking" ? 0.5 : 1);
+          this.sessionBadge.lineStyle(2, pres.strokeNum, isSlacking ? 0.5 : 1);
           this.sessionBadge.strokeCircle(0, 0, 16 * scale);
         }
         _drawHighlightRing(color, scale) {
@@ -141957,8 +142116,9 @@ var CopilotOffice = (() => {
         setHasActiveSession(hasSession, messageCount) {
           this.hasActiveSession = hasSession;
           if (!hasSession) {
+            this.setStalled(false);
             this.updateBadgeForState("slacking");
-            this.sessionText.setText("\u{1F4A4}");
+            this.sessionText.setText(STATUS_PRESENTATION.slacking.icon);
             if (!this.badgeHidden) {
               this.sessionText.setVisible(true);
             }
@@ -141978,6 +142138,7 @@ var CopilotOffice = (() => {
           this.badgeHidden = !visible;
           this.sessionBadge.setVisible(visible);
           this.sessionText.setVisible(visible);
+          this.stallRing.setVisible(visible && this.isStalled);
         }
         /** Toggle visibility of name and description labels. */
         setLabelsVisible(visible) {
@@ -141988,29 +142149,57 @@ var CopilotOffice = (() => {
         updateAgentStatus(status) {
           if (!status || status.state === "slacking") {
             this.hasActiveSession = false;
+            this.setStalled(false);
             this.updateBadgeForState("slacking");
-            this.sessionText.setText("\u{1F4A4}");
+            this.sessionText.setText(STATUS_PRESENTATION.slacking.icon);
             if (!this.badgeHidden) {
               this.sessionText.setVisible(true);
             }
             return;
           }
           this.hasActiveSession = true;
-          const stateKey = status.subState === "ready" && status.completionPendingAck ? "done" : status.subState || "ready";
+          const stateKey = resolveStatusKey(status);
           this.updateBadgeForState(stateKey);
-          const icons = {
-            starting: "\u{1F680}",
-            ready: "\u{1F4ED}",
-            done: "\u{1F4EC}",
-            waiting: "\u23F3",
-            thinking: "\u{1F9E0}",
-            error: "\u274C"
-          };
-          this.sessionText.setText(icons[stateKey] || "");
+          this.sessionText.setText(STATUS_PRESENTATION[stateKey].icon || "");
           if (!this.badgeHidden) {
             this.sessionText.setVisible(stateKey !== "slacking");
           }
         }
+        /**
+         * FR-013: toggle the ~60s stall treatment. Shows an amber ring on a slower,
+         * "laboring" pulse cadence (distinct from the normal in-progress pulse and
+         * from the error state). Clearing it restores the badge to normal. Idempotent.
+         */
+        setStalled(on2) {
+          if (this.isStalled === on2) return;
+          this.isStalled = on2;
+          if (this.stallTween) {
+            this.stallTween.stop();
+            this.stallTween = null;
+          }
+          if (on2) {
+            this.stallRing.setScale(1);
+            this.stallRing.setAlpha(1);
+            this.stallRing.setVisible(!this.badgeHidden);
+            this.stallTween = this.scene.tweens.add({
+              targets: this.stallRing,
+              scaleX: { from: 0.85, to: 1.18 },
+              scaleY: { from: 0.85, to: 1.18 },
+              alpha: { from: 0.55, to: 1 },
+              duration: 1100,
+              yoyo: true,
+              repeat: -1,
+              ease: "Sine.easeInOut"
+            });
+          } else {
+            this.stallRing.setScale(1);
+            this.stallRing.setVisible(false);
+          }
+        }
+        /** True while the stall treatment is active (test/inspection aid). */
+        get stalled() {
+          return this.isStalled;
+        }
         updateBadgeForState(stateKey) {
           if (this.currentBadgeState === stateKey) return;
           this.currentBadgeState = stateKey;
@@ -142020,7 +142209,8 @@ var CopilotOffice = (() => {
           }
           this.sessionBadge.setScale(1);
           this.updateSessionBadge(this.spriteScale);
-          if (stateKey === "thinking" || stateKey === "starting") {
+          const pres = STATUS_PRESENTATION[stateKey];
+          if (pres?.badgeAnimation === "pulse") {
             this.badgePulseTween = this.scene.tweens.add({
               targets: this.sessionBadge,
               scaleX: { from: 0.925, to: 1.075 },
@@ -142084,6 +142274,7 @@ var CopilotOffice = (() => {
           this.descriptionLabel.setPosition(x, y - 28 * s15);
           this.sessionBadge.setPosition(x + 16 * s15, y - 24 * s15);
           this.sessionText.setPosition(x + 16 * s15, y - 24 * s15);
+          this.stallRing.setPosition(x + 16 * s15, y - 24 * s15);
           this.indicator.setPosition(x, this.indicator.y);
           this.highlightGlow.setPosition(x, y);
           this.highlightRing.setPosition(x, y);
@@ -142096,6 +142287,7 @@ var CopilotOffice = (() => {
           this.highlightRing.destroy();
           this.sessionBadge.destroy();
           this.sessionText.destroy();
+          this.stallRing.destroy();
           super.destroy(fromScene);
         }
       };
@@ -151349,6 +151541,12 @@ ${h2.join(`
       if (cfg.teamsChannelUrl !== void 0) {
         normalized.teamsChannelUrl = cfg.teamsChannelUrl;
       }
+      if (cfg.teamsMentionType !== void 0) {
+        normalized.teamsMentionType = cfg.teamsMentionType;
+      }
+      if (cfg.teamsMentionValue !== void 0) {
+        normalized.teamsMentionValue = cfg.teamsMentionValue;
+      }
       offices.push(normalized);
     }
     let currentOfficeId = null;
@@ -151536,6 +151734,8 @@ ${h2.join(`
           if (updates.workingDirectory !== void 0) office.config.workingDirectory = updates.workingDirectory;
           if (updates.layout !== void 0) office.config.layout = updates.layout;
           if (updates.teamsChannelUrl !== void 0) office.config.teamsChannelUrl = updates.teamsChannelUrl;
+          if (updates.teamsMentionType !== void 0) office.config.teamsMentionType = updates.teamsMentionType;
+          if (updates.teamsMentionValue !== void 0) office.config.teamsMentionValue = updates.teamsMentionValue;
           this.saveToStorage();
           this.onOfficesUpdated?.();
           return true;
@@ -151637,7 +151837,7 @@ ${h2.join(`
           if (currentOfficeId && this.offices.has(currentOfficeId)) {
             this._currentOfficeId = currentOfficeId;
           } else if (this.offices.size > 0) {
-            this._currentOfficeId = this.offices.keys().next().value;
+            this._currentOfficeId = this.offices.keys().next().value ?? null;
           }
         }
         // Agent status helpers
@@ -151768,7 +151968,7 @@ ${h2.join(`
           status.thinkingDetail = detail;
           const office = this.offices.get(officeId);
           const tools = office?.agentTools.get(agentId);
-          status.currentTool = tools?.length ? tools[tools.length - 1].name : null;
+          status.currentTool = tools?.length ? tools[tools.length - 1].name ?? null : null;
           status.completionPendingAck = false;
           if (!status.activityStartTime) status.activityStartTime = Date.now();
           this.emitLifecycleTransition(officeId, agentId, status, from, reason, detail ?? void 0);
@@ -151867,7 +152067,7 @@ ${h2.join(`
     document.body.appendChild(el2);
     return el2;
   }
-  function showClipboardToast(message, kind = "info") {
+  function showClipboardToast(message, kind = "info", durationMs = TOAST_DURATION_MS) {
     const el2 = ensureToastElement();
     if (!el2) return;
     el2.textContent = message;
@@ -151876,7 +152076,7 @@ ${h2.join(`
     if (dismissTimer) clearTimeout(dismissTimer);
     dismissTimer = setTimeout(() => {
       el2.style.opacity = "0";
-    }, TOAST_DURATION_MS);
+    }, durationMs);
   }
   var TOAST_ID, TOAST_DURATION_MS, dismissTimer, KIND_BG;
   var init_clipboardToast = __esm({
@@ -152539,6 +152739,7 @@ ${h2.join(`
           this.wheelPager = new WheelPager();
           this.resizeObserver = null;
           this.refitTimers = [];
+          this.refitRaf = null;
           this.refitGeneration = 0;
           this.attachedOfficeId = null;
           this.isReadOnly = false;
@@ -152554,6 +152755,14 @@ ${h2.join(`
           // 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;
+          // Unsubscribe functions for the bridge IPC listeners this overlay owns
+          // (terminal-data, terminal-exit, session-meta-updated). Disposed and
+          // re-created on every setupTerminalListeners() call so an overlay can never
+          // accumulate duplicate listeners — duplicates would write each PTY byte to
+          // xterm more than once (the "double characters" bug).
+          this.bridgeListenerDisposers = [];
+          // Teams status listener has no disposer on the bridge; bind it at most once.
+          this.teamsListenerBound = false;
           // Toggled while show() is awaiting detach/attach so onData cannot fire input
           // against a half-attached agent (feature 002, V5).
           this.isSwitchingAgent = false;
@@ -152582,35 +152791,50 @@ ${h2.join(`
         }
         setupTerminalListeners() {
           if (typeof window !== "undefined" && window.copilotBridge) {
-            window.copilotBridge.onTerminalData((agentId, data) => {
-              if (this.isReplaying) return;
-              if (agentId === this.currentAgentId && this.terminal) {
-                this.terminal.write(data);
+            for (const dispose of this.bridgeListenerDisposers) {
+              try {
+                dispose();
+              } catch {
               }
-            });
-            window.copilotBridge.onTerminalExit((agentId, exitCode) => {
-              if (agentId === this.currentAgentId && this.terminal) {
-                this.terminal.writeln(`\r
+            }
+            this.bridgeListenerDisposers = [];
+            this.bridgeListenerDisposers.push(
+              window.copilotBridge.onTerminalData((agentId, data) => {
+                if (this.isReplaying) return;
+                if (agentId === this.currentAgentId && this.terminal) {
+                  this.terminal.write(data);
+                }
+              })
+            );
+            this.bridgeListenerDisposers.push(
+              window.copilotBridge.onTerminalExit((agentId, exitCode) => {
+                if (agentId === this.currentAgentId && this.terminal) {
+                  this.terminal.writeln(`\r
 [Process exited with code ${exitCode}]`);
-              }
-            });
-            window.copilotBridge.onSessionMetaUpdated((agentId, meta) => {
-              if (agentId === this.currentAgentId) {
-                this.updateSessionTitleDisplay(meta?.title || null);
-              }
-            });
-            window.copilotBridge.onTeamsStatusChanged?.((status) => {
-              if (status?.agentId === this.currentAgentId) {
-                this.setTeamsButtonState(!!status.online);
-              }
-            });
+                }
+              })
+            );
+            this.bridgeListenerDisposers.push(
+              window.copilotBridge.onSessionMetaUpdated((agentId, meta) => {
+                if (agentId === this.currentAgentId) {
+                  this.updateSessionTitleDisplay(meta?.title || null);
+                }
+              })
+            );
+            if (!this.teamsListenerBound) {
+              window.copilotBridge.onTeamsStatusChanged?.((status) => {
+                if (status?.agentId === this.currentAgentId) {
+                  this.setTeamsButtonState(!!status.online);
+                }
+              });
+              this.teamsListenerBound = true;
+            }
           }
         }
         /**
-         * Re-register IPC listeners that may have been removed by another scene's
-         * cleanup (e.g. MeetingScene calling removeTerminalListeners()).
-         * Safe to call multiple times — additive listeners are fine because they
-         * all guard on `this.currentAgentId`.
+         * Re-register this overlay's IPC listeners. setupTerminalListeners() is
+         * idempotent (it disposes prior registrations first), so calling this after
+         * returning from another scene cannot create duplicate listeners.
          */
         reattachListeners() {
           this.setupTerminalListeners();
@@ -152626,6 +152850,10 @@ ${h2.join(`
           return this.attachedOfficeId ?? this.getOfficeId();
         }
         clearRefitTimers() {
+          if (this.refitRaf !== null) {
+            cancelAnimationFrame(this.refitRaf);
+            this.refitRaf = null;
+          }
           for (const timer of this.refitTimers) {
             clearTimeout(timer);
           }
@@ -152724,7 +152952,7 @@ ${h2.join(`
           const dims = this.resolveTerminalDimensions();
           if (!dims) return null;
           const agentId = options?.agentId ?? this.currentAgentId;
-          if (!agentId || !window.copilotBridge) return dims;
+          if (!agentId || typeof window === "undefined" || !window.copilotBridge) return dims;
           const officeId = options?.officeId ?? this.getActiveOfficeId();
           void window.copilotBridge.terminalResize(officeId, agentId, dims.cols, dims.rows).catch(() => {
           });
@@ -152837,6 +153065,7 @@ ${h2.join(`
           if (previousAgentId && previousAgentId !== agent.id) {
             this.acknowledgeCompletedWork(previousOfficeId, previousAgentId);
           }
+          this.acknowledgeCompletedWork(nextOfficeId, agent.id);
           if (isSwitchingAgent && previousAgentId && window.copilotBridge) {
             this.isSwitchingAgent = true;
             this.onDataDisposable?.dispose();
@@ -152948,7 +153177,7 @@ ${h2.join(`
               } else {
                 this.fitAndResizeTerminal({ officeId, agentId: agent.id });
                 const attachResult = await withTimeout(
-                  window.copilotBridge.terminalAttach(officeId, agent.id),
+                  window.copilotBridge.terminalAttach(officeId, agent.id, true),
                   IPC_TIMEOUT,
                   "terminalAttach"
                 );
@@ -153385,14 +153614,17 @@ ${h2.join(`
             return;
           }
           this.setTeamsButtonState(false, true);
-          const officeChannelUrl = officeManager.getOffice(officeId)?.config.teamsChannelUrl;
+          const office = officeManager.getOffice(officeId)?.config;
+          const officeChannelUrl = office?.teamsChannelUrl;
           const workingDir = this.currentAgent.workingDir || officeManager.getCurrentWorkingDirectory();
           const res = await window.copilotBridge.teamsRegister({
             officeId,
             agentId,
             displayName: this.currentAgent.name,
             workingDir,
-            officeChannelUrl
+            officeChannelUrl,
+            officeMentionType: office?.teamsMentionType,
+            officeMentionValue: office?.teamsMentionValue
           });
           if (res?.success) {
             this.setTeamsButtonState(true);
@@ -153923,7 +154155,8 @@ ${h2.join(`
             if (this.getActiveOfficeId() !== officeId) return;
             this.fitAndResizeTerminal({ officeId, agentId });
           };
-          requestAnimationFrame(() => {
+          this.refitRaf = requestAnimationFrame(() => {
+            this.refitRaf = null;
             doFit();
             this.refitTimers.push(setTimeout(() => {
               doFit();
@@ -154107,9 +154340,13 @@ ${h2.join(`
           } catch {
           }
           this.spriteCardElement = null;
-          if (window.copilotBridge) {
-            window.copilotBridge.removeTerminalListeners();
+          for (const dispose of this.bridgeListenerDisposers) {
+            try {
+              dispose();
+            } catch {
+            }
           }
+          this.bridgeListenerDisposers = [];
         }
       };
     }
@@ -155095,6 +155332,7 @@ ${h2.join(`
     "src/layouts/default/DefaultDashboard.ts"() {
       "use strict";
       init_types();
+      init_agentStatusPresentation();
       defaultDashboard = {
         renderCards(ctx) {
           const { agents, office, selectedAgentId, cachedSessionMeta, agentTools, formatElapsed, formatRelativeTime } = ctx;
@@ -155143,46 +155381,12 @@ ${h2.join(`
           for (const agent of agents) {
             const liveStatus = office?.agents.get(agent.id);
             const tools = agentTools.get(agent.id) || [];
-            let statusDot = "#555";
-            let statusLabel = "Slacking";
-            let statusIcon = "\u{1F4A4}";
-            if (liveStatus) {
-              if (liveStatus.state === "active") {
-                switch (liveStatus.subState) {
-                  case "starting":
-                    statusDot = "#ff9944";
-                    statusLabel = "Starting...";
-                    statusIcon = "\u{1F680}";
-                    break;
-                  case "ready":
-                    if (liveStatus.completionPendingAck) {
-                      statusDot = "#4a78ff";
-                      statusLabel = "Done";
-                      statusIcon = "\u{1F4EC}";
-                    } else {
-                      statusDot = "#ffffff";
-                      statusLabel = "Ready";
-                      statusIcon = "\u{1F4ED}";
-                    }
-                    break;
-                  case "waiting":
-                    statusDot = "#ffb86c";
-                    statusLabel = "Waiting for input";
-                    statusIcon = "\u23F3";
-                    break;
-                  case "thinking":
-                    statusDot = "#50fa7b";
-                    statusLabel = liveStatus.thinkingDetail ? `Thinking: ${liveStatus.thinkingDetail}` : "Thinking...";
-                    statusIcon = "\u26A1";
-                    break;
-                  case "error":
-                    statusDot = "#f44";
-                    statusLabel = liveStatus.thinkingDetail ? `Error: ${liveStatus.thinkingDetail}` : "Error";
-                    statusIcon = "\u274C";
-                    break;
-                }
-              }
-            }
+            const statusPres = STATUS_PRESENTATION[resolveStatusKey(liveStatus)];
+            const statusDot = statusPres.colorHex;
+            const statusLabel = statusPres.label;
+            const statusIcon = statusPres.icon;
+            const activityDetail = describeActivity(liveStatus);
+            const activityDetailEsc = activityDetail.replace(/"/g, "&quot;");
             const colorHex = "#" + agent.color.toString(16).padStart(6, "0");
             const isSelected = agent.id === selectedAgentId;
             const borderColor = isSelected ? "#6677ff" : "#252540";
@@ -155211,13 +155415,13 @@ ${h2.join(`
       ">${toolCount} tools queued</div>` : "";
             let toolPipelineHtml = "";
             if (tools.length > 0) {
-              const toolRows = tools.map((t2, i) => {
+              const toolRows = tools.map((tool, i) => {
                 const isLast = i === tools.length - 1;
                 const icon = isLast ? "\u25B8" : "\u25E6";
                 const color = isLast ? "#8af" : "#556";
-                const statusText = isLast ? t2.status : "(queued)";
-                return `<div style="font-size: ${t2.toolRow}; color: ${color}; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; padding: 1px 0;">
-            ${icon} <span style="color: #9ab;">${t2.name}</span> <span style="color: #556;">\u2014 ${statusText}</span>
+                const statusText = isLast ? tool.status : "(queued)";
+                return `<div style="font-size: ${t.toolRow}; color: ${color}; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; padding: 1px 0;">
+            ${icon} <span style="color: #9ab;">${tool.name}</span> <span style="color: #556;">\u2014 ${statusText}</span>
           </div>`;
               }).join("");
               toolPipelineHtml = `
@@ -155388,6 +155592,11 @@ ${h2.join(`
               <div style="font-weight: bold; color: #dde; font-size: ${t.cardTitleLg};">${agent.name}</div>
               <div style="color: #778; font-size: ${t.cardDescription}; margin-top: 3px; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical;">${agent.description}</div>
             </div>
+            <div data-activity-detail-agent="${agent.id}" style="
+              height: 18px; line-height: 18px;
+              font-size: ${t.taskSummary}; color: #7f88b0;
+              white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
+            " title="${activityDetailEsc}">${activityDetail}</div>
             <div>
               ${taskSummaryHtml}
             </div>
@@ -155446,6 +155655,7 @@ ${h2.join(`
       "use strict";
       init_types();
       init_agents();
+      init_agentStatusPresentation();
       fleetDashboard = {
         renderCards(ctx) {
           const { agents, office, selectedAgentId, formatElapsed, formatRelativeTime } = ctx;
@@ -155453,46 +155663,12 @@ ${h2.join(`
           let html = "";
           for (const agent of agents) {
             const liveStatus = office?.agents.get(agent.id);
-            let statusDot = "#555";
-            let statusLabel = "Slacking";
-            let statusIcon = "\u{1F4A4}";
-            if (liveStatus) {
-              if (liveStatus.state === "active") {
-                switch (liveStatus.subState) {
-                  case "starting":
-                    statusDot = "#ff9944";
-                    statusLabel = "Starting...";
-                    statusIcon = "\u{1F680}";
-                    break;
-                  case "ready":
-                    if (liveStatus.completionPendingAck) {
-                      statusDot = "#4a78ff";
-                      statusLabel = "Done";
-                      statusIcon = "\u{1F4EC}";
-                    } else {
-                      statusDot = "#ffffff";
-                      statusLabel = "Ready";
-                      statusIcon = "\u{1F4ED}";
-                    }
-                    break;
-                  case "waiting":
-                    statusDot = "#ffb86c";
-                    statusLabel = "Waiting for input";
-                    statusIcon = "\u23F3";
-                    break;
-                  case "thinking":
-                    statusDot = "#50fa7b";
-                    statusLabel = liveStatus.thinkingDetail ? `Thinking: ${liveStatus.thinkingDetail}` : "Thinking...";
-                    statusIcon = "\u26A1";
-                    break;
-                  case "error":
-                    statusDot = "#f44";
-                    statusLabel = liveStatus.thinkingDetail ? `Error: ${liveStatus.thinkingDetail}` : "Error";
-                    statusIcon = "\u274C";
-                    break;
-                }
-              }
-            }
+            const statusPres = STATUS_PRESENTATION[resolveStatusKey(liveStatus)];
+            const statusDot = statusPres.colorHex;
+            const statusLabel = statusPres.label;
+            const statusIcon = statusPres.icon;
+            const activityDetail = describeActivity(liveStatus);
+            const activityDetailEsc = activityDetail.replace(/"/g, "&quot;");
             const colorHex = "#" + agent.color.toString(16).padStart(6, "0");
             const isSelected = agent.id === selectedAgentId;
             const isArthur = agent.id === ARCHITECT_AGENT_ID;
@@ -155567,6 +155743,11 @@ ${h2.join(`
               <div style="font-weight: bold; color: #dde; font-size: ${t.cardTitle};">${agent.name}</div>
               <div style="color: #778; font-size: ${t.cardDescription}; margin-top: 2px;">${agent.description}</div>
             </div>
+            <div data-activity-detail-agent="${agent.id}" style="
+              height: 16px; line-height: 16px;
+              font-size: ${t.taskSummary}; color: #7f88b0;
+              white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
+            " title="${activityDetailEsc}">${activityDetail}</div>
             <div>
               <div style="display: flex; align-items: center; flex-wrap: wrap; margin-top: 3px;">
                 <div style="
@@ -157031,6 +157212,10 @@ ${h2.join(`
           this.game.events.on("agent:status:changed", () => {
             this.updateSessionBadges();
           }, this);
+          this.game.events.on("agent:stall", (agentId, stalled) => {
+            const npc = this.npcs.find((n) => n.config.id === agentId);
+            npc?.setStalled(stalled);
+          }, this);
           this.updateSessionBadges();
           this.game.events.on("office:switch", (officeId, _workingDir) => {
             if (this.animating) {
@@ -158503,7 +158688,7 @@ ${h2.join(`
           let nearestNPCDist = interactionDistance;
           let nearestDesk = null;
           let nearestDeskDist = interactionDistance;
-          this.npcs.forEach((npc) => {
+          for (const npc of this.npcs) {
             const dist = import_phaser8.default.Math.Distance.Between(
               this.player.x,
               this.player.y,
@@ -158515,7 +158700,7 @@ ${h2.join(`
               nearestNPC = npc;
             }
             npc.setNearPlayer(false);
-          });
+          }
           this.desks.forEach((desk) => {
             const dist = import_phaser8.default.Math.Distance.Between(
               this.player.x,
@@ -159385,12 +159570,13 @@ ${h2.join(`
           while (this.toasts.length >= MAX_VISIBLE) {
             this.dismiss(this.toasts[0]);
           }
+          const accentColor = options.statusColorHex ?? options.agentColor;
           const el2 = document.createElement("div");
           el2.style.cssText = `
       pointer-events: auto;
       background: #1e1e3a;
-      border: 1.5px solid ${options.agentColor}66;
-      border-left: 4px solid ${options.agentColor};
+      border: 1.5px solid ${accentColor}66;
+      border-left: 4px solid ${accentColor};
       border-radius: 8px;
       padding: 12px 16px;
       display: flex;
@@ -159403,13 +159589,14 @@ ${h2.join(`
       opacity: 0;
       transition: transform ${ANIMATION_MS}ms ease, opacity ${ANIMATION_MS}ms ease;
     `;
+          const markerHtml = options.statusIcon ? `<div style="font-size: 16px; line-height: 1; flex-shrink: 0;">${options.statusIcon}</div>` : `<div style="
+          width: 8px; height: 8px;
+          border-radius: 50%;
+          background: ${accentColor};
+          flex-shrink: 0;
+        "></div>`;
           el2.innerHTML = `
-      <div style="
-        width: 8px; height: 8px;
-        border-radius: 50%;
-        background: ${options.agentColor};
-        flex-shrink: 0;
-      "></div>
+      ${markerHtml}
       <div style="flex: 1; min-width: 0;">
         <div style="font-size: 12px; font-weight: bold; color: #dde;">${options.agentName}</div>
         <div style="font-size: 11px; color: #889; margin-top: 2px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">${options.message}</div>
@@ -159555,11 +159742,21 @@ ${h2.join(`
   });
 
   // src/ui/NotificationService.ts
-  var NotificationService;
+  var EVENT_STATUS_KEY, NotificationService;
   var init_NotificationService = __esm({
     "src/ui/NotificationService.ts"() {
       "use strict";
       init_notifications();
+      init_agentStatusPresentation();
+      EVENT_STATUS_KEY = {
+        turnEnd: "done",
+        askUser: "waiting",
+        turnStart: "thinking",
+        toolStart: "thinking",
+        toolComplete: null,
+        sessionReady: "ready",
+        sessionError: "error"
+      };
       NotificationService = class {
         constructor(toastManager, resolveAgent, onClickAgent) {
           this.dedupeMap = /* @__PURE__ */ new Map();
@@ -159603,18 +159800,23 @@ ${h2.join(`
           if (!agent) return;
           const message = this.formatMessage(eventConfig.message, agent.name, context);
           const colorHex = "#" + agent.color.toString(16).padStart(6, "0");
+          const statusKey = EVENT_STATUS_KEY[eventType];
+          const statusPres = statusKey ? STATUS_PRESENTATION[statusKey] : void 0;
           if (eventConfig.toast) {
             this.toastManager.show({
               agentId,
               agentName: agent.name,
               agentColor: colorHex,
               message,
-              onClick: () => this.onClickAgent?.(agentId)
+              onClick: () => this.onClickAgent?.(agentId),
+              statusIcon: statusPres?.icon,
+              statusColorHex: statusPres?.colorHex
             });
           }
           if (eventConfig.osNotification) {
+            const titlePrefix = statusPres?.icon ?? "\u{1F3E2}";
             window.copilotBridge?.showNativeNotification(
-              `\u{1F3E2} ${agent.name}`,
+              `${titlePrefix} ${agent.name}`,
               message
             );
           }
@@ -160844,7 +161046,7 @@ Failed to start terminal: ${startResult.error || "unknown error"}`);
                 this.updateSessionIdDisplay();
               }
             }
-            const attachResult = await window.copilotBridge.terminalAttach(options.officeId, options.agentId);
+            const attachResult = await window.copilotBridge.terminalAttach(options.officeId, options.agentId, true);
             if (!attachResult.success) {
               this.terminal.writeln("\r\nFailed to attach terminal session.");
               this.setStatus("Attach failed");
@@ -161061,14 +161263,17 @@ Terminal error: ${error?.message || String(error)}`);
             return;
           }
           this.setTeamsButtonState(false, true);
-          const officeChannelUrl = officeManager.getOffice(officeId)?.config.teamsChannelUrl;
+          const office = officeManager.getOffice(officeId)?.config;
+          const officeChannelUrl = office?.teamsChannelUrl;
           const workingDir = this.activeOptions.workingDir || officeManager.getCurrentWorkingDirectory();
           const res = await window.copilotBridge.teamsRegister({
             officeId,
             agentId,
             displayName: this.activeOptions.name,
             workingDir,
-            officeChannelUrl
+            officeChannelUrl,
+            officeMentionType: office?.teamsMentionType,
+            officeMentionValue: office?.teamsMentionValue
           });
           if (res?.success) {
             this.setTeamsButtonState(true);
@@ -161539,6 +161744,17 @@ Terminal error: ${error?.message || String(error)}`);
     const last = remainingTools[remainingTools.length - 1];
     return { kind: "thinking", detail: String(last.name ?? "") };
   }
+  function addActiveTool(tools, entry) {
+    if (tools.some((t) => t.toolId === entry.toolId)) {
+      return { tools: tools.slice(), added: false };
+    }
+    return { tools: [...tools, entry], added: true };
+  }
+  function removeCompletedTool(tools, toolId) {
+    const completed = tools.find((t) => t.toolId === toolId) ?? null;
+    if (!completed) return { tools: tools.slice(), completed: null };
+    return { tools: tools.filter((t) => t.toolId !== toolId), completed };
+  }
   var init_toolStatus = __esm({
     "src/util/toolStatus.ts"() {
       "use strict";
@@ -161584,6 +161800,7 @@ Terminal error: ${error?.message || String(error)}`);
       init_SeriousTerminalController();
       init_SpriteGenerator();
       init_toolStatus();
+      init_agentStatusPresentation();
       init_startupTimeoutGuard();
       init_AutoStartCoordinator();
       init_agentAutoStart();
@@ -161597,6 +161814,22 @@ Terminal error: ${error?.message || String(error)}`);
       function getCurrentAgents() {
         return getLayout(getCurrentLayout()).agents;
       }
+      function sortAgentsByMode(agents, office) {
+        if (agentSortMode !== "recent" || !office) return agents;
+        const persisted = getOfficeAgentActivityTimes(office.config.id);
+        const recency = (id) => {
+          let t = persisted[id] ?? 0;
+          const status = office.agents.get(id);
+          if (status) {
+            if ((status.activityStartTime ?? 0) > t) t = status.activityStartTime;
+            for (const action of status.recentActions) {
+              if (action.timestamp > t) t = action.timestamp;
+            }
+          }
+          return t;
+        };
+        return [...agents].sort((a, b2) => recency(b2.id) - recency(a.id));
+      }
       function getCurrentAgentTools() {
         return officeManager.currentOffice?.agentTools || /* @__PURE__ */ new Map();
       }
@@ -161621,9 +161854,32 @@ 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 AGENT_SORT_STORAGE_KEY = "agencyOffice:agentSortMode";
       var OFFICE_ACCESS_TIMES_KEY = "agencyOffice:officeAccessTimes";
-      var officeSortMode = localStorage.getItem(OFFICE_SORT_STORAGE_KEY) || "default";
+      var AGENT_ACTIVITY_TIMES_KEY = "agencyOffice:agentActivityTimes";
+      var agentSortMode = localStorage.getItem(AGENT_SORT_STORAGE_KEY) || "default";
+      function getAgentActivityTimes() {
+        try {
+          const raw = localStorage.getItem(AGENT_ACTIVITY_TIMES_KEY);
+          return raw ? JSON.parse(raw) : {};
+        } catch {
+          return {};
+        }
+      }
+      function getOfficeAgentActivityTimes(officeId) {
+        return getAgentActivityTimes()[officeId] ?? {};
+      }
+      function recordAgentActivity(officeId, agentId) {
+        if (!officeId) return;
+        const all = getAgentActivityTimes();
+        const office = all[officeId] ?? {};
+        office[agentId] = Date.now();
+        all[officeId] = office;
+        try {
+          localStorage.setItem(AGENT_ACTIVITY_TIMES_KEY, JSON.stringify(all));
+        } catch {
+        }
+      }
       function getOfficeAccessTimes() {
         try {
           const raw = localStorage.getItem(OFFICE_ACCESS_TIMES_KEY);
@@ -161633,6 +161889,7 @@ Terminal error: ${error?.message || String(error)}`);
         }
       }
       function recordOfficeAccess(officeId) {
+        if (!officeId) return;
         const times = getOfficeAccessTimes();
         times[officeId] = Date.now();
         try {
@@ -161929,8 +162186,8 @@ Terminal error: ${error?.message || String(error)}`);
             return getCurrentAgents().map((a) => ({
               id: a.id,
               name: a.name,
-              tileX: a.tileX,
-              tileY: a.tileY
+              tileX: a.position.x,
+              tileY: a.position.y
             }));
           },
           getActiveTerminalAgentId: () => {
@@ -161988,12 +162245,8 @@ Terminal error: ${error?.message || String(error)}`);
         console.log("[main] Spec 008-smoke: __copilotOfficeDebug installed");
       }
       function renderOfficeTabs() {
-        let offices = officeManager.getAllOffices();
+        const offices = officeManager.getAllOffices();
         const currentId = officeManager.currentOfficeId;
-        if (officeSortMode === "recent") {
-          const accessTimes = getOfficeAccessTimes();
-          offices = [...offices].sort((a, b2) => (accessTimes[b2.id] || 0) - (accessTimes[a.id] || 0));
-        }
         let html = "";
         for (const office of offices) {
           const isActive = office.id === currentId;
@@ -162358,6 +162611,21 @@ Terminal error: ${error?.message || String(error)}`);
       width: 100%; padding: 6px 8px; margin-bottom: 14px; background: #12121f; border: 1px solid #333;
       border-radius: 5px; color: #899; font-family: inherit; font-size: 11px; box-sizing: border-box;
     " />
+    <label style="display: block; margin-bottom: 3px; color: #889; font-size: 11px;">Teams Mention Override <span style="color:#667;">(optional)</span></label>
+    <div style="display: flex; gap: 6px; margin-bottom: 14px;">
+      <select class="osp-teams-mention-type" style="
+        padding: 6px 8px; background: #12121f; border: 1px solid #333; border-radius: 5px;
+        color: #899; font-family: inherit; font-size: 11px; box-sizing: border-box;
+      ">
+        <option value="none"${(office.config.teamsMentionType ?? "none") === "none" ? " selected" : ""}>Default</option>
+        <option value="tag"${office.config.teamsMentionType === "tag" ? " selected" : ""}>Tag</option>
+        <option value="user"${office.config.teamsMentionType === "user" ? " selected" : ""}>User</option>
+      </select>
+      <input class="osp-teams-mention-value" type="text" value="${escapeHtml(office.config.teamsMentionValue ?? "")}" placeholder="Tag name / user (empty = use default)" style="
+        flex: 1; padding: 6px 8px; background: #12121f; border: 1px solid #333; border-radius: 5px;
+        color: #899; font-family: inherit; font-size: 11px; box-sizing: border-box;
+      " />
+    </div>
     <div style="display: flex; gap: 8px; justify-content: flex-end;">
       ${canDelete ? `<button class="osp-delete" style="
         padding: 5px 12px; background: #2a1a1a; border: 1px solid #633; border-radius: 5px;
@@ -162377,6 +162645,8 @@ Terminal error: ${error?.message || String(error)}`);
         const nameInput = popover.querySelector(".osp-name");
         const pathInput = popover.querySelector(".osp-path");
         const teamsInput = popover.querySelector(".osp-teams");
+        const teamsMentionTypeInput = popover.querySelector(".osp-teams-mention-type");
+        const teamsMentionValueInput = popover.querySelector(".osp-teams-mention-value");
         popover.querySelector(".osp-close")?.addEventListener("click", closeOfficePopover);
         popover.querySelector(".osp-save")?.addEventListener("click", () => {
           const newName = nameInput.value.trim();
@@ -162384,6 +162654,10 @@ Terminal error: ${error?.message || String(error)}`);
           if (newName) officeManager.updateOffice(officeId, { name: newName });
           if (newPath) officeManager.updateOffice(officeId, { workingDirectory: newPath });
           officeManager.updateOffice(officeId, { teamsChannelUrl: teamsInput.value.trim() });
+          officeManager.updateOffice(officeId, {
+            teamsMentionType: teamsMentionTypeInput.value,
+            teamsMentionValue: teamsMentionValueInput.value.trim()
+          });
           renderOfficeTabs();
           updateTerminalContent();
           closeOfficePopover();
@@ -162431,18 +162705,18 @@ Terminal error: ${error?.message || String(error)}`);
     <div id="terminal-subtitle" style="font-size: 12px; color: #555;"></div>
   </div>
   <div style="display: flex; align-items: center; gap: 8px;">
-    <button id="office-sort-btn" style="
+    <button id="agent-sort-btn" style="
       padding: 6px 12px;
-      background: ${officeSortMode === "recent" ? "#2a3a5a" : "#252538"};
-      color: ${officeSortMode === "recent" ? "#8af" : "#666"};
-      border: 1px solid ${officeSortMode === "recent" ? "#4488ff" : "#444"};
+      background: ${agentSortMode === "recent" ? "#2a3a5a" : "#252538"};
+      color: ${agentSortMode === "recent" ? "#8af" : "#666"};
+      border: 1px solid ${agentSortMode === "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>
+    " title="Sort agents in this office">\u21C5 ${agentSortMode === "recent" ? "Recent" : "Default"}</button>
     <button id="close-office-btn" style="
       display: none;
       padding: 6px 14px;
@@ -162458,19 +162732,19 @@ Terminal error: ${error?.message || String(error)}`);
   </div>
 `;
       overviewHost.appendChild(overviewHeader);
-      document.getElementById("office-sort-btn").addEventListener("click", () => {
-        officeSortMode = officeSortMode === "default" ? "recent" : "default";
+      document.getElementById("agent-sort-btn").addEventListener("click", () => {
+        agentSortMode = agentSortMode === "default" ? "recent" : "default";
         try {
-          localStorage.setItem(OFFICE_SORT_STORAGE_KEY, officeSortMode);
+          localStorage.setItem(AGENT_SORT_STORAGE_KEY, agentSortMode);
         } catch {
         }
-        renderOfficeTabs();
-        const sortBtn = document.getElementById("office-sort-btn");
+        updateTerminalContent();
+        const sortBtn = document.getElementById("agent-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";
+          sortBtn.textContent = `\u21C5 ${agentSortMode === "recent" ? "Recent" : "Default"}`;
+          sortBtn.style.background = agentSortMode === "recent" ? "#2a3a5a" : "#252538";
+          sortBtn.style.color = agentSortMode === "recent" ? "#8af" : "#666";
+          sortBtn.style.borderColor = agentSortMode === "recent" ? "#4488ff" : "#444";
         }
       });
       document.getElementById("close-office-btn").addEventListener("click", () => {
@@ -162522,11 +162796,7 @@ Terminal error: ${error?.message || String(error)}`);
       var toastManager = new ToastNotificationManager(document.body);
       function formatElapsed(startTime) {
         if (!startTime) return "";
-        const seconds = Math.floor((Date.now() - startTime) / 1e3);
-        if (seconds < 60) return `${seconds}s`;
-        const mins = Math.floor(seconds / 60);
-        const secs = seconds % 60;
-        return `${mins}m ${secs}s`;
+        return formatElapsedMmSs(startTime);
       }
       function formatRelativeTime(timestamp) {
         const seconds = Math.floor((Date.now() - timestamp) / 1e3);
@@ -162589,8 +162859,18 @@ Terminal error: ${error?.message || String(error)}`);
         terminalHost.style.display = "none";
         seriousPlaceholder.style.display = "none";
       }
+      function clearCompletionAck(agentId) {
+        const officeId = officeManager.currentOfficeId;
+        if (!officeId) return;
+        if (officeManager.acknowledgeAgentCompletion(officeId, agentId)) {
+          phaserGameRef?.events.emit("agent:status:changed", agentId);
+          updateStatusBar();
+          updateTerminalContent();
+        }
+      }
       async function openAgentTerminal(agentId) {
         selectedAgentId = agentId;
+        clearCompletionAck(agentId);
         if (appMode === "game") {
           phaserGameRef?.events.emit("open:agent:terminal", agentId);
           return;
@@ -162627,12 +162907,13 @@ Terminal error: ${error?.message || String(error)}`);
         }
       });
       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;
+      async function warmAgentSession(officeId, agentId, fallback) {
+        if (!window.copilotBridge) return false;
+        const isCurrentOffice = officeId === officeManager.currentOfficeId;
+        const launchConfig = isCurrentOffice ? getSeriousLaunchConfig(agentId) : null;
+        const workingDir = launchConfig?.workingDir ?? fallback?.workingDir;
+        const launchMode = launchConfig?.launchMode ?? fallback?.launchMode ?? "copilot";
+        if (!workingDir) return false;
         const officeStatus = officeManager.getAgentStatus(officeId, agentId);
         if (officeStatus?.state === "slacking") {
           officeManager.setAgentStarting(officeId, agentId);
@@ -162641,7 +162922,7 @@ Terminal error: ${error?.message || String(error)}`);
           updateTerminalContent();
         }
         autoStartTerminalStartCount += 1;
-        await window.copilotBridge.terminalStart(
+        const res = await window.copilotBridge.terminalStart(
           officeId,
           agentId,
           workingDir,
@@ -162650,6 +162931,74 @@ Terminal error: ${error?.message || String(error)}`);
           void 0,
           launchMode
         );
+        return res?.success !== false;
+      }
+      var teamsColdWarmDone = false;
+      var teamsColdWarmInFlight = false;
+      var teamsColdWarmAttempts = 0;
+      var TEAMS_COLD_WARM_MAX_ATTEMPTS = 5;
+      var TEAMS_COLD_WARM_RETRY_MS = 1500;
+      function scheduleTeamsColdWarmRetry() {
+        if (teamsColdWarmDone) return;
+        if (teamsColdWarmAttempts >= TEAMS_COLD_WARM_MAX_ATTEMPTS) return;
+        setTimeout(() => {
+          void warmAllTeamsBoundAgents();
+        }, TEAMS_COLD_WARM_RETRY_MS);
+      }
+      async function warmAllTeamsBoundAgents() {
+        if (teamsColdWarmDone || teamsColdWarmInFlight) return;
+        if (!window.copilotBridge?.teamsStatus) return;
+        teamsColdWarmInFlight = true;
+        teamsColdWarmAttempts += 1;
+        try {
+          const teamsRes = await window.copilotBridge.teamsStatus();
+          if (!teamsRes?.success || !Array.isArray(teamsRes.bindings)) {
+            scheduleTeamsColdWarmRetry();
+            return;
+          }
+          const bindings = teamsRes.bindings;
+          if (bindings.length === 0) {
+            scheduleTeamsColdWarmRetry();
+            return;
+          }
+          const results = await Promise.all(
+            bindings.map(async (b2) => {
+              try {
+                return await warmAgentSession(
+                  b2.officeId,
+                  b2.agentId,
+                  b2.workingDir ? {
+                    workingDir: b2.workingDir,
+                    // A raw shell can't be Teams-bound (nothing to resume), but
+                    // guard defensively so PC_TERMINAL never resumes as copilot.
+                    launchMode: b2.agentId === PC_TERMINAL_ID2 ? "shell" : "copilot"
+                  } : void 0
+                );
+              } catch (err) {
+                console.warn(
+                  `[Teams] cold-launch warm failed for ${b2.officeId}/${b2.agentId}:`,
+                  err
+                );
+                return false;
+              }
+            })
+          );
+          if (!results.some(Boolean)) {
+            scheduleTeamsColdWarmRetry();
+            return;
+          }
+          teamsColdWarmDone = true;
+          try {
+            await window.copilotBridge.teamsReconcile?.();
+          } catch {
+          }
+          void refreshTeamsDashboardState();
+        } catch (e) {
+          console.warn("[Teams] warmAllTeamsBoundAgents failed:", e);
+          scheduleTeamsColdWarmRetry();
+        } finally {
+          teamsColdWarmInFlight = false;
+        }
       }
       function buildCanonicalAgentIdsForOffice(officeId) {
         const office = officeManager.currentOfficeId === officeId ? officeManager.currentOffice : null;
@@ -162696,7 +163045,9 @@ Terminal error: ${error?.message || String(error)}`);
           if (!window.copilotBridge) return;
           await window.copilotBridge.resetSession(oid, aid);
         },
-        warmAgentSession: (oid, aid) => warmAgentSession(oid, aid),
+        warmAgentSession: async (oid, aid) => {
+          await warmAgentSession(oid, aid);
+        },
         getSettings: () => getAgentAutoStartSettings()
       });
       setAutoStartCoordinator(autoStartCoordinator);
@@ -162828,13 +163179,16 @@ Terminal error: ${error?.message || String(error)}`);
         }
         const agent = getSeriousLaunchConfig(agentId);
         if (!agent) return;
-        const officeChannelUrl = officeManager.getOffice(officeId)?.config.teamsChannelUrl;
+        const office = officeManager.getOffice(officeId)?.config;
+        const officeChannelUrl = office?.teamsChannelUrl;
         const res = await window.copilotBridge.teamsRegister({
           officeId,
           agentId,
           displayName: agent.name,
           workingDir: agent.workingDir || officeManager.getCurrentWorkingDirectory(),
-          officeChannelUrl
+          officeChannelUrl,
+          officeMentionType: office?.teamsMentionType,
+          officeMentionValue: office?.teamsMentionValue
         });
         if (res?.success) {
           teamsOnlineAgentIds.add(agentId);
@@ -162879,7 +163233,7 @@ Terminal error: ${error?.message || String(error)}`);
         }
         const layout = getLayout(getCurrentLayout());
         const html = layout.dashboard.renderCards({
-          agents: layout.agents,
+          agents: sortAgentsByMode(layout.agents, office || null),
           office: office || null,
           selectedAgentId,
           cachedSessionMeta,
@@ -163200,8 +163554,14 @@ Terminal error: ${error?.message || String(error)}`);
           if (!agentTools.has(agentId)) {
             agentTools.set(agentId, []);
           }
-          agentTools.get(agentId).push({ toolId, name: toolName, status });
+          const startResult = addActiveTool(agentTools.get(agentId), { toolId, name: toolName, status });
+          if (!startResult.added) {
+            console.log(`[Office] Ignoring duplicate tool_start for ${agentId} \u2014 toolId ${toolId} already active`);
+            return;
+          }
+          agentTools.set(agentId, startResult.tools);
           officeManager.pushRecentAction(officeId, agentId, toolName, "started");
+          recordAgentActivity(officeId, agentId);
           if (status) {
             officeManager.setTaskSummary(officeId, agentId, status);
           }
@@ -163225,9 +163585,13 @@ Terminal error: ${error?.message || String(error)}`);
           const agentTools = getCurrentAgentTools();
           const tools = agentTools.get(agentId);
           if (tools) {
-            const completedTool = tools.find((t) => t.toolId === toolId);
-            const completedToolName = completedTool?.name || "tool";
-            const remaining = tools.filter((t) => t.toolId !== toolId);
+            const completeResult = removeCompletedTool(tools, toolId);
+            if (!completeResult.completed) {
+              console.log(`[Office] Ignoring tool_complete for ${agentId} \u2014 unknown toolId ${toolId}`);
+              return;
+            }
+            const completedToolName = completeResult.completed.name || "tool";
+            const remaining = completeResult.tools;
             agentTools.set(agentId, remaining);
             officeManager.setLastCompletedAction(officeId, agentId, completedToolName);
             officeManager.pushRecentAction(officeId, agentId, completedToolName, "completed");
@@ -163254,6 +163618,11 @@ Terminal error: ${error?.message || String(error)}`);
           console.log(`[Office] Turn end: ${agentId}`);
           const officeId = officeManager.currentOfficeId;
           if (officeId) {
+            const current = officeManager.getAgentStatus(officeId, agentId);
+            if (current?.subState === "starting") {
+              console.log(`[Office] Ignoring turn_end for ${agentId} \u2014 still in starting state`);
+              return;
+            }
             const agentTools = getCurrentAgentTools();
             const activeTools = agentTools.get(agentId) || [];
             const waitingToolActive = activeTools.some((t) => isAskUserTool(t.name, t.status));
@@ -163282,6 +163651,7 @@ Terminal error: ${error?.message || String(error)}`);
             return;
           }
           officeManager.setTaskSummary(officeId, agentId, "Processing...");
+          recordAgentActivity(officeId, agentId);
           officeManager.setAgentThinking(officeId, agentId, "Processing...");
           console.log(`[Office] Status: ${agentId} \u2192 thinking (turn start)`);
           notifyAgent(agentId, "turnStart");
@@ -163313,7 +163683,29 @@ Terminal error: ${error?.message || String(error)}`);
         window.copilotBridge.onTeamsToast?.((toast) => {
           if (!toast?.message) return;
           const kind = toast.level === "error" ? "error" : toast.level === "warn" ? "error" : "info";
-          showClipboardToast(toast.message, kind);
+          if (typeof toast.durationMs === "number" && toast.durationMs > 0) {
+            showClipboardToast(toast.message, kind, toast.durationMs);
+          } else {
+            showClipboardToast(toast.message, kind);
+          }
+        });
+        let backendFallbackToastShown = false;
+        const showBackendFallbackToast = (info) => {
+          if (!info || !info.fellBack || backendFallbackToastShown) return;
+          backendFallbackToastShown = true;
+          const detail = info.reason ? ` (${info.reason})` : "";
+          showClipboardToast(`Terminal: ${info.requested} unavailable \u2014 using ${info.name}${detail}`, "error", 1e4);
+        };
+        window.copilotBridge.onBackendFallback?.((info) => showBackendFallbackToast(info));
+        void window.copilotBridge.getBackendInfo?.().then((info) => showBackendFallbackToast(info));
+        window.copilotBridge.onBackendOnline?.((officeId, _backend) => {
+          const officeName = officeManager.getOffice(officeId)?.config.name ?? officeId;
+          showClipboardToast(`GitHub Copilot SDK server online for ${officeName}`, "success", 1e4);
+        });
+        window.copilotBridge.onBackendSessionFallback?.((_officeId, agentId, reason) => {
+          const agentName = getAgentConfig(agentId)?.name ?? agentId;
+          const detail = reason ? ` (${reason})` : "";
+          showClipboardToast(`${agentName}: UI-server unavailable \u2014 using node-pty${detail}`, "error", 1e4);
         });
         window.copilotBridge.onTeamsStatusChanged?.((status) => {
           if (!status?.agentId) return;
@@ -163534,9 +163926,11 @@ Terminal error: ${error?.message || String(error)}`);
         await syncAgentStatuses(true);
       }
       var ELAPSED_TICK_MS = 1e3;
+      var lastStalledState = /* @__PURE__ */ new Map();
       setInterval(() => {
         const office = officeManager.currentOffice;
         if (!office) return;
+        const now = Date.now();
         for (const agent of getCurrentAgents()) {
           const status = office.agents.get(agent.id);
           if (status?.activityStartTime) {
@@ -163547,6 +163941,16 @@ Terminal error: ${error?.message || String(error)}`);
               }
             }
           }
+          const stalled = computeStall(status, now).isStalled;
+          const card = document.querySelector(`.agent-card[data-agent="${agent.id}"]`);
+          if (card) {
+            card.classList.toggle("agent-stalled", stalled);
+            card.dataset.stalled = stalled ? "true" : "false";
+          }
+          if ((lastStalledState.get(agent.id) ?? false) !== stalled) {
+            lastStalledState.set(agent.id, stalled);
+            phaserGameRef?.events.emit("agent:stall", agent.id, stalled);
+          }
           const actionEls = document.querySelectorAll(`.agent-card[data-agent="${agent.id}"] [data-action-ts]`);
           actionEls.forEach((el2) => {
             const ts2 = parseInt(el2.dataset.actionTs || "0", 10);
@@ -163771,6 +164175,7 @@ Terminal error: ${error?.message || String(error)}`);
         updateTerminalContent();
         updateStatusBar();
         void autoStartCoordinator.tryWarmCurrentOffice();
+        void warmAllTeamsBoundAgents();
       };
       window.addEventListener("focus", () => {
         catchUpStatusViews("window focus");