u-foo 2.3.32 → 2.4.0

package/src/{memory → coordination/memory}/index.js

@@ -8,9 +8,9 @@ const {
   getTimestamp,
   writeFileAtomic,
 } = require("../bus/utils");
-const { redactSecrets } = require("../providerapi/redactor");
-const { canonicalProjectRoot } = require("../projects/projectId");
-const { getUfooPaths } = require("../ufoo/paths");
+const { redactSecrets } = require("../../runtime/privacy/redactor");
+const { canonicalProjectRoot } = require("../../runtime/projects/projectId");
+const { getUfooPaths } = require("../state/paths");
 
 const SCHEMA_VERSION = "1.0";
 const ID_PREFIX = "mem-";

package/src/{report → coordination/report}/store.js

@@ -1,7 +1,7 @@
 const fs = require("fs");
 const path = require("path");
-const { getUfooPaths } = require("../ufoo/paths");
-const { redactSecrets } = require("../providerapi/redactor");
+const { getUfooPaths } = require("../state/paths");
+const { redactSecrets } = require("../../runtime/privacy/redactor");
 
 const REPORT_PHASES = {
   START: "start",

package/src/{status → coordination/status}/index.js

@@ -2,12 +2,12 @@ const fs = require("fs");
 const path = require("path");
 const childProcess = require("child_process");
 const { readJSON } = require("../bus/utils");
-const { getUfooPaths } = require("../ufoo/paths");
-const { resolveDisplayNickname } = require("../daemon/nicknameScope");
+const { getUfooPaths } = require("../state/paths");
+const { resolveDisplayNickname } = require("../../runtime/daemon/nicknameScope");
 const {
   inspectDirectAuthStatus,
   formatDirectAuthStatus,
-} = require("../agent/directAuthStatus");
+} = require("../../agents/providers/directAuthStatus");
 
 function normalizeTty(ttyPath) {
   if (!ttyPath) return "";

package/src/online/bridge.js

@@ -233,7 +233,7 @@ class OnlineConnect {
 
     // Init local bus only when sync is enabled
     if (this.syncEnabled) {
-      const EventBus = require("../bus");
+      const EventBus = require("../coordination/bus");
       this.eventBus = new EventBus(this.projectRoot);
       await this.eventBus.ensureJoined();
     }
@@ -666,7 +666,7 @@ class OnlineConnect {
     }
 
     try {
-      const DecisionsManager = require("../context/decisions");
+      const DecisionsManager = require("../coordination/context/decisions");
       const manager = new DecisionsManager(this.projectRoot);
       manager.writeIndex();
     } catch {

package/src/{controller → orchestration/controller}/flags.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const path = require("path");
-const { loadConfig, normalizeControllerMode } = require("../config");
+const { loadConfig, normalizeControllerMode } = require("../../config");
 
 const CONTROLLER_MODES = Object.freeze({
   LEGACY: "legacy",

package/src/{controller → orchestration/controller}/gateRouter.js

@@ -5,7 +5,7 @@ const {
   defaultRouterProviderForAgentProvider,
   defaultRouterModelForProvider,
   sameModelProvider,
-} = require("../config");
+} = require("../../config");
 
 const DEFAULT_EXECUTION_PATH = "main";
 const DEFAULT_CONFIDENCE_THRESHOLD = 0.6;

package/src/orchestration/controller/index.js

@@ -0,0 +1,10 @@
+"use strict";
+
+module.exports = {
+  ...require("./flags"),
+  ...require("./gateRouter"),
+  ...require("./launchRouting"),
+  ...require("./routerFastPath"),
+  ...require("./routerFinalize"),
+  ...require("./shadowGuard"),
+};

package/src/{controller → orchestration/controller}/shadowGuard.js

@@ -4,7 +4,7 @@ const crypto = require("crypto");
 const fs = require("fs");
 const path = require("path");
 
-const { getUfooPaths } = require("../ufoo/paths");
+const { getUfooPaths } = require("../../coordination/state/paths");
 
 const DEFAULT_SHADOW_SAMPLING_RATE = 0.1;
 const DEFAULT_SHADOW_DAILY_INPUT_TOKEN_LIMIT = 50000;

package/src/orchestration/groups/bootstrap.js

@@ -0,0 +1,3 @@
+"use strict";
+
+module.exports = require("../../agents/prompts/groupBootstrap");

package/src/orchestration/groups/index.js

@@ -0,0 +1,10 @@
+"use strict";
+
+module.exports = {
+  ...require("./bootstrap"),
+  ...require("./diagram"),
+  ...require("./promptProfiles"),
+  ...require("./templateValidation"),
+  ...require("./templates"),
+  ...require("./validateTemplate"),
+};

package/src/orchestration/groups/promptProfiles.js

@@ -0,0 +1,3 @@
+"use strict";
+
+module.exports = require("../../agents/prompts/promptProfiles");

package/src/{group → orchestration/groups}/templates.js

@@ -18,7 +18,7 @@ const SOURCE_PRIORITY = [
 ];
 
 function defaultBuiltinTemplatesDir() {
-  return path.join(path.resolve(__dirname, "..", ".."), "templates", "groups");
+  return path.join(path.resolve(__dirname, "..", "..", ".."), "templates", "groups");
 }
 
 function defaultGlobalTemplatesDir() {

package/src/{group → orchestration/groups}/validateTemplate.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const ALLOWED_AGENT_TYPES = new Set(["auto", "codex", "claude", "ucode"]);
+const ALLOWED_AGENT_TYPES = new Set(["auto", "codex", "claude", "ucode", "agy"]);
 const { resolvePromptProfileReference } = require("./promptProfiles");
 
 function isPlainObject(value) {

package/src/orchestration/index.js

@@ -0,0 +1,7 @@
+"use strict";
+
+module.exports = {
+  controller: require("./controller"),
+  groups: require("./groups"),
+  solo: require("./solo"),
+};

package/src/orchestration/solo/index.js

@@ -0,0 +1,3 @@
+"use strict";
+
+module.exports = require("./commands");

package/src/{daemon → runtime/daemon}/agentProcessManager.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const EventBus = require("../bus");
+const EventBus = require("../../coordination/bus");
 
 class AgentProcessManager {
   constructor(projectRoot) {

package/src/{daemon → runtime/daemon}/cronOps.js

@@ -1,10 +1,10 @@
 const fs = require("fs");
 const path = require("path");
-const { getUfooPaths } = require("../ufoo/paths");
+const { getUfooPaths } = require("../../coordination/state/paths");
 const {
   parseIntervalMs,
   formatIntervalMs,
-} = require("../chat/cronScheduler");
+} = require("../../app/chat/cronScheduler");
 
 function splitTargets(value = "") {
   return String(value || "")
@@ -342,6 +342,7 @@ function createDaemonCronController(options = {}) {
     };
 
     attachTaskTimer(task);
+    runTask(task);
     tasks.push(task);
     persistState();
 

package/src/{daemon → runtime/daemon}/groupOrchestrator.js

@@ -2,17 +2,17 @@
 
 const fs = require("fs");
 const path = require("path");
-const EventBus = require("../bus");
-const { prepareUcodeBootstrap } = require("../agent/ucodeBootstrap");
-const { loadConfig } = require("../config");
+const EventBus = require("../../coordination/bus");
+const { prepareUcodeBootstrap } = require("../../code/launcher/ucodeBootstrap");
+const { loadConfig } = require("../../config");
 const {
   buildGroupPromptMetadata,
   composeGroupBootstrapPrompt,
   computeBootstrapFingerprint,
   computeRosterVersion,
-} = require("../group/bootstrap");
-const { validateTemplateTarget: validateGroupTemplateTarget } = require("../group/templateValidation");
-const { getUfooPaths } = require("../ufoo/paths");
+} = require("../../orchestration/groups/bootstrap");
+const { validateTemplateTarget: validateGroupTemplateTarget } = require("../../orchestration/groups/templateValidation");
+const { getUfooPaths } = require("../../coordination/state/paths");
 const {
   normalizeNicknameSegment,
   buildProjectNicknamePrefix,
@@ -36,12 +36,15 @@ function resolveBootstrapInjectSettleMs(agentType = "", promptText = "", options
     delayMs = 800;
   } else if (normalizedAgent === "codex") {
     delayMs = 250;
+  } else if (normalizedAgent === "agy") {
+    // Agy uses an ink-style TUI like claude — same input handler latency.
+    delayMs = 800;
   }
 
   const text = typeof promptText === "string" ? promptText : "";
   if (!text) return delayMs;
   if (text.includes("\n")) {
-    delayMs += normalizedAgent === "claude" ? 200 : 100;
+    delayMs += (normalizedAgent === "claude" || normalizedAgent === "agy") ? 200 : 100;
   }
   if (text.length > 1024) {
     delayMs += Math.min(800, Math.ceil(text.length / 1024) * 120);
@@ -306,6 +309,7 @@ function resolveAutoAgentType(projectRoot, requestedType) {
   const provider = asTrimmedString(loadConfig(projectRoot).agentProvider);
   if (provider === "claude-cli") return "claude";
   if (provider === "ucode") return "ucode";
+  if (provider === "agy-cli") return "agy";
   return "codex";
 }
 
@@ -386,7 +390,14 @@ function buildExecutionPlan({
         ? "ucode-bootstrap-file"
         : (resolvedType === "claude"
           ? "system-prompt-file"
-          : (resolvedType === "codex" ? "initial-prompt-arg" : "post-launch-inject")));
+          : (resolvedType === "codex"
+            ? "initial-prompt-arg"
+            // Agy takes the bootstrap as `-i <text>`, same shape as codex's
+            // positional initial prompt — both pass the bootstrap as a flag,
+            // not via post-launch injection.
+            : (resolvedType === "agy"
+              ? "initial-prompt-arg"
+              : "post-launch-inject"))));
     const bootstrapPrompt = bootstrapRequired
       ? composeGroupBootstrapPrompt({
         profilePrompt: resolvedProfile.prompt,
@@ -908,12 +919,18 @@ function createGroupOrchestrator(options = {}) {
       // Codex: pass bootstrap prompt as the initial [PROMPT] CLI argument.
       // Codex doesn't support --append-system-prompt, but accepts an initial
       // prompt argument that becomes the first user message at startup.
+      //
+      // Agy uses the same "send bootstrap as a launch flag" model, but its
+      // flag is `-i <text>` (alias for --prompt-interactive). Same strategy
+      // key, different arg shape.
       if (item.bootstrap_strategy === "initial-prompt-arg") {
         member.bootstrap_attempted_at = nowIso();
         member.bootstrap_error = "";
         const promptText = (item.bootstrap_prompt || "").trim();
         if (promptText) {
-          extraArgs = [promptText];
+          extraArgs = item.type === "agy"
+            ? ["-i", promptText]
+            : [promptText];
           bootstrapInjected = true;
         }
       }

package/src/{daemon → runtime/daemon}/index.js

@@ -2,22 +2,22 @@ const fs = require("fs");
 const path = require("path");
 const net = require("net");
 const { spawn, spawnSync } = require("child_process");
-const { runUfooAgent, runUfooRouteAgent } = require("../agent/ufooAgent");
+const { runUfooAgent, runUfooRouteAgent } = require("../../agents/controller/ufooAgent");
 const { launchAgent, closeAgent, getRecoverableAgents, resumeAgents } = require("./ops");
 const { buildStatus } = require("./status");
-const EventBus = require("../bus");
+const EventBus = require("../../coordination/bus");
 const { AgentProcessManager } = require("./agentProcessManager");
-const NicknameManager = require("../bus/nickname");
-const { generateInstanceId, subscriberToSafeName } = require("../bus/utils");
+const NicknameManager = require("../../coordination/bus/nickname");
+const { generateInstanceId, subscriberToSafeName } = require("../../coordination/bus/utils");
 const { createDaemonIpcServer } = require("./ipcServer");
-const { IPC_REQUEST_TYPES, IPC_RESPONSE_TYPES, BUS_STATUS_PHASES } = require("../shared/eventContract");
-const { getUfooPaths } = require("../ufoo/paths");
+const { IPC_REQUEST_TYPES, IPC_RESPONSE_TYPES, BUS_STATUS_PHASES } = require("../contracts/eventContract");
+const { getUfooPaths } = require("../../coordination/state/paths");
 const { upsertProjectRuntime, markProjectStopped } = require("../projects");
-const { scheduleProviderSessionProbe, resolveSessionFromFile, persistProviderSession, loadProviderSessionCache } = require("./providerSessions");
+const { scheduleProviderSessionResolve, resolveSessionFromFile, persistProviderSession, loadProviderSessionCache } = require("./providerSessions");
 const { createTerminalAdapterRouter } = require("../terminal/adapterRouter");
 const { createDaemonCronController } = require("./cronOps");
 const { createGroupOrchestrator } = require("./groupOrchestrator");
-const { normalizeFormat, renderGroupDiagramFromTemplate, renderGroupDiagramFromRuntime } = require("../group/diagram");
+const { normalizeFormat, renderGroupDiagramFromTemplate, renderGroupDiagramFromRuntime } = require("../../orchestration/groups/diagram");
 const { runPromptWithAssistant } = require("./promptLoop");
 const { handlePromptRequest } = require("./promptRequest");
 const { recordAgentReport } = require("./reporting");
@@ -36,10 +36,10 @@ const {
   resolveDisplayNickname,
   resolveScopedNickname,
 } = require("./nicknameScope");
-const { resolveNodeExecutable } = require("../utils/nodeExecutable");
+const { resolveNodeExecutable } = require("../process/nodeExecutable");
 
 let providerSessions = null;
-let probeHandles = new Map();
+let sessionResolveHandles = new Map();
 let daemonCronController = null;
 let daemonGroupOrchestrator = null;
 const PROJECT_RUNTIME_HEARTBEAT_MS = 10 * 1000;
@@ -53,6 +53,7 @@ function normalizeBusAgentType(agentType = "") {
   if (!value) return "claude-code";
   if (value === "codex") return "codex";
   if (value === "claude" || value === "claude-code") return "claude-code";
+  if (value === "agy" || value === "antigravity") return "agy";
   if (value === "ufoo" || value === "ucode" || value === "ufoo-code") return "ufoo-code";
   return value;
 }
@@ -61,6 +62,7 @@ function normalizeLaunchAgent(agent = "") {
   const value = String(agent || "").trim().toLowerCase();
   if (value === "codex") return "codex";
   if (value === "claude" || value === "claude-code") return "claude";
+  if (value === "agy" || value === "antigravity") return "agy";
   if (value === "ufoo" || value === "ucode" || value === "ufoo-code") return "ufoo";
   return "";
 }
@@ -218,7 +220,7 @@ function isLikelyDaemonProcess(pid) {
   const hasCliPattern = /\bufoo\s+daemon\s+(--start|start)\b/.test(text);
   const hasNodePattern = /\bufoo\.js\s+daemon\s+(--start|start)\b/.test(text);
   if (hasCliPattern || hasNodePattern) return true;
-  if (text.includes("/src/daemon/run.js")) return true;
+  if (text.includes("/src/runtime/daemon/run.js")) return true;
   return false;
 }
 
@@ -609,17 +611,15 @@ async function handleOps(projectRoot, ops = [], processManager = null) {
             op.require_activity_monitor === true || op.requireActivityMonitor === true,
         });
         if (launchResult.mode === "internal" && launchResult.subscriberIds && launchResult.subscriberIds.length > 0) {
-          const probeAgentType = agent === "codex"
+          const sessionResolveAgentType = agent === "codex"
             ? "codex"
             : (agent === "claude" ? "claude-code" : "");
           for (const subscriberId of launchResult.subscriberIds) {
-            if (!probeAgentType) continue;
-            const resolvedNickname = resolveSubscriberNickname(projectRoot, subscriberId) || nickname;
-            const probeHandle = scheduleProviderSessionProbe({
+            if (!sessionResolveAgentType) continue;
+            const sessionResolveHandle = scheduleProviderSessionResolve({
               projectRoot,
               subscriberId,
-              agentType: probeAgentType,
-              nickname: resolvedNickname,
+              agentType: sessionResolveAgentType,
               agentCwd: projectRoot,
               onResolved: (id, resolved) => {
                 if (providerSessions) {
@@ -629,11 +629,11 @@ async function handleOps(projectRoot, ops = [], processManager = null) {
                     updated_at: new Date().toISOString(),
                   });
                 }
-                probeHandles.delete(id);
+                sessionResolveHandles.delete(id);
               },
             });
-            if (probeHandle) {
-              probeHandles.set(subscriberId, probeHandle);
+            if (sessionResolveHandle) {
+              sessionResolveHandles.set(subscriberId, sessionResolveHandle);
             }
           }
         }
@@ -796,21 +796,61 @@ async function dispatchMessages(projectRoot, dispatch = []) {
   const eventBus = new EventBus(projectRoot);
   // Always use "ufoo-agent" as the publisher for daemon messages
   const defaultPublisher = "ufoo-agent";
+  const resolveDispatchTarget = (target) => {
+    const raw = String(target || "").trim();
+    if (!raw || raw === "broadcast") return raw;
+    try {
+      eventBus.ensureBus();
+      eventBus.loadBusData();
+      const agents = eventBus.busData && eventBus.busData.agents && typeof eventBus.busData.agents === "object"
+        ? eventBus.busData.agents
+        : {};
+      if (agents[raw]) return raw;
+
+      const candidates = [raw];
+      const scoped = applyProjectNicknamePrefix(projectRoot, raw);
+      if (scoped && scoped !== raw) candidates.push(scoped);
+
+      for (const candidate of candidates) {
+        for (const [id, meta] of Object.entries(agents)) {
+          if (!meta || meta.status !== "active") continue;
+          if (
+            meta.nickname === candidate
+            || meta.scoped_nickname === candidate
+            || meta.display_nickname === candidate
+          ) {
+            return id;
+          }
+        }
+      }
+
+      if (eventBus.messageManager && eventBus.messageManager.resolveTarget(raw).length > 0) {
+        return raw;
+      }
+    } catch {
+      // Fall through to the original target; send will surface/log the failure below.
+    }
+    return raw;
+  };
   for (const item of dispatch) {
     if (!item || !item.target || !item.message) continue;
     const pub = item.publisher || defaultPublisher;
+    const target = resolveDispatchTarget(item.target);
     const sendOptions = {
       injectionMode: item.injection_mode,
       source: item.source,
     };
     try {
-      if (item.target === "broadcast") {
+      if (target === "broadcast") {
         await eventBus.broadcast(item.message, pub, sendOptions);
       } else {
-        await eventBus.send(item.target, item.message, pub, sendOptions);
+        await eventBus.send(target, item.message, pub, sendOptions);
       }
-    } catch {
-      // ignore dispatch failures
+    } catch (err) {
+      appendControlLog(
+        projectRoot,
+        `dispatch failed target=${JSON.stringify(item.target)} resolved=${JSON.stringify(target)} error=${err && err.message ? err.message : String(err)}`
+      );
     }
   }
 }
@@ -1218,7 +1258,7 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
 
   // Provider session cache (in-memory)
   providerSessions = loadProviderSessionCache(projectRoot);
-  probeHandles = new Map();
+  sessionResolveHandles = new Map();
   daemonCronController = createDaemonCronController({
     projectRoot,
     dispatch: async ({ taskId, target, message }) => {
@@ -1318,13 +1358,13 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
           }
           const targetPaths = getUfooPaths(root);
           if (!fs.existsSync(targetPaths.ufooDir)) {
-            const repoRoot = path.join(__dirname, "..", "..");
-            const init = new (require("../init"))(repoRoot);
+            const repoRoot = path.join(__dirname, "..", "..", "..");
+            const init = new (require("../../app/cli/features/init"))(repoRoot);
             await init.init({ modules: "context,bus", project: root });
           }
           if (!isRunning(root)) {
             cleanupStaleState(root);
-            const daemonBin = path.join(__dirname, "..", "..", "bin", "ufoo.js");
+            const daemonBin = path.join(__dirname, "..", "..", "..", "bin", "ufoo.js");
             const child = spawn(resolveNodeExecutable(), [daemonBin, "daemon", "--start"], {
               detached: true,
               stdio: "ignore",
@@ -1583,7 +1623,7 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
         socket.write(
           `${JSON.stringify({
             type: IPC_RESPONSE_TYPES.ERROR,
-            error: "launch_agent requires agent=codex|claude|ucode",
+            error: "launch_agent requires agent=codex|claude|agy|ucode",
           })}
 `,
         );
@@ -1620,9 +1660,9 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
             : null,
       };
       let soloLaunchBootstrap = null;
-      if (requestedProfile && (normalizedAgent === "ufoo" || normalizedAgent === "claude" || normalizedAgent === "codex")) {
-        const agentTypeMap = { ufoo: "ufoo-code", claude: "claude-code", codex: "codex" };
-        const defaultNickMap = { ufoo: "ucode", claude: "claude", codex: "codex" };
+      if (requestedProfile && (normalizedAgent === "ufoo" || normalizedAgent === "claude" || normalizedAgent === "codex" || normalizedAgent === "agy")) {
+        const agentTypeMap = { ufoo: "ufoo-code", claude: "claude-code", codex: "codex", agy: "agy" };
+        const defaultNickMap = { ufoo: "ucode", claude: "claude", codex: "codex", agy: "agy" };
         const agentTypeForBootstrap = agentTypeMap[normalizedAgent];
         const soloNickname = explicitNickname || defaultNickMap[normalizedAgent];
         const profileResult = resolveSoloPromptProfile(projectRoot, requestedProfile);
@@ -1667,6 +1707,12 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
                 ...(Array.isArray(op.extra_args) ? op.extra_args : []),
                 built.promptText,
               ];
+            } else if (normalizedAgent === "agy") {
+              // agy: bootstrap via -i (alias for --prompt-interactive)
+              op.extra_args = [
+                ...(Array.isArray(op.extra_args) ? op.extra_args : []),
+                "-i", built.promptText,
+              ];
             }
             soloLaunchBootstrap = {
               requested_profile: profileResult.requested_profile,
@@ -2246,7 +2292,7 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
         hostName,
         hostSessionId,
         hostCapabilities,
-        skipProbe,
+        skipSessionResolve,
       } = req;
       if (!agentType) {
         socket.write(
@@ -2305,7 +2351,7 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
           reuseSessionId,
           reuseProviderSessionId,
         };
-        if (skipProbe) joinOptions.skipProbe = true;
+        if (skipSessionResolve) joinOptions.skipSessionResolve = true;
 
         let finalNickname = nickname || "";
         let scopedNickname = applyProjectNicknamePrefix(projectRoot, finalNickname, {
@@ -2334,7 +2380,7 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
         eventBus.saveBusData();
         const resolvedNickname = resolveSubscriberNickname(projectRoot, subscriberId) || finalNickname || "";
 
-        if (!skipProbe && reuseProviderSessionId) {
+        if (!skipSessionResolve && reuseProviderSessionId) {
           if (providerSessions) {
             providerSessions.set(subscriberId, {
               sessionId: reuseProviderSessionId,
@@ -2344,12 +2390,11 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
           }
         }
 
-        if (!skipProbe) {
-          const probeHandle = scheduleProviderSessionProbe({
+        if (!skipSessionResolve) {
+          const sessionResolveHandle = scheduleProviderSessionResolve({
             projectRoot,
             subscriberId,
             agentType,
-            nickname: resolvedNickname,
             agentCwd: projectRoot,
             onResolved: (id, resolved) => {
               if (providerSessions) {
@@ -2359,11 +2404,11 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
                   updated_at: new Date().toISOString(),
                 });
               }
-              probeHandles.delete(id);
+              sessionResolveHandles.delete(id);
             },
           });
-          if (probeHandle) {
-            probeHandles.set(subscriberId, probeHandle);
+          if (sessionResolveHandle) {
+            sessionResolveHandles.set(subscriberId, sessionResolveHandle);
           }
         }
         socket.write(
@@ -2418,12 +2463,12 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
                 updated_at: new Date().toISOString(),
               });
             }
-            // Cancel the scheduled probe to prevent redundant /ufoo injection
-            const handle = probeHandles.get(subscriberId);
+            // Cancel the scheduled resolver; AGENT_READY already found the session file.
+            const handle = sessionResolveHandles.get(subscriberId);
             if (handle && typeof handle.cancel === "function") {
               handle.cancel();
             }
-            probeHandles.delete(subscriberId);
+            sessionResolveHandles.delete(subscriberId);
             return;
           }
 
@@ -2435,15 +2480,15 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
           }
         }
 
-        // Exhausted retries or no pid — fall back to scheduled probe
-        const probeHandle = probeHandles.get(subscriberId);
-        if (probeHandle && typeof probeHandle.triggerNow === "function") {
-          log(`agent_ready falling back to probe for ${subscriberId}`);
-          probeHandle.triggerNow().catch((err) => {
-            log(`agent_ready probe trigger failed for ${subscriberId}: ${err.message}`);
+        // Exhausted retries or no pid — trigger the scheduled file resolver.
+        const sessionResolveHandle = sessionResolveHandles.get(subscriberId);
+        if (sessionResolveHandle && typeof sessionResolveHandle.triggerNow === "function") {
+          log(`agent_ready triggering scheduled session resolver for ${subscriberId}`);
+          sessionResolveHandle.triggerNow().catch((err) => {
+            log(`agent_ready session resolver trigger failed for ${subscriberId}: ${err.message}`);
           });
         } else {
-          log(`agent_ready no probe handle found for ${subscriberId}`);
+          log(`agent_ready no session resolver handle found for ${subscriberId}`);
         }
       };
 
@@ -2461,7 +2506,7 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
   log(`Started pid=${process.pid}`);
 
   // 清理旧 daemon 留下的孤儿 internal agent 进程
-  const EventBus = require("../bus");
+  const EventBus = require("../../coordination/bus");
   const { spawnSync } = require("child_process");
   const eventBus = new EventBus(projectRoot);
   try {
@@ -2712,4 +2757,11 @@ function stopDaemon(projectRoot, options = {}) {
   return stopped;
 }
 
-module.exports = { startDaemon, stopDaemon, isRunning, cleanupStaleState, socketPath };
+module.exports = {
+  startDaemon,
+  stopDaemon,
+  isRunning,
+  cleanupStaleState,
+  socketPath,
+  dispatchMessages,
+};

package/src/{daemon → runtime/daemon}/ipcServer.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const net = require("net");
-const { IPC_RESPONSE_TYPES } = require("../shared/eventContract");
+const { IPC_RESPONSE_TYPES } = require("../contracts/eventContract");
 
 function createDaemonIpcServer(options = {}) {
   const {

package/src/{daemon → runtime/daemon}/nicknameScope.js

@@ -86,10 +86,13 @@ function stripProjectNicknamePrefix(projectRoot, nickname = "") {
 
 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);
+  // Always strip the project prefix off whichever nickname we settle on:
+  // group startup (groupOrchestrator) writes the scoped form into both
+  // `nickname` and `scoped_nickname`, so the previous "if scoped exists,
+  // return nickname as-is" shortcut surfaced the project-prefixed form to
+  // the UI instead of the short display name.
+  if (explicit) return stripProjectNicknamePrefix(projectRoot, explicit);
   if (scoped) return stripProjectNicknamePrefix(projectRoot, scoped);
   return asTrimmedString(fallback);
 }