u-foo 2.4.5 → 2.4.7

package/README.md

@@ -69,7 +69,7 @@ Initialize a project and open the chat dashboard:
 
 ```bash
 cd your-project
-ufoo init --modules context,bus
+ufoo init --targets context,bus
 ufoo
 ```
 
@@ -167,7 +167,7 @@ still available, but the normal ufoo workflow is to work from chat.
 These are setup or troubleshooting commands. In chat, use slash commands:
 
 ```text
-/init context bus resources
+/init context bus
 /doctor
 /status
 /daemon status
@@ -177,11 +177,11 @@ These are setup or troubleshooting commands. In chat, use slash commands:
 ```
 
 `ufoo init` creates `.ufoo/`, ensures `AGENTS.md` and `CLAUDE.md`, initializes
-selected modules, and prepares shared storage. `CLAUDE.md` may be a symlink;
-edit project instructions in `AGENTS.md`.
+selected workspace state, and prepares shared storage. `CLAUDE.md` may be a
+symlink; edit project instructions in `AGENTS.md`.
 
 Before a project has been initialized, the equivalent CLI form is also useful:
-`ufoo init --modules context,bus`.
+`ufoo init --targets context,bus`.
 
 ### Event Bus
 
@@ -322,8 +322,7 @@ src/
   online/         relay client/server/runner/token helpers
 ```
 
-See [PROJECT.md](PROJECT.md) for the maintainer-facing map and
-[docs/source-structure.md](docs/source-structure.md) for detailed package
+See [PROJECT.md](PROJECT.md) for the maintainer-facing map and detailed package
 ownership.
 
 ## Development
@@ -340,7 +339,6 @@ Useful checks:
 ```bash
 npm run test:watch
 npm run test:coverage
-npm run bench:global-switch
 ```
 
 The repository is CommonJS, targets Node.js 18+, and has no build step.

package/README.zh-CN.md

@@ -67,7 +67,7 @@ npm link
 
 ```bash
 cd your-project
-ufoo init --modules context,bus
+ufoo init --targets context,bus
 ufoo
 ```
 
@@ -163,7 +163,7 @@ ufoo -g
 这些是初始化或排障命令。进入 chat 后优先使用 slash command：
 
 ```text
-/init context bus resources
+/init context bus
 /doctor
 /status
 /daemon status
@@ -173,10 +173,10 @@ ufoo -g
 ```
 
 `ufoo init` 会创建 `.ufoo/`，确保 `AGENTS.md` 和 `CLAUDE.md` 存在，
-初始化选中的模块，并准备共享存储。`CLAUDE.md` 可以是 symlink；项目指令
-优先编辑 `AGENTS.md`。
+初始化选中的工作区状态，并准备共享存储。`CLAUDE.md` 可以是 symlink；
+项目指令优先编辑 `AGENTS.md`。
 
-项目尚未初始化时，也可以先在外部执行等价 CLI：`ufoo init --modules context,bus`。
+项目尚未初始化时，也可以先在外部执行等价 CLI：`ufoo init --targets context,bus`。
 
 ### 事件总线
 

package/SKILLS/ufoo/SKILL.md

@@ -13,7 +13,7 @@ ufoo is the multi-agent coordination layer. It provides four capabilities:
 1. **Context Decisions** — Sparse log of major plan-level choices shared across agents
 2. **Shared Memory** — Durable, low-noise project facts shared across agents
 3. **Event Bus** — Inter-agent messaging
-4. **Initialization** — Project setup for ufoo modules
+4. **Initialization** — Project setup for ufoo workspace state
 
 ## 1. Context Decisions (uctx)
 
@@ -199,7 +199,7 @@ ufoo history prompt [limit]     # Render as injectable prompt block
 Trigger: `/uinit` or `/ufoo init`
 
 ```bash
-ufoo init --modules context,bus --project $(pwd)
+ufoo init --targets context,bus --project $(pwd)
 ```
 
 After init, auto-join bus if enabled.

package/SKILLS/uinit/SKILL.md

@@ -1,14 +1,14 @@
 ---
 name: uinit
 description: |
-  Initialize ufoo modules in current project.
+  Initialize ufoo workspace state in current project.
   Use when: (1) new project needs context/bus enabled, (2) user inputs /uinit or /ufoo init.
-  Provides interactive module selection, defaults to all selected.
+  Provides interactive target selection, defaults to all selected.
 ---
 
 # uinit
 
-Initialize ufoo modules in current project.
+Initialize ufoo workspace state in current project.
 
 ## Trigger
 
@@ -16,22 +16,20 @@ User inputs `/uinit` or `/ufoo init`
 
 ## Execution Flow
 
-### 1. Ask user to select modules
+### 1. Ask user to select init targets
 
 Use AskUserQuestion tool, provide multi-select, default all selected:
 
 ```
