u-foo 2.4.5 → 2.4.6

package/README.md

@@ -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/modules/context/README.md

@@ -38,7 +38,7 @@ Versioning is optional but recommended for auditability.
 ```
 context/                 # This repo
 ├── README.md               # This file
-├── SKILLS/uctx/SKILL.md    # Canonical decision format + workflow
+├── ../../SKILLS/uctx/SKILL.md # Canonical decision format + workflow
 └── .ufoo/context/          # Local project context for this repo (ignored; not part of protocol distribution)
 ```
 
@@ -47,7 +47,7 @@ context/                 # This repo
 1. Read installed module from `~/.ufoo/modules/context/`
 2. Read/write decisions in `<project>/.ufoo/context/decisions/`
 3. **Never write to global** — only to project
-4. Follow the decision format in `SKILLS/uctx/SKILL.md`
+4. Follow the decision format in the package-level `SKILLS/uctx/SKILL.md`
 
 ## Validate
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u-foo",
-  "version": "2.4.5",
+  "version": "2.4.6",
   "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/",
@@ -42,10 +41,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/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");

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

@@ -15,25 +15,10 @@ class SkillsManager {
    */
   findSkillRoots() {
     const roots = [];
-
-    // 检查 SKILLS 目录
     const mainSkills = path.join(this.repoRoot, "SKILLS");
     if (fs.existsSync(mainSkills)) {
       roots.push(mainSkills);
     }
-
-    // 检查 modules 中的 SKILLS
-    const modulesDir = path.join(this.repoRoot, "modules");
-    if (fs.existsSync(modulesDir)) {
-      const modules = fs.readdirSync(modulesDir);
-      for (const module of modules) {
-        const moduleSkills = path.join(modulesDir, module, "SKILLS");
-        if (fs.existsSync(moduleSkills)) {
-          roots.push(moduleSkills);
-        }
-      }
-    }
-
     return roots;
   }
 

package/src/app/cli/run.js

@@ -1675,7 +1675,7 @@ async function runCli(argv) {
     program.addHelpText(
       "after",
       `\nNotes:\n  - If 'ufoo' isn't in PATH, run it via ${chalk.cyan(
-        "./bin/ufoo"
+        "./bin/ufoo.js"
       )} (repo) or install globally via npm.\n  - For bus notifications inside Codex, prefer ${chalk.cyan(
         "ufoo bus alert"
       )} / ${chalk.cyan("ufoo bus listen")} (no IME issues).\n`

package/src/code/README.md

@@ -15,7 +15,7 @@
   - `ucode> ...` free-form task input routes to model-backed planner path
   - `tool/run` commands stay available as deterministic fallback
 - Dispatcher: `runToolCall({ tool, args }, { workspaceRoot })`
-- Queue runtime:
-  - `ucode-core submit`
-  - `ucode-core run-once`
-  - `ucode-core list`
+- Queue runtime internals:
+  - `submitTask`
+  - `runOnce`
+  - `listResults`

package/src/code/cli.js

@@ -78,7 +78,7 @@ function parseArgs(argv = []) {
 
 function usage() {
   return [
-    "ucode-core native runtime CLI",
+    "ucode native runtime internals",
     "",
     "Commands:",
     "  submit --tool <read|write|edit|bash> --args-json <json> [--workspace <path>] [--task-id <id>]",

package/src/code/launcher/ucode.js

@@ -206,13 +206,11 @@ function isLikelyPiCoreCommand(command = "", args = []) {
   const cmdText = String(command || "").trim();
   const cmdBase = path.basename(cmdText).toLowerCase();
   if (cmdBase === "ucode" || cmdBase === "ucode.exe") return true;
-  if (cmdBase === "ucode-core" || cmdBase === "ucode-core.exe") return true;
 
   const joined = [cmdText, ...(Array.isArray(args) ? args : [])]
     .map((part) => String(part || "").toLowerCase())
     .join(" ");
   if (!joined) return false;
-  if (joined.includes("ucode-core")) return true;
   if (joined.includes("/src/code/agent.js")) return true;
   if (joined.includes("\\src\\code\\agent.js")) return true;
   return false;
@@ -287,55 +285,30 @@ function resolveCandidateCoreRoot({
 }
 
 function resolveNativeFallbackCommand({ env = process.env } = {}) {
-  const candidates = [
-    path.resolve(__dirname, "..", "agent.js"),
-    path.resolve(__dirname, "..", "..", "..", "bin", "ucode-core.js"),
-  ];
-  for (const entry of candidates) {
-    try {
-      if (isReadableFile(entry)) {
-        if (entry.endsWith("agent.js")) {
-          return {
-            command: process.execPath,
-            args: [entry],
-            root: path.resolve(__dirname, ".."),
-            kind: "native",
-            available: true,
-            resolvedPath: entry,
-          };
-        }
-        return {
-          command: process.execPath,
-          args: [entry, "agent"],
-          root: path.resolve(__dirname, ".."),
-          kind: "native",
-          available: true,
-          resolvedPath: entry,
-        };
-      }
-    } catch {
-      // ignore
+  void env;
+  const entry = path.resolve(__dirname, "..", "agent.js");
+  try {
+    if (isReadableFile(entry)) {
+      return {
+        command: process.execPath,
+        args: [entry],
+        root: path.resolve(__dirname, ".."),
+        kind: "native",
+        available: true,
+        resolvedPath: entry,
+      };
     }
-  }
-  const resolvedCommand = resolveExecutableFromPath("ucode-core", env);
-  if (resolvedCommand) {
-    return {
-      command: "ucode-core",
-      args: ["agent"],
-      root: "",
-      kind: "native",
-      available: true,
-      resolvedPath: resolvedCommand,
-    };
+  } catch {
+    // ignore
   }
   return {
-    command: "ucode-core",
-    args: ["agent"],
-    root: "",
+    command: process.execPath,
+    args: [entry],
+    root: path.resolve(__dirname, ".."),
     kind: "native",
     available: false,
     resolvedPath: "",
-    missingReason: "src/code/agent.js not found and ucode-core is not available on PATH",
+    missingReason: "src/code/agent.js not found",
   };
 }
 

package/src/code/skills/loader.js

@@ -63,19 +63,6 @@ function defaultSkillRoots({
 
   const root = path.resolve(String(repoRoot || repoRootFromHere()));
   roots.push({ path: path.join(root, "SKILLS"), scope: "builtin", source: "ufoo" });
-  const modulesDir = path.join(root, "modules");
-  try {
-    for (const entry of fs.readdirSync(modulesDir, { withFileTypes: true })) {
-      if (!entry.isDirectory() || entry.name.startsWith(".")) continue;
-      roots.push({
-        path: path.join(modulesDir, entry.name, "SKILLS"),
-        scope: "builtin",
-        source: `ufoo-module:${entry.name}`,
-      });
-    }
-  } catch {
-    // Modules are optional in tests and local installs.
-  }
 
   const seen = new Set();
   return roots

package/src/coordination/context/doctor.js

@@ -87,6 +87,7 @@ class ContextDoctor {
    */
   lintProtocol() {
     const moduleRoot = path.join(this.projectRoot, "modules", "context");
+    const repoSkill = path.join(this.projectRoot, "SKILLS", "uctx", "SKILL.md");
 
     if (!fs.existsSync(moduleRoot)) {
       console.log("No protocol module found (skipping protocol lint)");
@@ -97,10 +98,7 @@ class ContextDoctor {
 
     // Check minimal module files
     this.checkFile(path.join(moduleRoot, "README.md"), "README.md");
-    this.checkFile(
-      path.join(moduleRoot, "SKILLS", "uctx", "SKILL.md"),
-      "SKILLS/uctx/SKILL.md"
-    );
+    this.checkFile(repoSkill, "SKILLS/uctx/SKILL.md");
 
     return !this.failed;
   }

package/src/online/server.js

@@ -10,7 +10,7 @@ const WebSocket = require("ws");
  * ufoo-online (Phase 1)
  *
  * Minimal WebSocket relay implementing hello/auth + join/leave + event routing.
- * Intended WebSocket path: /ufoo/online (see docs/ufoo-online/PROTOCOL.md)
+ * Intended WebSocket path: /ufoo/online.
  */
 class OnlineServer extends EventEmitter {
   constructor(options = {}) {