u-foo 2.2.3 → 2.3.0

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/promptRequest.js

@@ -212,15 +212,16 @@ async function handlePromptRequest(options = {}) {
 
   const privateReports = listControllerInboxEntries(projectRoot, "ufoo-agent", { num: 100 });
   const useGlobalProjectRouter = isGlobalController;
-  const promptRunner = runPromptWithAssistant;
   const ufooAgentOptions = useGlobalProjectRouter ? { routingMode: "global-router" } : { controllerMode };
   let nextRequestMeta = requestMeta;
-  if (!Object.prototype.hasOwnProperty.call(nextRequestMeta, "agent_execution_path") && controllerMode !== CONTROLLER_MODES.LEGACY) {
+  const hasExplicitRequestMeta = Object.keys(nextRequestMeta).length > 0;
+  if (hasExplicitRequestMeta && !Object.prototype.hasOwnProperty.call(nextRequestMeta, "agent_execution_path") && controllerMode !== CONTROLLER_MODES.LEGACY) {
     nextRequestMeta = {
       ...nextRequestMeta,
       agent_execution_path: controllerMode,
     };
   }
+  let forceMainRouterFallback = false;
 
   const logGateRouterEvent = (event, details = {}) => {
     controllerObserver.emit(event, details);
@@ -275,6 +276,7 @@ async function handlePromptRequest(options = {}) {
       attachGateRouterMeta("provider_error", {
         error: routed && routed.error ? routed.error : "route_agent_failed",
       });
+      forceMainRouterFallback = true;
       logGateRouterEvent("controller.gate_router_upgraded", {
         reason: "provider_error",
         fallback_used: "main_router",
@@ -295,6 +297,7 @@ async function handlePromptRequest(options = {}) {
           confidence: Number(route.confidence || 0),
           route_reason: route.reason || "",
         });
+        forceMainRouterFallback = true;
         logGateRouterEvent("controller.gate_router_upgraded", {
           reason: upgradeReason,
           decision: route.decision || "",
@@ -339,6 +342,7 @@ async function handlePromptRequest(options = {}) {
             route_reason: route.reason || "",
             error: err && err.message ? err.message : String(err),
           });
+          forceMainRouterFallback = true;
           logGateRouterEvent("controller.gate_router_upgraded", {
             reason: "dispatch_failed",
             target: route.target,
@@ -351,6 +355,11 @@ async function handlePromptRequest(options = {}) {
   }
 
   const promptText = buildPromptWithPrivateReports(req.text || "", privateReports, nextRequestMeta);
+  const promptRunner = loopRuntime.enabled
+    && !forceMainRouterFallback
+    && typeof injectedLoopRunner === "function"
+    ? injectedLoopRunner
+    : runPromptWithAssistant;
 
   try {
     const handled = await promptRunner({

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 = [];
@@ -244,7 +253,10 @@ function findOwningGroup(projectRoot, subscriberId = "") {
         && (
           !liveNickname
           || asTrimmedString(member.nickname) === liveNickname
+          || asTrimmedString(member.scoped_nickname) === liveNickname
+          || asTrimmedString(member.scoped_nickname) === liveScopedNickname
           || 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/group/bootstrap.js

@@ -5,7 +5,7 @@ const crypto = require("crypto");
 const SHARED_UFOO_PROTOCOL = [
   "ufoo protocol:",
   "- At session start, sync shared context with `ufoo ctx decisions -l` and `ufoo ctx decisions -n 1`.",
-  "- Record a decision ONLY for important, plan-level knowledge: architectural choices, multi-option trade-off analysis, cross-agent coordination decisions, or plans that affect other agents. Do NOT record routine findings, simple bug fixes, or trivial observations. Use `ufoo ctx decisions new \"Title\"` BEFORE acting.",
+  "- Default to no new decision. Record one ONLY for important, plan-level knowledge: architectural choices, multi-option trade-off analysis, cross-agent coordination decisions, or plans that affect other agents. Do NOT record routine findings, simple bug fixes, trivial observations, or generic plan/evaluation/recommendation requests. Durable project facts belong in shared memory, not decisions. Use `ufoo ctx decisions new \"Title\"` BEFORE acting only when that bar is met.",
   "- Use `ufoo bus send <target-nickname> \"<message>\"` for agent-to-agent handoffs.",
   "- If you receive pending bus work, execute it immediately, reply to the sender, then `ufoo bus ack \"$UFOO_SUBSCRIBER_ID\"`.",
   "- Use `ufoo report` for controller/runtime status updates, not as a substitute for direct handoffs.",