u-foo 2.4.5 → 2.4.7

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

@@ -7,23 +7,22 @@ const path = require("path");
 class UfooInit {
   constructor(repoRoot) {
     this.repoRoot = repoRoot;
-    this.contextMod = path.join(repoRoot, "modules", "context");
-    this.busMod = path.join(repoRoot, "modules", "bus");
-    this.resourcesMod = path.join(repoRoot, "modules", "resources");
-    this.agentsTemplate = path.join(repoRoot, "modules", "AGENTS.template.md");
   }
 
   /**
    * 初始化项目
    */
   async init(options = {}) {
-    const modules = (options.modules || "context").split(",");
+    const targets = (options.targets || options.modules || "context")
+      .split(",")
+      .map((item) => item.trim())
+      .filter(Boolean);
     const project = options.project || process.cwd();
     const controllerMode = options.controllerMode === true;
 
     console.log("=== ufoo init ===");
     console.log(`Project directory: ${project}`);
-    console.log(`Modules: ${modules.join(", ")}`);
+    console.log(`Targets: ${targets.join(", ")}`);
     console.log();
 
     if (!controllerMode) {
@@ -33,24 +32,17 @@ class UfooInit {
     // 初始化核心
     this.initCore(project, { controllerMode });
 
-    if (!controllerMode) {
-      this.injectAgentsTemplate(project);
-    }
-
-    // 初始化各模块
-    for (const module of modules) {
-      switch (module.trim()) {
+    // Initialize selected workspace features.
+    for (const target of targets) {
+      switch (target) {
         case "context":
           this.initContext(project);
           break;
         case "bus":
           await this.initBus(project);
           break;
-        case "resources":
-          this.initResources(project);
-          break;
         default:
-          console.error(`Unknown module: ${module}`);
+          console.error(`Unknown init target: ${target}`);
       }
     }
 
@@ -121,106 +113,7 @@ class UfooInit {
   }
 
   /**
-   * 注入 ufoo 模板到 AGENTS.md / CLAUDE.md
-   */
-  injectAgentsTemplate(project) {
-    if (!fs.existsSync(this.agentsTemplate)) {
-      console.log("[template] AGENTS.template.md not found, skipping");
-      return;
-    }
-
-    const template = fs.readFileSync(this.agentsTemplate, "utf8");
-    const targets = this.resolveTemplateTargets(project);
-    if (targets.length === 0) {
-      console.log("[template] No target markdown files found, skipping");
-      return;
-    }
-
-    const labels = targets.map((file) => path.relative(project, file) || path.basename(file));
-    console.log(`[template] Injecting ufoo template into: ${labels.join(", ")}`);
-
-    for (const file of targets) {
-      this.injectTemplateIntoFile(file, template);
-    }
-
-    console.log("[template] Done");
-  }
-
-  resolveTemplateTargets(project) {
-    const agentsFile = path.resolve(path.join(project, "AGENTS.md"));
-    const claudeFile = path.resolve(path.join(project, "CLAUDE.md"));
-    const targets = new Set();
-
-    if (fs.existsSync(agentsFile)) {
-      targets.add(agentsFile);
-    }
-
-    const claudeStat = this.safeLstat(claudeFile);
-    if (!claudeStat) return Array.from(targets);
-
-    if (claudeStat.isSymbolicLink()) {
-      try {
-        const rawTarget = fs.readlinkSync(claudeFile);
-        const sourceFile = path.resolve(path.dirname(claudeFile), rawTarget);
-        const projectRoot = path.resolve(project);
-        const inProject = sourceFile === projectRoot || sourceFile.startsWith(`${projectRoot}${path.sep}`);
-        if (inProject) {
-          targets.add(sourceFile);
-        } else {
-          console.warn(`[template] CLAUDE.md symlink target outside project, skipped: ${sourceFile}`);
-        }
-      } catch {
-        // ignore broken symlink
-      }
-      return Array.from(targets);
-    }
-
-    targets.add(claudeFile);
-    return Array.from(targets);
-  }
-
-  injectTemplateIntoFile(filePath, template) {
-    if (!fs.existsSync(filePath)) return;
-
-    let content = fs.readFileSync(filePath, "utf8");
-    const marker = "<!-- ufoo-template -->";
-    const block = `${marker}\n${template}\n${marker}`;
-
-    if (content.includes(marker)) {
-      const startIdx = content.indexOf(marker);
-      const endIdx = content.indexOf(marker, startIdx + marker.length);
-      if (endIdx !== -1) {
-        content = content.slice(0, startIdx) + block + content.slice(endIdx + marker.length);
-      } else {
-        content = content.slice(0, startIdx) + block + content.slice(startIdx + marker.length);
-      }
-    } else {
-      const headingEnd = this.findFirstHeadingEnd(content);
-      if (headingEnd !== -1) {
-        content = content.slice(0, headingEnd) + `\n${block}\n\n` + content.slice(headingEnd);
-      } else {
-        content = `${block}\n\n${content}`;
-      }
-    }
-    fs.writeFileSync(filePath, content, "utf8");
-  }
-
-  findFirstHeadingEnd(content) {
-    const atxHeading = content.match(/^(?:[ \t]{0,3})#{1,6}[ \t]*[^\n]*(?:\n|$)/m);
-    const setextHeading = content.match(/^[^\n]+\n(?:=+|-+)[ \t]*(?:\n|$)/m);
-
-    let bestMatch = null;
-    if (atxHeading && setextHeading) {
-      bestMatch = atxHeading.index <= setextHeading.index ? atxHeading : setextHeading;
-    } else {
-      bestMatch = atxHeading || setextHeading;
-    }
-    if (!bestMatch) return -1;
-    return bestMatch.index + bestMatch[0].length;
-  }
-
-  /**
-   * 初始化 context 模块
+   * 初始化 context
    */
   initContext(project) {
     console.log("[context] Initializing decision-only context...");
@@ -247,10 +140,10 @@ class UfooInit {
   }
 
   /**
-   * 初始化 bus 模块
+   * 初始化 bus
    */
   async initBus(project) {
-    console.log("[bus] Initializing bus module...");
+    console.log("[bus] Initializing bus...");
 
     const EventBus = require("../../../coordination/bus");
     const bus = new EventBus(project);
@@ -263,78 +156,6 @@ class UfooInit {
     }
   }
 
-  /**
-   * 初始化 resources 模块
-   */
-  initResources(project) {
-    if (!fs.existsSync(this.resourcesMod)) {
-      console.log("[resources] Module not found, skipping");
-      return;
-    }
-
-    console.log("[resources] Initializing resources module...");
-
-    const targetDir = path.join(project, ".ufoo", "resources");
-
-    // 复制模块内容
-    this.copyModuleContent(this.resourcesMod, targetDir);
-
-    console.log("[resources] Done");
-  }
-
-  /**
-   * 复制模块内容
-   */
-  copyModuleContent(src, dest) {
-    if (!fs.existsSync(dest)) {
-      fs.mkdirSync(dest, { recursive: true });
-    }
-
-    // 复制所有文件和目录（排除 .git、node_modules 等）
-    const entries = fs.readdirSync(src, { withFileTypes: true });
-
-    for (const entry of entries) {
-      // 跳过特殊目录
-      if (entry.name.startsWith(".") || entry.name === "node_modules") {
-        continue;
-      }
-
-      const srcPath = path.join(src, entry.name);
-      const destPath = path.join(dest, entry.name);
-
-      if (entry.isDirectory()) {
-        this.copyRecursive(srcPath, destPath);
-      } else {
-        fs.copyFileSync(srcPath, destPath);
-      }
-    }
-  }
-
-  /**
-   * 递归复制目录
-   */
-  copyRecursive(src, dest) {
-    if (!fs.existsSync(dest)) {
-      fs.mkdirSync(dest, { recursive: true });
-    }
-
-    const entries = fs.readdirSync(src, { withFileTypes: true });
-
-    for (const entry of entries) {
-      if (entry.name.startsWith(".") || entry.name === "node_modules") {
-        continue;
-      }
-
-      const srcPath = path.join(src, entry.name);
-      const destPath = path.join(dest, entry.name);
-
-      if (entry.isDirectory()) {
-        this.copyRecursive(srcPath, destPath);
-      } else {
-        fs.copyFileSync(srcPath, destPath);
-      }
-    }
-  }
 }
 
 module.exports = UfooInit;

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

@@ -535,7 +535,7 @@ async function runCli(argv) {
   const chalk = requireOptional("chalk") || { cyan: (s) => s, red: (s) => s };
 
   if (commander && commander.Command) {
-    const { Command } = commander;
+    const { Command, Option } = commander;
     const program = new Command();
 
     program
@@ -1074,10 +1074,10 @@ async function runCli(argv) {
         }
       });
 
-    program
+    const initCommand = program
       .command("init")
-      .description("Initialize modules in a project")
-      .option("--modules <list>", "Comma-separated modules (context,bus,resources)", "context")
+      .description("Initialize ufoo workspace state in a project")
+      .option("--targets <list>", "Comma-separated init targets (context,bus)")
       .option("--project <dir>", "Target project directory", process.cwd())
       .action(async (opts) => {
         const UfooInit = require("./features/init");
@@ -1090,6 +1090,11 @@ async function runCli(argv) {
           process.exitCode = 1;
         }
       });
+    if (Option && typeof Option === "function") {
+      initCommand.addOption(new Option("--modules <list>", "Deprecated alias for --targets").hideHelp());
+    } else {
+      initCommand.option("--modules <list>", "Deprecated alias for --targets");
+    }
 
     const skills = program.command("skills").description("Manage skills templates");
     skills
@@ -1675,7 +1680,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`
@@ -1713,7 +1718,7 @@ async function runCli(argv) {
     console.log("  ufoo recover [list [target] | run <target>] [--json]");
     console.log("  ufoo report <start|progress|done|error|list> [message] [--task <id>] [--agent <id>]");
     console.log("  ufoo ucode [doctor|prepare|build] [--skip-install]");
-    console.log("  ufoo init [--modules <list>] [--project <dir>]");
+    console.log("  ufoo init [--targets <list>] [--project <dir>]");
     console.log("  ufoo skills list");
     console.log("  ufoo skills install <name|all> [--target <dir> | --codex | --agents]");
     console.log("  ufoo group templates [list|ls] [--json]");
@@ -2058,7 +2063,7 @@ async function runCli(argv) {
     };
 
     const opts = {
-      modules: getOpt("--modules", "context"),
+      targets: getOpt("--targets", getOpt("--modules", "context")),
       project: getOpt("--project", process.cwd()),
     };
 

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

@@ -83,24 +83,18 @@ class ContextDoctor {
   }
 
   /**
-   * Lint 协议 repo（modules/context）
+   * Lint bundled context skill.
    */
   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)");
+    if (!fs.existsSync(repoSkill)) {
+      console.log("No bundled context skill found (skipping protocol lint)");
       return true;
     }
 
-    console.log(`Linting protocol repo: ${moduleRoot}`);
-
-    // 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"
-    );
+    console.log(`Linting bundled context skill: ${repoSkill}`);
+    this.checkFile(repoSkill, "SKILLS/uctx/SKILL.md");
 
     return !this.failed;
   }
@@ -155,20 +149,6 @@ class ContextDoctor {
       }
     }
 
-    // Check global modules
-    const globalContext = path.join(
-      process.env.HOME,
-      ".ufoo",
-      "modules",
-      "context"
-    );
-    if (!fs.existsSync(globalContext)) {
-      console.log("");
-      console.log(
-        `WARN: ${globalContext} not found (install via ufoo for best UX)`
-      );
-    }
-
     console.log("");
     if (this.failed) {
       console.log("Status: 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 = {}) {

package/src/runtime/daemon/index.js

@@ -1438,7 +1438,7 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
           if (!fs.existsSync(targetPaths.ufooDir)) {
             const repoRoot = path.join(__dirname, "..", "..", "..");
             const init = new (require("../../app/cli/features/init"))(repoRoot);
-            await init.init({ modules: "context,bus", project: root });
+            await init.init({ targets: "context,bus", project: root });
           }
           if (!isRunning(root)) {
             cleanupStaleState(root);

package/src/runtime/daemon/mcpServer.js

@@ -400,7 +400,7 @@ async function ensureGlobalControllerDaemon(options = {}) {
     const UfooInit = require("../../app/cli/features/init");
     const init = new UfooInit(PACKAGE_ROOT);
     await suppressConsoleToStderr(() => init.init({
-      modules: "context,bus",
+      targets: "context,bus",
       project: root,
       controllerMode: true,
     }));