-Please select modules to enable:
+Please select ufoo state to enable:
 
 ☑ context - Shared context protocol (.ufoo/context/)
 ☑ bus - Agent event bus (.ufoo/bus/ + .ufoo/agent/)
-☐ resources - UI/Icons resources (optional)
 ```
 
 Options:
 - `context` (recommended) - Shared context, sparse decision log for major plan-level choices
 - `bus` (recommended) - Multi-agent communication, task delegation, message passing
-- `resources` (optional) - UI tone guide, icon library
 
 Default selected: context, bus
 
@@ -40,10 +38,10 @@ Default selected: context, bus
 Based on user selection, execute:
 
 ```bash
-ufoo init --modules <selected_modules> --project $(pwd)
+ufoo init --targets <selected_targets> --project $(pwd)
 ```
 
-### 3. If bus module selected, auto-join bus
+### 3. If bus target selected, auto-join bus
 
 ```bash
 SUBSCRIBER="${UFOO_SUBSCRIBER_ID:-$(ufoo bus whoami 2>/dev/null || true)}"
@@ -60,7 +58,7 @@ fi
 ```
 === ufoo initialization complete ===
 
-Enabled modules:
+Enabled ufoo state:
   ✓ core memory → .ufoo/memory/
   ✓ context → .ufoo/context/
   ✓ bus → .ufoo/bus/ + .ufoo/agent/
@@ -76,4 +74,3 @@ Next steps:
 
 - If .ufoo/memory, .ufoo/context, .ufoo/bus, or .ufoo/agent already exists, skip creation
 - After initialization, reuse existing subscriber ID first, join only as fallback (if bus enabled)
-- AGENTS.md will have protocol description block injected

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u-foo",
-  "version": "2.4.5",
+  "version": "2.4.7",
   "description": "Multi-Agent Workspace Protocol. Just add u. claude → uclaude, codex → ucodex.",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://ufoo.dev",
@@ -20,8 +20,7 @@
     "uclaude": "bin/uclaude.js",
     "ucodex": "bin/ucodex.js",
     "uagy": "bin/uagy.js",
-    "ucode": "bin/ucode.js",
-    "ucode-core": "bin/ucode-core.js"
+    "ucode": "bin/ucode.js"
   },
   "files": [
     "bin/",
@@ -30,7 +29,6 @@
     "online/",
     "scripts/",
     "SKILLS/",
-    "modules/",
     "LICENSE",
     "README.md"
   ],
@@ -42,10 +40,7 @@
     "postinstall": "node scripts/postinstall.js",
     "test": "jest",
     "test:watch": "jest --watch",
-    "test:coverage": "jest --coverage",
-    "ink:demo": "node scripts/ink-demo.js",
-    "ink:smoke": "node scripts/ink-smoke.js",
-    "bench:global-switch": "node scripts/global-chat-switch-benchmark.js"
+    "test:coverage": "jest --coverage"
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.138",

package/scripts/postinstall.js

@@ -30,11 +30,9 @@ for (const platform of platforms) {
   }
 }
 
-// Collect all skill sources from package
+// Collect all skill sources from the package-level SKILLS directory.
 function collectSkillSources(pkgRoot) {
   const sources = [];
-
-  // Top-level SKILLS/
   const topSkills = path.join(pkgRoot, "SKILLS");
   if (fs.existsSync(topSkills)) {
     for (const entry of fs.readdirSync(topSkills, { withFileTypes: true })) {
@@ -46,24 +44,6 @@ function collectSkillSources(pkgRoot) {
       }
     }
   }
-
-  // modules/*/SKILLS/
-  const modulesDir = path.join(pkgRoot, "modules");
-  if (fs.existsSync(modulesDir)) {
-    for (const mod of fs.readdirSync(modulesDir, { withFileTypes: true })) {
-      if (!mod.isDirectory()) continue;
-      const modSkills = path.join(modulesDir, mod.name, "SKILLS");
-      if (!fs.existsSync(modSkills)) continue;
-      for (const entry of fs.readdirSync(modSkills, { withFileTypes: true })) {
-        if (!entry.isDirectory()) continue;
-        const skillMd = path.join(modSkills, entry.name, "SKILL.md");
-        if (fs.existsSync(skillMd)) {
-          sources.push({ name: entry.name, dir: path.join(modSkills, entry.name), md: skillMd });
-        }
-      }
-    }
-  }
-
   return sources;
 }
 

package/src/agents/launch/launcher.js

@@ -323,23 +323,11 @@ class AgentLauncher {
 
     if (!fs.existsSync(busDir)) {
       // 调用 ufoo init
-      spawnSync("ufoo", ["init", "--modules", "context,bus"], {
+      spawnSync("ufoo", ["init", "--targets", "context,bus"], {
         cwd: this.cwd,
         stdio: "ignore",
       });
     }
-
-    // 检查 AGENTS.md 是否有 ufoo template
-    const agentsFile = path.join(this.cwd, "AGENTS.md");
-    if (fs.existsSync(agentsFile)) {
-      const content = fs.readFileSync(agentsFile, "utf8");
-      if (!content.includes("<!-- ufoo -->")) {
-        spawnSync("ufoo", ["init", "--modules", "context,bus"], {
-          cwd: this.cwd,
-          stdio: "ignore",
-        });
-      }
-    }
   }
 
   /**

package/src/app/chat/commandExecutor.js

@@ -19,6 +19,7 @@ const { parseIntervalMs, formatIntervalMs } = require("./cronScheduler");
 const { isGlobalControllerProjectRoot, resolveGlobalControllerUfooDir } = require("../../runtime/projects");
 const { loadPromptProfileRegistry } = require("../../orchestration/groups/promptProfiles");
 const { resolveSoloAgentType } = require("../../orchestration/solo/commands");
+const { restartDaemonLifecycle } = require("../../runtime/daemon/restart");
 const {
   inspectDirectAuthStatus,
   formatDirectAuthStatus,
@@ -269,15 +270,19 @@ function createCommandExecutor(options = {}) {
       }
 
       statusMsg("{gray-fg}⚙{/gray-fg} Restarting daemon...");
-      stopDaemon(targetRoot, { source: "chat-command:/daemon restart" });
-      await sleep(500);
-      if (isDaemonRunning(targetRoot)) {
+      const result = await restartDaemonLifecycle({
+        projectRoot: targetRoot,
+        isRunning: isDaemonRunning,
+        stopDaemon,
+        startDaemon,
+        stopOptions: { source: "chat-command:/daemon restart" },
+        sleep,
+      });
+      if (result.error === "failed_to_stop") {
         statusMsg("{gray-fg}✗{/gray-fg} Failed to stop daemon");
         return;
       }
-      startDaemon(targetRoot);
-      await sleep(1000);
-      if (isDaemonRunning(targetRoot)) {
+      if (result.ok) {
         statusMsg("{gray-fg}✓{/gray-fg} Daemon restarted");
       } else {
         statusMsg("{gray-fg}✗{/gray-fg} Failed to restart daemon");
@@ -298,7 +303,7 @@ function createCommandExecutor(options = {}) {
   }
 
   async function handleInitCommand(args = []) {
-    logMessage("system", "{white-fg}⚙{/white-fg} Initializing ufoo modules...");
+    logMessage("system", "{white-fg}⚙{/white-fg} Initializing ufoo workspace...");
 
     await withCapturedConsole(
       {
@@ -314,8 +319,8 @@ function createCommandExecutor(options = {}) {
         try {
           const repoRoot = path.join(__dirname, "..", "..");
           const init = createInit(repoRoot);
-          const modules = args.length > 0 ? args.join(",") : "context,bus";
-          await init.init({ modules, project: projectRoot });
+          const targets = args.length > 0 ? args.join(",") : "context,bus";
+          await init.init({ targets, project: projectRoot });
 
           logMessage("system", "{white-fg}✓{/white-fg} Initialization complete");
           renderScreen();

package/src/app/chat/commands.js

@@ -47,7 +47,7 @@ const COMMAND_TREE = {
       templates: { desc: "List available templates" },
     },
   },
-  "/init": { desc: "Initialize modules" },
+  "/init": { desc: "Initialize workspace" },
   "/multi": { desc: "Toggle multi-window agent view" },
   "/open": { desc: "Open project path in global mode" },
   "/launch": {
@@ -305,7 +305,7 @@ function describeCommandForChat(text) {
   if (command === "multi") return "Toggling multi-pane view";
   if (command === "open") return `Opening project ${args[0] || ""}`.trim();
   if (command === "resume") return args[0] === "list" ? "Listing recoverable agents" : `Resuming ${args[0] || "agents"}`;
-  if (command === "init") return "Initializing ufoo modules";
+  if (command === "init") return "Initializing ufoo workspace";
 
   return `Running /${command}`;
 }

package/src/app/chat/daemonCoordinator.js

@@ -12,8 +12,10 @@ function createDaemonCoordinator(options = {}) {
     logMessage,
     stopDaemon,
     startDaemon,
+    isDaemonRunning,
     daemonConnection,
     restartDaemon,
+    sleep,
   } = options;
 
   const connectClientFn = connectClient
@@ -37,9 +39,11 @@ function createDaemonCoordinator(options = {}) {
     projectRoot,
     stopDaemon,
     startDaemon,
+    isDaemonRunning,
     daemonConnection: connection,
     logMessage,
     resolveStatusLine,
+    sleep,
   });
   let switchProjectChain = Promise.resolve();
 

package/src/app/chat/daemonReconnect.js

@@ -1,4 +1,5 @@
 const { restartLocks } = require("./daemonTransport");
+const { restartDaemonLifecycle } = require("../../runtime/daemon/restart");
 
 function resolveDaemonConnection(daemonConnection) {
   return typeof daemonConnection === "function" ? daemonConnection() : daemonConnection;
@@ -9,9 +10,11 @@ function restartDaemonFlow(options = {}) {
     projectRoot,
     stopDaemon,
     startDaemon,
+    isDaemonRunning,
     daemonConnection,
     logMessage,
     resolveStatusLine = null,
+    sleep,
   } = options;
 
   const statusMsg = resolveStatusLine || ((text) => logMessage("status", text));
@@ -26,14 +29,21 @@ function restartDaemonFlow(options = {}) {
       if (connection) {
         connection.close();
       }
-      stopDaemon(projectRoot);
-      startDaemon(projectRoot);
-      const connected = connection ? await connection.connect() : false;
-      if (connected) {
-        if (typeof connection.requestStatus === "function") {
-          connection.requestStatus();
-        }
+      const result = await restartDaemonLifecycle({
+        projectRoot,
+        isRunning: isDaemonRunning,
+        stopDaemon,
+        startDaemon,
+        connect: connection ? () => connection.connect() : null,
+        requestStatus: connection && typeof connection.requestStatus === "function"
+          ? () => connection.requestStatus()
+          : null,
+        sleep,
+      });
+      if (result.ok) {
         statusMsg("{gray-fg}✓{/gray-fg} Daemon reconnected");
+      } else if (result.error === "failed_to_stop") {
+        statusMsg("{gray-fg}✗{/gray-fg} Failed to stop daemon");
       } else {
         statusMsg("{gray-fg}✗{/gray-fg} Failed to reconnect to daemon");
       }

package/src/app/cli/features/doctor.js

@@ -14,29 +14,22 @@ class RepoDoctor {
   }
 
   run() {
-    const contextMod = path.join(this.repoRoot, "modules", "context");
+    const skillsDir = path.join(this.repoRoot, "SKILLS");
+    const contextSkill = path.join(skillsDir, "uctx", "SKILL.md");
+    const busSkill = path.join(skillsDir, "ubus", "SKILL.md");
 
-    const contextExists = fs.existsSync(contextMod);
-    if (!contextExists) {
-      this.fail(`missing ${contextMod}`);
-    }
+    if (!fs.existsSync(contextSkill)) this.fail(`missing ${contextSkill}`);
+    if (!fs.existsSync(busSkill)) this.fail(`missing ${busSkill}`);
 
-    if (contextExists) {
-      const contextDoctor = new ContextDoctor(this.repoRoot);
-      const ok = contextDoctor.lintProtocol();
-      if (!ok) this.failed = true;
-    }
+    const contextDoctor = new ContextDoctor(this.repoRoot);
+    const ok = contextDoctor.lintProtocol();
+    if (!ok) this.failed = true;
 
     console.log("=== ufoo doctor ===");
     console.log(`Monorepo: ${this.repoRoot}`);
-    console.log("Modules:");
-    if (contextExists) {
-      console.log(`- context: ${contextMod}`);
-    }
-    const resources = path.join(this.repoRoot, "modules", "resources");
-    if (fs.existsSync(resources)) {
-      console.log(`- resources: ${resources}`);
-    }
+    console.log("Skills:");
+    if (fs.existsSync(contextSkill)) console.log(`- uctx: ${contextSkill}`);
+    if (fs.existsSync(busSkill)) console.log(`- ubus: ${busSkill}`);
 
     if (this.failed) {
       console.log("Status: FAILED");