u-foo 1.8.4 → 1.8.8

package/src/daemon/nicknameScope.js

@@ -0,0 +1,80 @@
+"use strict";
+
+const fs = require("fs");
+const path = require("path");
+
+function asTrimmedString(value) {
+  if (typeof value !== "string") return "";
+  return value.trim();
+}
+
+function normalizeNicknameSegment(value = "", fallback = "agent") {
+  const normalized = asTrimmedString(value)
+    .toLowerCase()
+    .replace(/[^a-z0-9_-]+/g, "-")
+    .replace(/-+/g, "-")
+    .replace(/^-+|-+$/g, "");
+  return normalized || fallback;
+}
+
+function normalizeAutoNicknamePrefix(agentType = "") {
+  const normalized = asTrimmedString(agentType).toLowerCase();
+  if (normalized === "claude" || normalized === "claude-code") return "claude";
+  if (normalized === "codex") return "codex";
+  if (normalized === "ufoo" || normalized === "ucode" || normalized === "ufoo-code") return "ucode";
+  return "";
+}
+
+function buildProjectNicknamePrefix(projectRoot) {
+  const resolvedRoot = asTrimmedString(projectRoot) || process.cwd();
+  let baseName = "";
+  try {
+    const realRoot = fs.realpathSync.native
+      ? fs.realpathSync.native(resolvedRoot)
+      : fs.realpathSync(resolvedRoot);
+    baseName = path.basename(realRoot);
+  } catch {
+    baseName = path.basename(path.resolve(resolvedRoot));
+  }
+  return normalizeNicknameSegment(baseName, "project");
+}
+
+function isAutoGeneratedNickname(nickname = "", agentType = "") {
+  const normalized = normalizeNicknameSegment(nickname, "");
+  const match = normalized.match(/^([a-z0-9]+)-([a-z0-9_-]+)$/);
+  if (!match) return false;
+
+  const nicknamePrefix = match[1];
+  const suffix = match[2];
+  const knownPrefixes = new Set(["claude", "codex", "ucode"]);
+  const agentPrefix = normalizeAutoNicknamePrefix(agentType);
+  if (agentPrefix) knownPrefixes.add(agentPrefix);
+  if (!knownPrefixes.has(nicknamePrefix)) return false;
+  return /\d/.test(suffix);
+}
+
+function applyProjectNicknamePrefix(projectRoot, nickname = "", options = {}) {
+  const rawNickname = asTrimmedString(nickname);
+  if (!rawNickname) return "";
+
+  const projectPrefix = buildProjectNicknamePrefix(projectRoot);
+  const normalizedNickname = normalizeNicknameSegment(rawNickname, "");
+  if (!normalizedNickname) return "";
+
+  if (normalizedNickname === projectPrefix || normalizedNickname.startsWith(`${projectPrefix}-`)) {
+    return normalizedNickname;
+  }
+
+  if (options.force !== true && isAutoGeneratedNickname(normalizedNickname, options.agentType || "")) {
+    return normalizedNickname;
+  }
+
+  return `${projectPrefix}-${normalizedNickname}`;
+}
+
+module.exports = {
+  normalizeNicknameSegment,
+  buildProjectNicknamePrefix,
+  isAutoGeneratedNickname,
+  applyProjectNicknamePrefix,
+};

package/src/daemon/ops.js

@@ -7,6 +7,7 @@ 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 {
   createSession: createHostSession,
 } = require("../terminal/adapters/hostAdapter");
