u-foo 2.2.3 → 2.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u-foo",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "Multi-Agent Workspace Protocol. Just add u. claude → uclaude, codex → ucodex.",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://ufoo.dev",

package/src/bus/index.js

@@ -16,6 +16,7 @@ const {
   sleep,
 } = require("./utils");
 const { shakeTerminalByTty } = require("./shake");
+const { resolveDisplayNickname } = require("../daemon/nicknameScope");
 const QueueManager = require("./queue");
 const SubscriberManager = require("./subscriber");
 const MessageManager = require("./message");
@@ -147,7 +148,8 @@ class EventBus {
     if (!sessionId && !agentType && currentSubscriber && currentActive) {
       this.subscriberManager.updateLastSeen(currentSubscriber);
       this.saveBusData();
-      const currentNickname = currentMeta.nickname ? ` (${currentMeta.nickname})` : "";
+      const currentDisplayNickname = resolveDisplayNickname(this.projectRoot, currentMeta);
+      const currentNickname = currentDisplayNickname ? ` (${currentDisplayNickname})` : "";
       logInfo(`Already joined event bus: ${currentSubscriber}${currentNickname}`);
       return currentSubscriber;
     }
@@ -201,14 +203,15 @@ class EventBus {
   /**
    * 重命名订阅者
    */
-  async rename(subscriber, newNickname, publisher = null) {
+  async rename(subscriber, newNickname, publisher = null, options = {}) {
     this.ensureBus();
     this.loadBusData();
 
     try {
       const result = await this.subscriberManager.rename(
         subscriber,
-        newNickname
+        newNickname,
+        options
       );
       this.saveBusData();
       const pub = publisher || this.getDefaultPublisher() || "unknown";
@@ -468,7 +471,7 @@ class EventBus {
       console.log("  (none)");
     } else {
       for (const sub of active) {
-        const nickname = sub.nickname ? ` (${sub.nickname})` : "";
+      const nickname = sub.nickname ? ` (${sub.nickname})` : "";
         console.log(`  ${sub.id}${nickname}`);
       }
     }

package/src/bus/message.js

@@ -247,7 +247,7 @@ class MessageManager {
     if (meta && normalizedTarget === normalizeAgentTypeAlias(meta.agent_type)) return true;
 
     // 昵称匹配
-    if (meta && target === meta.nickname) return true;
+    if (meta && (target === meta.nickname || target === meta.scoped_nickname)) return true;
 
     // 通配符
     if (target === "*") return true;
@@ -423,7 +423,7 @@ class MessageManager {
       })
       .map(([id, meta]) => ({
         id,
-        nickname: meta.nickname,
+        nickname: meta.nickname || meta.scoped_nickname || "",
         agent_type: meta.agent_type,
         last_seen: meta.last_seen,
       }));

package/src/bus/nickname.js

@@ -14,7 +14,7 @@ class NicknameManager {
   resolveNickname(nickname) {
     const subscribers = this.busData.agents || {};
     for (const [id, meta] of Object.entries(subscribers)) {
-      if (meta.nickname === nickname) {
+      if (meta.nickname === nickname || meta.scoped_nickname === nickname) {
         return id;
       }
     }
@@ -30,7 +30,10 @@ class NicknameManager {
   nicknameExists(nickname, excludeSubscriber = null) {
     const subscribers = this.busData.agents || {};
     for (const [id, meta] of Object.entries(subscribers)) {
-      if (id !== excludeSubscriber && meta.nickname === nickname) {
+      if (
+        id !== excludeSubscriber
+        && (meta.nickname === nickname || meta.scoped_nickname === nickname)
+      ) {
         return true;
       }
     }
@@ -71,10 +74,15 @@ class NicknameManager {
     return meta?.nickname || null;
   }
 
+  getScopedNickname(subscriber) {
+    const meta = this.busData.agents?.[subscriber];
+    return meta?.scoped_nickname || meta?.nickname || null;
+  }
+
   /**
    * 设置订阅者的昵称
    */
-  setNickname(subscriber, nickname) {
+  setNickname(subscriber, nickname, scopedNickname = "") {
     if (!this.busData.agents) {
       this.busData.agents = {};
     }
@@ -82,6 +90,9 @@ class NicknameManager {
       this.busData.agents[subscriber] = {};
     }
     this.busData.agents[subscriber].nickname = nickname;
+    if (scopedNickname) {
+      this.busData.agents[subscriber].scoped_nickname = scopedNickname;
+    }
   }
 }
 

package/src/bus/subscriber.js

@@ -175,20 +175,29 @@ class SubscriberManager {
     // 检查是否是重新加入（rejoin）
     const existingMeta = this.busData.agents[subscriber];
     let finalNickname = nickname;
+    let finalScopedNickname = typeof options.scopedNickname === "string"
+      ? options.scopedNickname.trim()
+      : (typeof process.env.UFOO_SCOPED_NICKNAME === "string" ? process.env.UFOO_SCOPED_NICKNAME.trim() : "");
 
-    if (existingMeta && existingMeta.nickname) {
-      // 重新加入，保留原昵称
-      finalNickname = existingMeta.nickname;
-    } else if (nickname) {
+    if (nickname) {
       // 新昵称，检查冲突
-      if (nicknameManager.nicknameExists(nickname, subscriber)) {
+      const conflictTarget = finalScopedNickname || nickname;
+      if (nicknameManager.nicknameExists(conflictTarget, subscriber)) {
         throw new Error(`Nickname "${nickname}" already exists`);
       }
       finalNickname = nickname;
+    } else if (existingMeta && existingMeta.nickname) {
+      // 重新加入，保留原昵称
+      finalNickname = existingMeta.nickname;
+      finalScopedNickname = existingMeta.scoped_nickname || finalScopedNickname || finalNickname;
     } else {
       // 自动生成昵称（并标记占用，避免并发重复）
       finalNickname = nicknameManager.generateAutoNickname(agentType);
-      nicknameManager.setNickname(subscriber, finalNickname);
+      nicknameManager.setNickname(subscriber, finalNickname, finalScopedNickname);
+    }
+
+    if (!finalScopedNickname) {
+      finalScopedNickname = existingMeta?.scoped_nickname || finalNickname;
     }
 
     const explicitLaunchMode = typeof options.launchMode === "string"
@@ -221,6 +230,7 @@ class SubscriberManager {
     const inheritedNickname = await this.cleanupDuplicateTty(subscriber, finalTty);
     if (inheritedNickname && !nickname && !existingMeta) {
       finalNickname = inheritedNickname;
+      if (!finalScopedNickname) finalScopedNickname = inheritedNickname;
     }
 
     // 更新订阅者信息（保留已有字段，如 provider_session_*）
@@ -252,6 +262,7 @@ class SubscriberManager {
       ...preserved,
       agent_type: agentType,
       nickname: finalNickname,
+      scoped_nickname: finalScopedNickname || finalNickname,
       status: "active",
       activity_state: "starting",
       activity_since: getTimestamp(),
@@ -311,7 +322,11 @@ class SubscriberManager {
     // 创建队列目录
     this.queueManager.ensureQueueDir(subscriber);
 
-    return { subscriber, nickname: finalNickname };
+    return {
+      subscriber,
+      nickname: finalNickname,
+      scopedNickname: this.busData.agents[subscriber].scoped_nickname || finalNickname,
+    };
   }
 
   /**
@@ -333,22 +348,27 @@ class SubscriberManager {
   /**
    * 重命名订阅者
    */
-  async rename(subscriber, newNickname) {
+  async rename(subscriber, newNickname, options = {}) {
     if (!this.busData.agents || !this.busData.agents[subscriber]) {
       throw new Error(`Subscriber "${subscriber}" not found`);
     }
 
     const nicknameManager = new NicknameManager(this.busData);
+    const scopedNickname = typeof options.scopedNickname === "string" && options.scopedNickname.trim()
+      ? options.scopedNickname.trim()
+      : newNickname;
 
     // 检查昵称冲突
-    if (nicknameManager.nicknameExists(newNickname, subscriber)) {
+    if (nicknameManager.nicknameExists(scopedNickname, subscriber)) {
       throw new Error(`Nickname "${newNickname}" already exists`);
     }
 
     const oldNickname = this.busData.agents[subscriber].nickname;
+    const oldScopedNickname = this.busData.agents[subscriber].scoped_nickname || oldNickname;
     this.busData.agents[subscriber].nickname = newNickname;
+    this.busData.agents[subscriber].scoped_nickname = scopedNickname;
 
-    return { subscriber, oldNickname, newNickname };
+    return { subscriber, oldNickname, newNickname, oldScopedNickname, newScopedNickname: scopedNickname };
   }
 
   /**

package/src/chat/agentDirectory.js

@@ -10,8 +10,8 @@ function buildAgentMaps(activeAgents = [], metaList = [], fallbackMap = null) {
 
   for (const id of activeAgents) {
     const meta = metaById.get(id);
-    const label = meta && meta.nickname
-      ? meta.nickname
+    const label = meta && (meta.display_nickname || meta.nickname)
+      ? (meta.display_nickname || meta.nickname)
       : (fallbackMap && fallbackMap.get(id)) || id;
     labelMap.set(id, label);
     if (meta) {

package/src/chat/commandExecutor.js

@@ -11,6 +11,7 @@ const {
   normalizeControllerMode,
 } = require("../config");
 const { resolveTransport } = require("../code/nativeRunner");
+const { resolveDisplayNickname } = require("../daemon/nicknameScope");
 const { parseIntervalMs, formatIntervalMs } = require("./cronScheduler");
 const { isGlobalControllerProjectRoot, resolveGlobalControllerUfooDir } = require("../projects");
 const { loadPromptProfileRegistry } = require("../group/promptProfiles");
@@ -319,7 +320,8 @@ function createCommandExecutor(options = {}) {
         } else {
           logMessage("system", "{cyan-fg}Active agents:{/cyan-fg}");
           for (const [id, meta] of subscribers) {
-            const nickname = meta && meta.nickname ? ` (${meta.nickname})` : "";
+            const displayNickname = meta ? resolveDisplayNickname(projectRoot, meta) : "";
+            const nickname = displayNickname ? ` (${displayNickname})` : "";
             const status = meta && meta.status ? meta.status : "unknown";
             logMessage("system", `  • ${id}${nickname} {white-fg}[${status}]{/white-fg}`);
           }

package/src/chat/daemonMessageRouter.js

@@ -229,7 +229,8 @@ function createDaemonMessageRouter(options = {}) {
       if (recoverableList.length > 0) {
         logMessage("system", "{cyan-fg}Recoverable agents:{/cyan-fg}");
         recoverableList.forEach((item) => {
-          const nickname = item.nickname ? ` (${item.nickname})` : "";
+          const displayNickname = item.display_nickname || item.nickname || "";
+          const nickname = displayNickname ? ` (${displayNickname})` : "";
           const meta = item.launchMode ? ` [${item.agent}/${item.launchMode}]` : ` [${item.agent}]`;
           logMessage("system", `  • ${escapeBlessed(`${item.id}${nickname}${meta}`)}`);
         });

package/src/chat/index.js

@@ -15,6 +15,7 @@ const UfooInit = require("../init");
 const AgentActivator = require("../bus/activate");
 const { subscriberToSafeName } = require("../bus/utils");
 const { getUfooPaths } = require("../ufoo/paths");
+const { resolveDisplayNickname } = require("../daemon/nicknameScope");
 const { startDaemon, stopDaemon, connectWithRetry } = require("./transport");
 const { escapeBlessed, stripBlessedTags, truncateText } = require("./text");
 const { COMMAND_REGISTRY, parseCommand, parseAtTarget } = require("./commands");
@@ -915,7 +916,7 @@ async function runChat(projectRoot, options = {}) {
           const busPath = getUfooPaths(activeProjectRoot).agentsFile;
           const bus = JSON.parse(fs.readFileSync(busPath, "utf8"));
           for (const [id, meta] of Object.entries(bus.agents || {})) {
-            if (meta && meta.nickname === nickname) return id;
+            if (meta && (meta.nickname === nickname || meta.scoped_nickname === nickname)) return id;
           }
         } catch {
           // ignore lookup errors
@@ -934,7 +935,7 @@ async function runChat(projectRoot, options = {}) {
           const busPath = getUfooPaths(activeProjectRoot).agentsFile;
           const bus = JSON.parse(fs.readFileSync(busPath, "utf8"));
           const meta = bus.agents && bus.agents[id];
-          if (meta && meta.nickname) return meta.nickname;
+          if (meta) return resolveDisplayNickname(activeProjectRoot, meta);
         } catch {
           // Keep original publisher ID
         }
@@ -1275,7 +1276,9 @@ async function runChat(projectRoot, options = {}) {
         const bus = JSON.parse(fs.readFileSync(busPath, "utf8"));
         fallbackMap = new Map();
         for (const [id, meta] of Object.entries(bus.agents || {})) {
-          if (meta && meta.nickname) fallbackMap.set(id, meta.nickname);
+          if (!meta) continue;
+          const displayNickname = resolveDisplayNickname(activeProjectRoot, meta);
+          if (displayNickname) fallbackMap.set(id, displayNickname);
         }
       } catch {
         fallbackMap = null;

package/src/code/nativeRunner.js

@@ -486,6 +486,7 @@ async function runOpenAiLikeTurn({
 } = {}) {
   const payload = {
     model,
+    max_tokens: 131072,
     messages,
     tools: buildCoreToolSpecs(),
     tool_choice: "auto",
@@ -683,7 +684,7 @@ async function runAnthropicTurn({
 } = {}) {
   const payload = {
     model,
-    max_tokens: 4096,
+    max_tokens: 131072,
     messages,
     tools: buildAnthropicToolSpecs(),
     stream: true,

package/src/daemon/index.js

@@ -31,7 +31,11 @@ const {
   buildSoloBootstrapFingerprint,
   rollbackLaunchAfterRoleAssignmentFailure,
 } = require("./soloBootstrap");
-const { applyProjectNicknamePrefix } = require("./nicknameScope");
+const {
+  applyProjectNicknamePrefix,
+  resolveDisplayNickname,
+  resolveScopedNickname,
+} = require("./nicknameScope");
 
 let providerSessions = null;
 let probeHandles = new Map();
@@ -60,7 +64,7 @@ function normalizeLaunchAgent(agent = "") {
   return "";
 }
 
-async function renameSpawnedAgent(projectRoot, agentType, nickname, startIso) {
+async function renameSpawnedAgent(projectRoot, agentType, nickname, startIso, scopedNickname = "") {
   if (!nickname) return null;
   const busPath = getUfooPaths(projectRoot).agentsFile;
   const targetType = normalizeBusAgentType(agentType);
@@ -79,11 +83,11 @@ async function renameSpawnedAgent(projectRoot, agentType, nickname, startIso) {
         await sleep(200);
         continue;
       }
-      let candidates = entries.filter(([, meta]) => !meta.nickname);
+      let candidates = entries.filter(([, meta]) => !resolveDisplayNickname(projectRoot, meta));
       if (candidates.length === 0) candidates = entries;
       candidates.sort((a, b) => (a[1].joined_at || "").localeCompare(b[1].joined_at || ""));
       const [agentId] = candidates[candidates.length - 1];
-      await eventBus.rename(agentId, nickname, "ufoo-agent");
+      await eventBus.rename(agentId, nickname, "ufoo-agent", { scopedNickname });
       return { ok: true, agent_id: agentId, nickname };
     } catch (err) {
       lastError = err && err.message ? err.message : String(err || "rename failed");
@@ -382,13 +386,20 @@ async function waitForNewSubscriber(projectRoot, agentType, existing, timeoutMs
   return null;
 }
 
-function checkAndCleanupNickname(projectRoot, nickname, { tty = "", agentType = "" } = {}) {
-  if (!nickname) return { existing: null, cleaned: false };
+function checkAndCleanupNickname(projectRoot, nickname, { tty = "", agentType = "", scopedNickname = "" } = {}) {
+  const conflictNickname = scopedNickname || applyProjectNicknamePrefix(projectRoot, nickname, {
+    agentType,
+    force: true,
+  });
+  if (!conflictNickname) return { existing: null, cleaned: false };
   const busPath = getUfooPaths(projectRoot).agentsFile;
   try {
     const bus = JSON.parse(fs.readFileSync(busPath, "utf8"));
     const entries = Object.entries(bus.agents || {})
-      .filter(([, meta]) => meta && meta.nickname === nickname);
+      .filter(([, meta]) => {
+        const candidate = resolveScopedNickname(projectRoot, meta);
+        return meta && candidate === conflictNickname;
+      });
 
     if (entries.length === 0) {
       return { existing: null, cleaned: false };
@@ -431,7 +442,7 @@ function resolveSubscriberNickname(projectRoot, subscriberId) {
   try {
     const busPath = getUfooPaths(projectRoot).agentsFile;
     const bus = JSON.parse(fs.readFileSync(busPath, "utf8"));
-    return bus.agents?.[subscriberId]?.nickname || "";
+    return resolveDisplayNickname(projectRoot, bus.agents?.[subscriberId] || {});
   } catch {
     return "";
   }
@@ -453,7 +464,8 @@ async function handleOps(projectRoot, ops = [], processManager = null) {
         continue;
       }
       const requestedNickname = String(op.nickname || "").trim();
-      const nickname = applyProjectNicknamePrefix(projectRoot, requestedNickname, { agentType: agent });
+      const nickname = requestedNickname;
+      const scopedNickname = applyProjectNicknamePrefix(projectRoot, requestedNickname, { agentType: agent });
       const startTime = new Date(Date.now() - 1000);
       const startIso = startTime.toISOString();
       if (nickname && count > 1) {
@@ -468,7 +480,7 @@ async function handleOps(projectRoot, ops = [], processManager = null) {
       }
       try {
         // Check for existing agent with same nickname
-        const { existing, cleaned } = checkAndCleanupNickname(projectRoot, nickname);
+        const { existing, cleaned } = checkAndCleanupNickname(projectRoot, nickname, { scopedNickname, agentType: agent });
         if (existing) {
           // Agent with this nickname already exists and is active
           results.push({
@@ -486,6 +498,7 @@ async function handleOps(projectRoot, ops = [], processManager = null) {
         }
         // eslint-disable-next-line no-await-in-loop
         const launchResult = await launchAgent(projectRoot, agent, count, nickname, processManager, {
+          scopedNickname,
           launchScope: op.launch_scope || "",
           terminalApp: op.terminal_app || "",
           tmuxLayoutContext:
@@ -555,7 +568,7 @@ async function handleOps(projectRoot, ops = [], processManager = null) {
         });
         if (nickname) {
           // eslint-disable-next-line no-await-in-loop
-          const renameResult = await renameSpawnedAgent(projectRoot, agent, nickname, startIso);
+          const renameResult = await renameSpawnedAgent(projectRoot, agent, nickname, startIso, scopedNickname);
           if (renameResult) {
             results.push({ action: "rename", ...renameResult });
           }
@@ -615,10 +628,11 @@ async function handleOps(projectRoot, ops = [], processManager = null) {
           continue;
         }
         const targetMeta = eventBus.busData.agents[targetId] || {};
-        nickname = applyProjectNicknamePrefix(projectRoot, requestedNickname, {
+        const scopedNickname = applyProjectNicknamePrefix(projectRoot, requestedNickname, {
           agentType: targetMeta.agent_type || "",
         });
-        const result = await eventBus.rename(targetId, nickname, "ufoo-agent");
+        nickname = requestedNickname;
+        const result = await eventBus.rename(targetId, nickname, "ufoo-agent", { scopedNickname });
         results.push({
           action: "rename",
           ok: true,
@@ -1311,9 +1325,7 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
       const parsedCount = parseInt(count, 10);
       const finalCount = Number.isFinite(parsedCount) && parsedCount > 0 ? parsedCount : 1;
       const requestedProfile = String(prompt_profile || "").trim();
-      const explicitNickname = applyProjectNicknamePrefix(projectRoot, String(nickname || "").trim(), {
-        agentType: normalizedAgent,
-      });
+      const explicitNickname = String(nickname || "").trim();
       if (requestedProfile && finalCount > 1) {
         socket.write(
           `${JSON.stringify({
@@ -2027,23 +2039,28 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
         if (skipProbe) joinOptions.skipProbe = true;
 
         let finalNickname = nickname || "";
+        let scopedNickname = applyProjectNicknamePrefix(projectRoot, finalNickname, {
+          agentType: normalizeBusAgentType(agentType),
+        });
         if (finalNickname) {
           const nickCheck = checkAndCleanupNickname(projectRoot, finalNickname, {
             tty: tty || "",
             agentType: normalizeBusAgentType(agentType),
+            scopedNickname,
           });
           if (nickCheck.existing) {
             finalNickname = "";
+            scopedNickname = "";
           }
         }
         await eventBus.join(
           sessionId,
           normalizeBusAgentType(agentType),
           finalNickname,
-          joinOptions,
+          { ...joinOptions, scopedNickname },
         );
         if (finalNickname) {
-          eventBus.rename(subscriberId, finalNickname, "ufoo-agent");
+          eventBus.rename(subscriberId, finalNickname, "ufoo-agent", { scopedNickname });
         }
         eventBus.saveBusData();
         const resolvedNickname = resolveSubscriberNickname(projectRoot, subscriberId) || finalNickname || "";

package/src/daemon/nicknameScope.js

@@ -72,9 +72,46 @@ function applyProjectNicknamePrefix(projectRoot, nickname = "", options = {}) {
   return `${projectPrefix}-${normalizedNickname}`;
 }
 
+function stripProjectNicknamePrefix(projectRoot, nickname = "") {
+  const normalizedNickname = normalizeNicknameSegment(nickname, "");
+  if (!normalizedNickname) return "";
+  const projectPrefix = buildProjectNicknamePrefix(projectRoot);
+  const scopedPrefix = `${projectPrefix}-`;
+  if (!normalizedNickname.startsWith(scopedPrefix)) {
+    return normalizedNickname;
+  }
+  const stripped = normalizedNickname.slice(scopedPrefix.length).replace(/^-+/, "");
+  return stripped || normalizedNickname;
+}
+
+function resolveDisplayNickname(projectRoot, meta = {}, fallback = "") {
+  const explicit = asTrimmedString(meta.nickname);
+  if (explicit) {
+    return meta.scoped_nickname ? explicit : stripProjectNicknamePrefix(projectRoot, explicit);
+  }
+  const scoped = asTrimmedString(meta.scoped_nickname);
+  if (scoped) return stripProjectNicknamePrefix(projectRoot, scoped);
+  return asTrimmedString(fallback);
+}
+
+function resolveScopedNickname(projectRoot, meta = {}, fallback = "") {
+  const scoped = asTrimmedString(meta.scoped_nickname);
+  if (scoped) return scoped;
+  const explicit = asTrimmedString(meta.nickname);
+  if (explicit) {
+    return meta.scoped_nickname ? scoped : applyProjectNicknamePrefix(projectRoot, explicit, { force: true });
+  }
+  const fallbackValue = asTrimmedString(fallback);
+  if (!fallbackValue) return "";
+  return applyProjectNicknamePrefix(projectRoot, fallbackValue, { force: true });
+}
+
 module.exports = {
   normalizeNicknameSegment,
   buildProjectNicknamePrefix,
   isAutoGeneratedNickname,
   applyProjectNicknamePrefix,
+  stripProjectNicknamePrefix,
+  resolveDisplayNickname,
+  resolveScopedNickname,
 };

package/src/daemon/ops.js

@@ -7,7 +7,10 @@ const { loadAgentsData, saveAgentsData } = require("../ufoo/agentsStore");
 const { isAgentPidAlive, getTtyProcessInfo } = require("../bus/utils");
 const { isITerm2 } = require("../terminal/detect");
 const { createTerminalAdapterRouter } = require("../terminal/adapterRouter");
-const { applyProjectNicknamePrefix } = require("./nicknameScope");
+const {
+  applyProjectNicknamePrefix,
+  resolveDisplayNickname,
+} = require("./nicknameScope");
 const {
   createSession: createHostSession,
 } = require("../terminal/adapters/hostAdapter");
@@ -125,11 +128,15 @@ function resolveAgentId(projectRoot, agentId) {
   try {
     const bus = JSON.parse(fs.readFileSync(busPath, "utf8"));
     const entries = Object.entries(bus.agents || {});
-    const match = entries.find(([, meta]) => meta?.nickname === agentId);
+    const match = entries.find(([, meta]) =>
+      meta?.nickname === agentId || meta?.scoped_nickname === agentId
+    );
     if (match) return match[0];
     const scopedNickname = applyProjectNicknamePrefix(projectRoot, agentId);
     if (scopedNickname && scopedNickname !== agentId) {
-      const scopedMatch = entries.find(([, meta]) => meta?.nickname === scopedNickname);
+      const scopedMatch = entries.find(([, meta]) =>
+        meta?.nickname === scopedNickname || meta?.scoped_nickname === scopedNickname
+      );
       if (scopedMatch) return scopedMatch[0];
     }
     const normalized = normalizeLaunchAgent(agentId);
@@ -848,7 +855,11 @@ async function launchAgent(projectRoot, agent, count = 1, nickname = "", process
   const launchScope = normalizeLaunchScope(options.launchScope, "inplace");
   const terminalApp = normalizeTerminalAppPreference(options.terminalApp);
   const extraEnvObject = options.extraEnv && typeof options.extraEnv === "object" ? options.extraEnv : {};
-  const extraEnvPrefix = buildShellEnvPrefix(extraEnvObject);
+  const scopedNickname = typeof options.scopedNickname === "string" ? options.scopedNickname.trim() : "";
+  const launchEnvObject = scopedNickname
+    ? { ...extraEnvObject, UFOO_SCOPED_NICKNAME: scopedNickname }
+    : extraEnvObject;
+  const extraEnvPrefix = buildShellEnvPrefix(launchEnvObject);
   const extraArgs = Array.isArray(options.extraArgs) ? options.extraArgs : [];
   const normalizedAgent = normalizeLaunchAgent(agent);
   if (!normalizedAgent) {
@@ -862,7 +873,7 @@ async function launchAgent(projectRoot, agent, count = 1, nickname = "", process
       count,
       nickname,
       processManager,
-      extraEnvObject
+      launchEnvObject
     );
     return { mode: "internal", launchScope, subscriberIds: result.subscriberIds };
   }
@@ -954,7 +965,7 @@ async function launchAgent(projectRoot, agent, count = 1, nickname = "", process
         nick,
         processManager,
         extraArgs,
-        extraEnvObject,
+        launchEnvObject,
         hostContext
       );
       if (result.subscriberId) subscriberIds.push(result.subscriberId);
@@ -1023,8 +1034,8 @@ function collectRecoverableAgents(projectRoot, target = "") {
     } else {
       targets = entries.filter(([id, meta]) =>
         id === target
-        || (meta && meta.nickname === target)
-        || (scopedTarget && scopedTarget !== target && meta && meta.nickname === scopedTarget)
+        || (meta && (meta.nickname === target || meta.scoped_nickname === target))
+        || (scopedTarget && scopedTarget !== target && meta && (meta.nickname === scopedTarget || meta.scoped_nickname === scopedTarget))
       );
     }
   }
@@ -1076,7 +1087,8 @@ function getRecoverableAgents(projectRoot, target = "") {
   const { mode, recoverableEntries, skipped } = collectRecoverableAgents(projectRoot, target);
   const recoverable = recoverableEntries.map((item) => ({
     id: item.id,
-    nickname: item.meta.nickname || "",
+    nickname: resolveDisplayNickname(projectRoot, item.meta),
+    display_nickname: resolveDisplayNickname(projectRoot, item.meta),
     agent: item.agent,
     sessionId: item.meta.provider_session_id || "",
     launchMode: item.meta.launch_mode || "",
@@ -1094,7 +1106,7 @@ async function resumeAgents(projectRoot, target = "", processManager = null) {
 
   const resumed = [];
   for (const item of recoverableEntries) {
-    const nickname = item.meta.nickname || "";
+    const nickname = resolveDisplayNickname(projectRoot, item.meta);
     const sessionId = item.meta.provider_session_id;
     const reused = await tryReuseTerminal(projectRoot, item.id, item.meta, item.agent, sessionId);
     if (!reused) {

package/src/daemon/reporting.js

@@ -9,6 +9,7 @@ const {
   appendControllerInboxEntry,
 } = require("../report/store");
 const { getUfooPaths } = require("../ufoo/paths");
+const { resolveDisplayNickname } = require("./nicknameScope");
 
 function resolveAgentDisplayName(projectRoot, agentId) {
   if (!agentId) return "unknown-agent";
@@ -16,9 +17,7 @@ function resolveAgentDisplayName(projectRoot, agentId) {
     const busPath = getUfooPaths(projectRoot).agentsFile;
     const bus = JSON.parse(fs.readFileSync(busPath, "utf8"));
     const meta = bus && bus.agents ? bus.agents[agentId] : null;
-    if (meta && typeof meta.nickname === "string" && meta.nickname.trim()) {
-      return meta.nickname.trim();
-    }
+    if (meta) return resolveDisplayNickname(projectRoot, meta) || agentId;
   } catch {
     // ignore
   }

package/src/daemon/soloBootstrap.js

@@ -5,7 +5,11 @@ const EventBus = require("../bus");
 const { prepareUcodeBootstrap } = require("../agent/ucodeBootstrap");
 const { isMetaActive } = require("../bus/utils");
 const { getUfooPaths } = require("../ufoo/paths");
-const { applyProjectNicknamePrefix } = require("./nicknameScope");
+const {
+  applyProjectNicknamePrefix,
+  resolveDisplayNickname,
+  resolveScopedNickname,
+} = require("./nicknameScope");
 const { loadAgentsData, saveAgentsData } = require("../ufoo/agentsStore");
 const {
   loadPromptProfileRegistry,
@@ -207,7 +211,11 @@ function resolveExistingAgent(projectRoot, target = "") {
   for (const [subscriberId, meta] of Object.entries(agents)) {
     if (
       meta
-      && (meta.nickname === key || (scopedKey && scopedKey !== key && meta.nickname === scopedKey))
+      && (
+        meta.nickname === key
+        || meta.scoped_nickname === key
+        || (scopedKey && scopedKey !== key && (meta.nickname === scopedKey || meta.scoped_nickname === scopedKey))
+      )
       && isLiveAgentMeta(meta)
     ) {
       return { subscriberId, meta };
@@ -222,7 +230,8 @@ function findOwningGroup(projectRoot, subscriberId = "") {
   const liveMeta = getAgentRuntimeMeta(projectRoot, targetSubscriber);
   if (!isLiveAgentMeta(liveMeta)) return null;
   if (asTrimmedString(liveMeta.role_owner).toLowerCase() === "solo") return null;
-  const liveNickname = asTrimmedString(liveMeta.nickname);
+  const liveNickname = resolveDisplayNickname(projectRoot, liveMeta);
+  const liveScopedNickname = resolveScopedNickname(projectRoot, liveMeta);
   const groupsDir = getUfooPaths(projectRoot).groupsDir;
   if (!groupsDir) return null;
   let files = [];
@@ -245,6 +254,7 @@ function findOwningGroup(projectRoot, subscriberId = "") {
           !liveNickname
           || asTrimmedString(member.nickname) === liveNickname
           || asTrimmedString(member.runtime_nickname) === liveNickname
+          || asTrimmedString(member.runtime_nickname) === liveScopedNickname
         )
       );
       if (found) {

package/src/daemon/status.js

@@ -2,6 +2,7 @@ const fs = require("fs");
 const path = require("path");
 const { getUfooPaths } = require("../ufoo/paths");
 const { isMetaActive } = require("../bus/utils");
+const { resolveDisplayNickname, resolveScopedNickname } = require("./nicknameScope");
 const { readReportSummary, countControllerInboxEntries } = require("../report/store");
 const { readRecentLoopSummary } = require("../agent/loopObservability");
 
@@ -146,7 +147,8 @@ function buildStatus(projectRoot, options = {}) {
     : [];
   const active = activeEntries.map(({ id }) => id);
   const activeMeta = activeEntries.map(({ id, meta }) => {
-    const nickname = meta?.nickname || "";
+    const nickname = resolveDisplayNickname(projectRoot, meta);
+    const scoped_nickname = resolveScopedNickname(projectRoot, meta);
     const display = nickname ? nickname : id;
     const launch_mode = meta?.launch_mode || "unknown";
     const tmux_pane = meta?.tmux_pane || "";
@@ -156,6 +158,8 @@ function buildStatus(projectRoot, options = {}) {
     return {
       id,
       nickname,
+      scoped_nickname,
+      display_nickname: nickname,
       display,
       launch_mode,
       tmux_pane,

package/src/status/index.js

@@ -3,6 +3,7 @@ const path = require("path");
 const childProcess = require("child_process");
 const { readJSON } = require("../bus/utils");
 const { getUfooPaths } = require("../ufoo/paths");
+const { resolveDisplayNickname } = require("../daemon/nicknameScope");
 
 function normalizeTty(ttyPath) {
   if (!ttyPath) return "";
@@ -233,7 +234,7 @@ class StatusDisplay {
     const busData = readJSON(agentsFile);
     if (!busData || !busData.agents) return null;
     const meta = busData.agents[subscriber];
-    return meta && meta.nickname ? meta.nickname : null;
+    return meta ? resolveDisplayNickname(this.projectRoot, meta) : null;
   }
 
   /**