u-foo 1.8.9 → 1.9.1

package/src/chat/completionController.js

@@ -4,6 +4,13 @@ const FALLBACK_LAUNCH_SUBCOMMANDS = [
   { cmd: "ucode", desc: "Launch ucode core agent" },
 ];
 
+function sortSubcommandEntries(a, b) {
+  const aOrder = Number.isFinite(a && a.order) ? a.order : Number.POSITIVE_INFINITY;
+  const bOrder = Number.isFinite(b && b.order) ? b.order : Number.POSITIVE_INFINITY;
+  if (aOrder !== bOrder) return aOrder - bOrder;
+  return String(a && a.cmd ? a.cmd : "").localeCompare(String(b && b.cmd ? b.cmd : ""), "en", { sensitivity: "base" });
+}
+
 function createCompletionController(options = {}) {
   const {
     input,
@@ -12,6 +19,7 @@ function createCompletionController(options = {}) {
     promptBox,
     commandRegistry = [],
     getGroupTemplateCandidates = () => [],
+    getSoloProfileCandidates = () => [],
     getMentionCandidates = () => [],
     normalizeCommandPrefix = () => {},
     truncateText = (text) => String(text || ""),
@@ -143,6 +151,7 @@ function createCompletionController(options = {}) {
     const mainCmd = parts[0];
     const isLaunch = mainCmd && mainCmd.toLowerCase() === "/launch";
     const isGroup = mainCmd && mainCmd.toLowerCase() === "/group";
+    const isSolo = mainCmd && mainCmd.toLowerCase() === "/solo";
     const wantsSubcommands = (parts.length > 1 || (endsWithSpace && parts.length === 1));
 
     if (isGroup) {
@@ -169,6 +178,28 @@ function createCompletionController(options = {}) {
       }
     }
 
+    if (isSolo) {
+      const soloSubcommand = String(parts[1] || "").trim().toLowerCase();
+      const wantsSoloRunArgs = soloSubcommand === "run" && (parts.length > 2 || endsWithSpace);
+      if (wantsSoloRunArgs) {
+        const profileFilter = String(parts[2] || "").trim().toLowerCase();
+        return (Array.isArray(getSoloProfileCandidates()) ? getSoloProfileCandidates() : [])
+          .map((item) => {
+            const profileId = String(item && item.cmd ? item.cmd : item && item.id ? item.id : "").trim();
+            if (!profileId) return null;
+            const desc = String(item && item.desc ? item.desc : item && item.summary ? item.summary : "").trim();
+            return {
+              cmd: profileId,
+              desc,
+              isArgumentSuggestion: true,
+              argumentPrefix: "/solo run",
+            };
+          })
+          .filter((item) => item && (!profileFilter || item.cmd.toLowerCase().startsWith(profileFilter)))
+          .sort((a, b) => a.cmd.localeCompare(b.cmd, "en", { sensitivity: "base" }));
+      }
+    }
+
     if ((wantsSubcommands || isLaunch) && mainCmd && mainCmd.startsWith("/")) {
       const subFilter = parts[1] || "";
       const mainCmdObj = commandRegistry.find((item) =>
@@ -188,12 +219,12 @@ function createCompletionController(options = {}) {
         if (isLaunch) {
           return subs
             .map((sub) => ({ ...sub, isSubcommand: true, parentCmd: mainCmd }))
-            .sort((a, b) => a.cmd.localeCompare(b.cmd));
+            .sort(sortSubcommandEntries);
         }
         return subs
           .filter((sub) => sub.cmd.toLowerCase().startsWith(subFilter.toLowerCase()))
           .map((sub) => ({ ...sub, isSubcommand: true, parentCmd: mainCmd }))
-          .sort((a, b) => a.cmd.localeCompare(b.cmd));
+          .sort(sortSubcommandEntries);
       }
       return [];
     }
@@ -340,7 +371,11 @@ function createCompletionController(options = {}) {
 
     if (!selected.isSubcommand && selected.subcommands && selected.subcommands.length > 0) {
       show(input.value);
-    } else if (selected.isSubcommand && selected.parentCmd === "/group" && selected.cmd === "run") {
+    } else if (
+      selected.isSubcommand
+      && ((selected.parentCmd === "/group" && selected.cmd === "run")
+        || (selected.parentCmd === "/solo" && selected.cmd === "run"))
+    ) {
       show(input.value);
     } else {
       hide();
@@ -384,7 +419,11 @@ function createCompletionController(options = {}) {
           applyPreview(nextPreview);
           if (!selected.isSubcommand && selected.subcommands && selected.subcommands.length > 0) {
             show(input.value);
-          } else if (selected.isSubcommand && selected.parentCmd === "/group" && selected.cmd === "run") {
+          } else if (
+            selected.isSubcommand
+            && ((selected.parentCmd === "/group" && selected.cmd === "run")
+              || (selected.parentCmd === "/solo" && selected.cmd === "run"))
+          ) {
             show(input.value);
           } else {
             hide();

package/src/chat/daemonReconnect.js

@@ -1,3 +1,5 @@
+const { restartLocks } = require("./daemonTransport");
+
 function resolveDaemonConnection(daemonConnection) {
   return typeof daemonConnection === "function" ? daemonConnection() : daemonConnection;
 }
@@ -14,11 +16,10 @@ function restartDaemonFlow(options = {}) {
 
   const statusMsg = resolveStatusLine || ((text) => logMessage("status", text));
 
-  let restartInProgress = false;
-
   return async function restartDaemon() {
-    if (restartInProgress) return;
-    restartInProgress = true;
+    // Use global restart lock to prevent concurrent restart flows
+    if (restartLocks.get(projectRoot)) return;
+    restartLocks.set(projectRoot, true);
     statusMsg("{gray-fg}⚙{/gray-fg} Restarting daemon...");
     try {
       const connection = resolveDaemonConnection(daemonConnection);
@@ -34,7 +35,7 @@ function restartDaemonFlow(options = {}) {
         statusMsg("{gray-fg}✗{/gray-fg} Failed to reconnect to daemon");
       }
     } finally {
-      restartInProgress = false;
+      restartLocks.delete(projectRoot);
     }
   };
 }

package/src/chat/daemonTransport.js

@@ -1,5 +1,8 @@
 const { DAEMON_TRANSPORT_DEFAULTS } = require("./daemonTransportDefaults");
 
+// Global restart lock per project to prevent concurrent restart flows
+const restartLocks = new Map();
+
 function createDaemonTransport(options = {}) {
   const {
     projectRoot,
@@ -34,7 +37,9 @@ function createDaemonTransport(options = {}) {
     );
     if (!client) {
       // Retry once with a fresh daemon start and longer wait.
-      if (!isRunning(target.projectRoot)) {
+      // Check if a restart is already in progress via the explicit restart flow.
+      const isExplicitRestartInProgress = restartLocks.get(target.projectRoot);
+      if (!isExplicitRestartInProgress && !isRunning(target.projectRoot)) {
         startDaemon(target.projectRoot);
         await new Promise((resolve) => setTimeout(resolve, restartDelayMs));
       }
@@ -75,4 +80,5 @@ function createDaemonTransport(options = {}) {
 
 module.exports = {
   createDaemonTransport,
+  restartLocks,
 };

package/src/chat/index.js

@@ -18,6 +18,7 @@ const { getUfooPaths } = require("../ufoo/paths");
 const { startDaemon, stopDaemon, connectWithRetry } = require("./transport");
 const { escapeBlessed, stripBlessedTags, truncateText } = require("./text");
 const { COMMAND_REGISTRY, parseCommand, parseAtTarget } = require("./commands");
+const { buildPromptProfileCandidates } = require("../solo/commands");
 const inputMath = require("./inputMath");
 const { createStreamTracker } = require("./streamTracker");
 const agentDirectory = require("./agentDirectory");
@@ -43,15 +44,18 @@ const { createDaemonCoordinator } = require("./daemonCoordinator");
 const { IPC_REQUEST_TYPES } = require("../shared/eventContract");
 const { createTerminalAdapterRouter } = require("../terminal/adapterRouter");
 const { createDaemonTransport } = require("./daemonTransport");
-const { listProjectRuntimes, resolveRuntimeDir } = require("../projects/registry");
-const { canonicalProjectRoot, buildProjectId } = require("../projects/projectId");
-const { loadTemplateRegistry } = require("../group/templates");
 const {
+  listProjectRuntimes,
+  resolveRuntimeDir,
+  canonicalProjectRoot,
+  buildProjectId,
   sortProjectRuntimes,
   parseTimestampMs,
   filterVisibleProjectRuntimes,
-} = require("./projectRuntimes");
-const { isGlobalControllerProjectRoot, resolveGlobalControllerProjectRoot } = require("../globalMode");
+  isGlobalControllerProjectRoot,
+  resolveGlobalControllerProjectRoot,
+} = require("../projects");
+const { loadTemplateRegistry } = require("../group/templates");
 const {
   DEFAULT_TRANSIENT_AGENT_STATE_TTL_MS,
   setTransientAgentState: setTransientAgentStateValue,
@@ -559,6 +563,10 @@ async function runChat(projectRoot, options = {}) {
         source: item.source || "",
       }));
     },
+    getSoloProfileCandidates: () => {
+      const registry = loadPromptProfileRegistry(activeProjectRoot);
+      return buildPromptProfileCandidates(registry);
+    },
     getMentionCandidates: () => activeAgents.map((id) => ({
       id,
       label: getAgentLabel(id),

package/src/cli.js

@@ -7,6 +7,9 @@ const { runBusCoreCommand } = require("./cli/busCoreCommands");
 const { runCtxCommand } = require("./cli/ctxCoreCommands");
 const { runOnlineCommand } = require("./cli/onlineCoreCommands");
 const { runGroupCoreCommand } = require("./cli/groupCoreCommands");
+const { loadConfig } = require("./config");
+const { loadPromptProfileRegistry } = require("./group/promptProfiles");
+const { resolveSoloAgentType } = require("./solo/commands");
 const { listProjectRuntimes, getCurrentProjectRuntime } = require("./projects/registry");
 const { canonicalProjectRoot, buildProjectId } = require("./projects/projectId");
 const { getUfooPaths } = require("./ufoo/paths");
@@ -448,6 +451,68 @@ async function runCli(argv) {
           process.exitCode = 1;
         }
       });
+    program
+      .command("solo")
+      .description("Solo role agent operations")
+      .argument("<action>", "run|list")
+      .argument("[profile]", "Prompt profile id or alias")
+      .option("--agent <type>", "Agent type: codex|claude|ucode")
+      .option("--nickname <name>", "Optional nickname")
+      .option("--scope <scope>", "Launch scope: inplace|window", "inplace")
+      .option("--json", "Output role list as JSON")
+      .action(async (action, profile, opts) => {
+        try {
+          const projectRoot = process.cwd();
+          const subcommand = String(action || "").trim().toLowerCase();
+          if (subcommand === "list" || subcommand === "ls") {
+            const registry = loadPromptProfileRegistry(projectRoot);
+            if (opts.json) {
+              console.log(JSON.stringify({ profiles: registry.profiles || [] }, null, 2));
+              return;
+            }
+            const profiles = registry.profiles || [];
+            if (profiles.length === 0) {
+              console.log("No solo roles found.");
+              return;
+            }
+            console.log(`Available solo roles (${profiles.length}):`);
+            for (const p of profiles) {
+              const aliases = p.aliases && p.aliases.length > 0 ? ` (${p.aliases.join(", ")})` : "";
+              const source = p.source ? ` [${p.source}]` : "";
+              console.log(`  ${p.id}${aliases}${source}`);
+              if (p.summary) console.log(`    ${p.summary}`);
+            }
+            return;
+          }
+          if (subcommand !== "run") {
+            throw new Error(`Unknown solo action: ${subcommand}`);
+          }
+          const promptProfile = String(profile || "").trim();
+          if (!promptProfile) {
+            throw new Error("solo run requires <profile>");
+          }
+          await ensureDaemonRunning(projectRoot);
+          const config = loadConfig(projectRoot);
+          const agent = resolveSoloAgentType(config, opts.agent || "");
+          const scope = String(opts.scope || "inplace").trim().toLowerCase();
+          if (scope !== "inplace" && scope !== "window") {
+            throw new Error("scope must be inplace|window");
+          }
+          const resp = await sendDaemonRequest(projectRoot, {
+            type: "launch_agent",
+            agent: agent === "ucode" ? "ufoo" : agent,
+            nickname: String(opts.nickname || "").trim(),
+            prompt_profile: promptProfile,
+            count: 1,
+            launch_scope: scope,
+            ...collectHostLaunchRequestContext(),
+          });
+          console.log(resp?.data?.reply || `Launched ${agent} role ${promptProfile}`);
+        } catch (err) {
+          console.error(err.message || String(err));
+          process.exitCode = 1;
+        }
+      });
     program
       .command("role")
       .description("Assign a preset role to an existing agent")
@@ -1262,6 +1327,38 @@ async function runCli(argv) {
         }
       });
 
+    const history = program.command("history").description("Agent input history timeline");
+    history
+      .command("build")
+      .description("Build unified input timeline (incremental by default)")
+      .option("--force", "Full rebuild (ignore watermark)")
+      .action((opts) => {
+        const { buildTimeline } = require("./history/inputTimeline");
+        const result = buildTimeline(process.cwd(), { force: opts.force === true });
+        console.log(`Timeline: ${result.count} total, ${result.newCount} new → ${result.file}`);
+      });
+    history
+      .command("show")
+      .description("Show recent timeline entries")
+      .argument("[limit]", "Number of entries to show", "50")
+      .action((limit) => {
+        const { showTimeline } = require("./history/inputTimeline");
+        showTimeline(process.cwd(), parseInt(limit, 10) || 50);
+      });
+    history
+      .command("prompt")
+      .description("Render timeline as injectable prompt context")
+      .argument("[limit]", "Number of entries to include", "30")
+      .action((limit) => {
+        const { renderTimelineForPrompt } = require("./history/inputTimeline");
+        const text = renderTimelineForPrompt(process.cwd(), parseInt(limit, 10) || 30);
+        if (text) {
+          console.log(text);
+        } else {
+          console.log("No timeline data. Run `ufoo history build` first.");
+        }
+      });
+
     program.addHelpText(
       "after",
       `\nNotes:\n  - If 'ufoo' isn't in PATH, run it via ${chalk.cyan(
@@ -1312,6 +1409,8 @@ async function runCli(argv) {
     console.log("  ufoo group status [groupId] [--json]");
     console.log("  ufoo group diagram <alias|groupId> [--ascii|--mermaid] [--json]");
     console.log("  ufoo group stop <groupId> [--json]");
+    console.log("  ufoo solo list [--json]");
+    console.log("  ufoo solo run <profile> [--agent <codex|claude|ucode>] [--nickname <name>] [--scope <inplace|window>]");
     console.log("  ufoo online server [--port 8787] [--host 127.0.0.1] [--token-file <path>]");
     console.log("  ufoo online token <subscriber> [--nickname <name>] [--server <url>] [--file <path>]");
     console.log("  ufoo online room create [--name <room>] --type public|private [--password <pwd>] [--created-by <name>] [--server <url>]");
@@ -1324,6 +1423,7 @@ async function runCli(argv) {
     console.log("  ufoo bus wake <target> [--reason <reason>] [--no-shake]");
     console.log("  ufoo bus <args...>    (JS bus implementation)");
     console.log("  ufoo ctx <subcmd> ... (doctor|lint|decisions|sync)");
+    console.log("  ufoo history <build|show|prompt> [limit]");
     console.log("");
     console.log("Notes:");
     console.log("  - For Codex notifications, use ufoo bus alert / ufoo bus listen");
@@ -1795,6 +1895,67 @@ async function runCli(argv) {
     })();
     return;
   }
+  if (cmd === "solo") {
+    const sub = String(rest[0] || "").trim().toLowerCase();
+    (async () => {
+      try {
+        const projectRoot = process.cwd();
+        if (sub === "list" || sub === "ls") {
+          const outputJson = rest.includes("--json");
+          const registry = loadPromptProfileRegistry(projectRoot);
+          if (outputJson) {
+            console.log(JSON.stringify({ profiles: registry.profiles || [] }, null, 2));
+            return;
+          }
+          const profiles = registry.profiles || [];
+          if (profiles.length === 0) {
+            console.log("No solo roles found.");
+            return;
+          }
+          console.log(`Available solo roles (${profiles.length}):`);
+          for (const p of profiles) {
+            const aliases = p.aliases && p.aliases.length > 0 ? ` (${p.aliases.join(", ")})` : "";
+            const source = p.source ? ` [${p.source}]` : "";
+            console.log(`  ${p.id}${aliases}${source}`);
+            if (p.summary) console.log(`    ${p.summary}`);
+          }
+          return;
+        }
+        if (sub === "run") {
+          const profile = String(rest[1] || "").trim();
+          if (!profile) throw new Error("solo run requires <profile>");
+          const agentIdx = rest.indexOf("--agent");
+          const agentInput = agentIdx !== -1 ? String(rest[agentIdx + 1] || "").trim() : "";
+          const nickIdx = rest.indexOf("--nickname");
+          const nickname = nickIdx !== -1 ? String(rest[nickIdx + 1] || "").trim() : "";
+          const scopeIdx = rest.indexOf("--scope");
+          const scope = scopeIdx !== -1 ? String(rest[scopeIdx + 1] || "").trim().toLowerCase() : "inplace";
+          if (scope !== "inplace" && scope !== "window") {
+            throw new Error("scope must be inplace|window");
+          }
+          await ensureDaemonRunning(projectRoot);
+          const config = loadConfig(projectRoot);
+          const agent = resolveSoloAgentType(config, agentInput);
+          const resp = await sendDaemonRequest(projectRoot, {
+            type: "launch_agent",
+            agent: agent === "ucode" ? "ufoo" : agent,
+            nickname,
+            prompt_profile: profile,
+            count: 1,
+            launch_scope: scope,
+            ...collectHostLaunchRequestContext(),
+          });
+          console.log(resp?.data?.reply || `Launched ${agent} role ${profile}`);
+          return;
+        }
+        throw new Error(`Unknown solo action: ${sub || "(empty)"}`);
+      } catch (err) {
+        console.error(err.message || String(err));
+        process.exitCode = 1;
+      }
+    })();
+    return;
+  }
   if (cmd === "online") {
     const sub = rest[0] || "";
     if (!sub) {
@@ -1971,6 +2132,36 @@ async function runCli(argv) {
     return;
   }
 
+  if (cmd === "history") {
+    const sub = rest[0] || "show";
+    const cwd = process.cwd();
+    const { buildTimeline, showTimeline, renderTimelineForPrompt } = require("./history/inputTimeline");
+
+    if (sub === "build") {
+      const force = rest.includes("--force");
+      const result = buildTimeline(cwd, { force });
+      console.log(`Timeline: ${result.count} total, ${result.newCount} new → ${result.file}`);
+      return;
+    }
+    if (sub === "show") {
+      const limit = parseInt(rest[1], 10) || 50;
+      showTimeline(cwd, limit);
+      return;
+    }
+    if (sub === "prompt") {
+      const limit = parseInt(rest[1], 10) || 30;
+      const text = renderTimelineForPrompt(cwd, limit);
+      if (text) {
+        console.log(text);
+      } else {
+        console.log("No timeline data. Run `ufoo history build` first.");
+      }
+      return;
+    }
+    console.log("Usage: ufoo history [build|show|prompt] [limit]");
+    return;
+  }
+
   help();
   process.exitCode = 1;
 }

package/src/daemon/groupOrchestrator.js

@@ -753,6 +753,7 @@ function createGroupOrchestrator(options = {}) {
     }
 
     const plan = buildLaunchPlan(validated.entry.data);
+    const templateDefaults = (validated.entry.data && validated.entry.data.defaults) || {};
     const groupId = generateGroupId(validated.entry.alias || alias, instance);
     const projectNicknamePrefix = buildProjectNicknamePrefix(projectRoot);
 
@@ -835,6 +836,12 @@ function createGroupOrchestrator(options = {}) {
       const item = compiled.executionPlan[i];
       const member = runtime.members[i];
       const extraEnv = {};
+      if (item.bootstrap_required) {
+        extraEnv.UFOO_SKIP_DEFAULT_BOOTSTRAP = "1";
+      }
+      if (Number.isInteger(templateDefaults.start_timeout_ms) && templateDefaults.start_timeout_ms > 0) {
+        extraEnv.UFOO_REGISTER_TIMEOUT_MS = String(templateDefaults.start_timeout_ms);
+      }
       let extraArgs = [];
       let bootstrapInjected = false;
 

package/src/daemon/index.js

@@ -12,7 +12,7 @@ const { generateInstanceId, subscriberToSafeName } = require("../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 { upsertProjectRuntime, markProjectStopped } = require("../projects/registry");
+const { upsertProjectRuntime, markProjectStopped } = require("../projects");
 const { scheduleProviderSessionProbe, resolveSessionFromFile, persistProviderSession, loadProviderSessionCache } = require("./providerSessions");
 const { createTerminalAdapterRouter } = require("../terminal/adapterRouter");
 const { createDaemonCronController } = require("./cronOps");
@@ -22,7 +22,7 @@ const { runAssistantTask } = require("../assistant/bridge");
 const { runPromptWithAssistant } = require("./promptLoop");
 const { handlePromptRequest } = require("./promptRequest");
 const { recordAgentReport } = require("./reporting");
-const { isGlobalControllerProjectRoot } = require("../globalMode");
+const { isGlobalControllerProjectRoot } = require("../projects");
 const {
   assignSoloRoleToExistingAgent,
   resolveSoloPromptProfile,
@@ -201,16 +201,16 @@ function looksLikeRunningDaemon(projectRoot, pid) {
 function isRunning(projectRoot) {
   const pid = readPid(projectRoot);
   if (!pid) return false;
-  if (looksLikeRunningDaemon(projectRoot, pid)) {
-    return true;
-  }
+  return looksLikeRunningDaemon(projectRoot, pid);
+}
+
+function cleanupStaleState(projectRoot) {
   try {
     fs.unlinkSync(pidPath(projectRoot));
   } catch {
     // ignore
   }
   removeSocket(projectRoot);
-  return false;
 }
 
 function removeSocket(projectRoot) {
@@ -1051,6 +1051,7 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
             await init.init({ modules: "context,bus", project: root });
           }
           if (!isRunning(root)) {
+            cleanupStaleState(root);
             const daemonBin = path.join(__dirname, "..", "..", "bin", "ufoo.js");
             const child = spawn(process.execPath, [daemonBin, "daemon", "--start"], {
               detached: true,
@@ -1384,6 +1385,12 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
           }
         }
       }
+      if (requestedProfile) {
+        op.extra_env = {
+          ...(op.extra_env && typeof op.extra_env === "object" ? op.extra_env : {}),
+          UFOO_SKIP_DEFAULT_BOOTSTRAP: "1",
+        };
+      }
       try {
         const opsResults = await handleOps(projectRoot, [op], processManager);
         const launchResult = opsResults.find((r) => r.action === "launch");
@@ -2064,43 +2071,61 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
       }
       log(`agent_ready id=${subscriberId} pid=${agentPid || 0} - resolving session`);
 
-      // Try direct file read first if we have agentPid (fast path)
       const parsedAgentPid = Number.parseInt(agentPid, 10);
-      if (Number.isFinite(parsedAgentPid) && parsedAgentPid > 0) {
-        const agentType = subscriberId.split(":")[0] || "";
-        const resolved = resolveSessionFromFile(agentType, {
-          pid: parsedAgentPid,
-          cwd: projectRoot,
-        });
-        if (resolved && resolved.sessionId) {
-          log(`agent_ready session resolved from file for ${subscriberId}: ${resolved.sessionId}`);
-          persistProviderSession(projectRoot, subscriberId, resolved);
-          if (providerSessions) {
-            providerSessions.set(subscriberId, {
-              sessionId: resolved.sessionId,
-              source: resolved.source || "",
-              updated_at: new Date().toISOString(),
-            });
+      const agentType = subscriberId.split(":")[0] || "";
+
+      // In _spawnDirect (host mode), AGENT_READY is sent immediately after
+      // spawn() before Claude has written ~/.claude/sessions/<pid>.json.
+      // Retry with short backoff to handle the race condition.
+      const RETRY_DELAYS_MS = [100, 500, 1000, 2000, 3000];
+
+      const tryResolveSession = (attempt) => {
+        if (Number.isFinite(parsedAgentPid) && parsedAgentPid > 0) {
+          const resolved = resolveSessionFromFile(agentType, {
+            pid: parsedAgentPid,
+            cwd: projectRoot,
+          });
+          if (resolved && resolved.sessionId) {
+            const attemptNote = attempt > 1 ? ` (attempt ${attempt})` : "";
+            log(`agent_ready session resolved from file for ${subscriberId}: ${resolved.sessionId}${attemptNote}`);
+            persistProviderSession(projectRoot, subscriberId, resolved);
+            if (providerSessions) {
+              providerSessions.set(subscriberId, {
+                sessionId: resolved.sessionId,
+                source: resolved.source || "",
+                updated_at: new Date().toISOString(),
+              });
+            }
+            // Cancel the scheduled probe to prevent redundant /ufoo injection
+            const handle = probeHandles.get(subscriberId);
+            if (handle && typeof handle.cancel === "function") {
+              handle.cancel();
+            }
+            probeHandles.delete(subscriberId);
+            return;
           }
-          // Cancel the scheduled probe to prevent /ufoo injection
-          const handle = probeHandles.get(subscriberId);
-          if (handle && typeof handle.cancel === "function") {
-            handle.cancel();
+
+          // Session file not ready — retry if attempts remain
+          const delayMs = RETRY_DELAYS_MS[attempt - 1];
+          if (delayMs !== undefined) {
+            setTimeout(() => tryResolveSession(attempt + 1), delayMs);
+            return;
           }
-          probeHandles.delete(subscriberId);
-          return;
         }
-      }
 
-      // Fallback: trigger scheduled probe
-      const probeHandle = probeHandles.get(subscriberId);
-      if (probeHandle && typeof probeHandle.triggerNow === "function") {
-        probeHandle.triggerNow().catch((err) => {
-          log(`agent_ready probe trigger failed for ${subscriberId}: ${err.message}`);
-        });
-      } else {
-        log(`agent_ready no probe handle found for ${subscriberId}`);
-      }
+        // 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}`);
+          });
+        } else {
+          log(`agent_ready no probe handle found for ${subscriberId}`);
+        }
+      };
+
+      tryResolveSession(1);
       return;
     }
   };
@@ -2323,4 +2348,4 @@ function stopDaemon(projectRoot) {
   return killed;
 }
 
-module.exports = { startDaemon, stopDaemon, isRunning, socketPath };
+module.exports = { startDaemon, stopDaemon, isRunning, cleanupStaleState, socketPath };

package/src/daemon/promptRequest.js

@@ -5,7 +5,7 @@ const {
   listControllerInboxEntries,
   consumeControllerInboxEntries,
 } = require("../report/store");
-const { isGlobalControllerProjectRoot } = require("../globalMode");
+const { isGlobalControllerProjectRoot } = require("../projects");
 
 function normalizeProjectRoute(route) {
   if (!route || typeof route !== "object") return null;

package/src/group/bootstrap.js

@@ -2,6 +2,15 @@
 
 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.",
+  "- 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.",
+].join("\n");
+
 const SHARED_GROUP_PREFIX = [
   "You are part of a ufoo multi-agent group.",
   "",
@@ -13,6 +22,8 @@ const SHARED_GROUP_PREFIX = [
   "- When reporting, separate facts, inferences, and recommendations.",
   "- Preserve continuity with the group's current task rather than restarting analysis from scratch.",
   "",
+  SHARED_UFOO_PROTOCOL,
+  "",
   "Coordination protocol:",
   "- Use direct handoff for worker-to-worker delivery.",
   "- Use private `ufoo report` updates for ufoo-agent control-plane reporting.",
@@ -28,6 +39,8 @@ const SOLO_AGENT_PREFIX = [
   "- Surface uncertainty explicitly.",
   "- Preserve continuity with the current task instead of restarting from scratch.",
   "- Use ufoo-agent for control-plane coordination, not as a substitute for doing your role.",
+  "",
+  SHARED_UFOO_PROTOCOL,
 ].join("\n");
 
 function asTrimmedString(value) {
@@ -145,6 +158,7 @@ function computeBootstrapFingerprint({
 }
 
 module.exports = {
+  SHARED_UFOO_PROTOCOL,
   SHARED_GROUP_PREFIX,
   SOLO_AGENT_PREFIX,
   buildGroupPromptMetadata,