@@ -126,6 +127,11 @@ function resolveAgentId(projectRoot, agentId) {
     const entries = Object.entries(bus.agents || {});
     const match = entries.find(([, meta]) => meta?.nickname === agentId);
     if (match) return match[0];
+    const scopedNickname = applyProjectNicknamePrefix(projectRoot, agentId);
+    if (scopedNickname && scopedNickname !== agentId) {
+      const scopedMatch = entries.find(([, meta]) => meta?.nickname === scopedNickname);
+      if (scopedMatch) return scopedMatch[0];
+    }
     const normalized = normalizeLaunchAgent(agentId);
     const targetType = toBusAgentType(normalized) || agentId;
     const candidates = entries
@@ -147,6 +153,7 @@ function markAgentInactive(projectRoot, agentId) {
   data.agents[agentId] = {
     ...meta,
     status: "inactive",
+    activity_state: "",
     last_seen: new Date().toISOString(),
   };
   saveAgentsData(filePath, data);
@@ -842,6 +849,7 @@ async function launchAgent(projectRoot, agent, count = 1, nickname = "", process
   const terminalApp = normalizeTerminalAppPreference(options.terminalApp);
   const extraEnvObject = options.extraEnv && typeof options.extraEnv === "object" ? options.extraEnv : {};
   const extraEnvPrefix = buildShellEnvPrefix(extraEnvObject);
+  const extraArgs = Array.isArray(options.extraArgs) ? options.extraArgs : [];
   const normalizedAgent = normalizeLaunchAgent(agent);
   if (!normalizedAgent) {
     throw new Error(`unsupported agent type: ${agent}`);
@@ -894,7 +902,7 @@ async function launchAgent(projectRoot, agent, count = 1, nickname = "", process
       const nick = count > 1 ? `${nickname || defaultNick}-${i + 1}` : (nickname || "");
       if (useSeparateWindow) {
         // eslint-disable-next-line no-await-in-loop
-        await spawnTmuxWindow(projectRoot, normalizedAgent, nick, [], extraEnvPrefix);
+        await spawnTmuxWindow(projectRoot, normalizedAgent, nick, extraArgs, extraEnvPrefix);
       } else if (useGroupRightColumnLayout && paneTarget) {
         const basePane = String(tmuxLayoutContext.basePane || paneTarget).trim() || paneTarget;
         tmuxLayoutContext.basePane = basePane;
@@ -904,14 +912,14 @@ async function launchAgent(projectRoot, agent, count = 1, nickname = "", process
         let splitResult;
         try {
           // eslint-disable-next-line no-await-in-loop
-          splitResult = await spawnTmuxPane(projectRoot, normalizedAgent, nick, [], extraEnvPrefix, splitTarget, {
+          splitResult = await spawnTmuxPane(projectRoot, normalizedAgent, nick, extraArgs, extraEnvPrefix, splitTarget, {
             orientation: splitOrientation,
             capturePaneId: !rightColumnPane,
           });
         } catch {
           // Fallback to new window when current pane target cannot be resolved.
           // eslint-disable-next-line no-await-in-loop
-          await spawnTmuxWindow(projectRoot, normalizedAgent, nick, [], extraEnvPrefix);
+          await spawnTmuxWindow(projectRoot, normalizedAgent, nick, extraArgs, extraEnvPrefix);
           continue;
         }
         if (!rightColumnPane && splitResult && splitResult.paneId) {
@@ -923,11 +931,11 @@ async function launchAgent(projectRoot, agent, count = 1, nickname = "", process
       } else {
         try {
           // eslint-disable-next-line no-await-in-loop
-          await spawnTmuxPane(projectRoot, normalizedAgent, nick, [], extraEnvPrefix, paneTarget);
+          await spawnTmuxPane(projectRoot, normalizedAgent, nick, extraArgs, extraEnvPrefix, paneTarget);
         } catch {
           // Fallback to new window when current pane target cannot be resolved.
           // eslint-disable-next-line no-await-in-loop
-          await spawnTmuxWindow(projectRoot, normalizedAgent, nick, [], extraEnvPrefix);
+          await spawnTmuxWindow(projectRoot, normalizedAgent, nick, extraArgs, extraEnvPrefix);
         }
       }
     }
@@ -1009,10 +1017,15 @@ function collectRecoverableAgents(projectRoot, target = "") {
 
   let targets = entries;
   if (target) {
+    const scopedTarget = applyProjectNicknamePrefix(projectRoot, target);
     if (target.includes(":")) {
       targets = entries.filter(([id]) => id === target);
     } else {
-      targets = entries.filter(([id, meta]) => id === target || (meta && meta.nickname === target));
+      targets = entries.filter(([id, meta]) =>
+        id === target
+        || (meta && meta.nickname === target)
+        || (scopedTarget && scopedTarget !== target && meta && meta.nickname === scopedTarget)
+      );
     }
   }
 

package/src/daemon/soloBootstrap.js

@@ -5,6 +5,7 @@ const EventBus = require("../bus");
 const { prepareUcodeBootstrap } = require("../agent/ucodeBootstrap");
 const { isMetaActive } = require("../bus/utils");
 const { getUfooPaths } = require("../ufoo/paths");
+const { applyProjectNicknamePrefix } = require("./nicknameScope");
 const { loadAgentsData, saveAgentsData } = require("../ufoo/agentsStore");
 const {
   loadPromptProfileRegistry,
@@ -194,13 +195,21 @@ function isLiveAgentMeta(meta) {
 function resolveExistingAgent(projectRoot, target = "") {
   const key = String(target || "").trim();
   if (!key) return null;
+  const scopedKey = applyProjectNicknamePrefix(projectRoot, key);
   const bus = loadBusMeta(projectRoot);
   const agents = bus && bus.agents ? bus.agents : {};
   if (isLiveAgentMeta(agents[key])) {
     return { subscriberId: key, meta: agents[key] };
   }
+  if (scopedKey && scopedKey !== key && isLiveAgentMeta(agents[scopedKey])) {
+    return { subscriberId: scopedKey, meta: agents[scopedKey] };
+  }
   for (const [subscriberId, meta] of Object.entries(agents)) {
-    if (meta && meta.nickname === key && isLiveAgentMeta(meta)) {
+    if (
+      meta
+      && (meta.nickname === key || (scopedKey && scopedKey !== key && meta.nickname === scopedKey))
+      && isLiveAgentMeta(meta)
+    ) {
       return { subscriberId, meta };
     }
   }
@@ -232,7 +241,11 @@ function findOwningGroup(projectRoot, subscriberId = "") {
         && asTrimmedString(member.subscriber_id) === targetSubscriber
         && (member.status === "active" || member.status === "reused")
         && asTrimmedString(member.nickname)
-        && (!liveNickname || asTrimmedString(member.nickname) === liveNickname)
+        && (
+          !liveNickname
+          || asTrimmedString(member.nickname) === liveNickname
+          || asTrimmedString(member.runtime_nickname) === liveNickname
+        )
       );
       if (found) {
         return {