u-foo 2.3.31 → 2.4.0

package/src/{cli.js → app/cli/run.js}

@@ -3,20 +3,21 @@ const os = require("os");
 const { spawnSync } = require("child_process");
 const net = require("net");
 const fs = require("fs");
-const { socketPath, isRunning } = require("./daemon");
-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");
+const { socketPath, isRunning } = require("../../runtime/daemon");
+const { runBusCoreCommand } = require("./busCoreCommands");
+const { runCtxCommand } = require("./ctxCoreCommands");
+const { runOnlineCommand } = require("./onlineCoreCommands");
+const { runGroupCoreCommand } = require("./groupCoreCommands");
+const { loadConfig } = require("../../config");
+const { loadPromptProfileRegistry } = require("../../orchestration/groups/promptProfiles");
+const { resolveSoloAgentType } = require("../../orchestration/solo/commands");
+const { listProjectRuntimes, getCurrentProjectRuntime } = require("../../runtime/projects/registry");
+const { canonicalProjectRoot, buildProjectId } = require("../../runtime/projects/projectId");
+const { getUfooPaths } = require("../../coordination/state/paths");
+const { resolveNodeExecutable } = require("../../runtime/process/nodeExecutable");
 
 function getPackageRoot() {
-  return path.resolve(__dirname, "..");
+  return path.resolve(__dirname, "..", "..", "..");
 }
 
 function run(cmd, args, options = {}) {
@@ -60,7 +61,7 @@ async function connectWithRetry(sockPath, retries, delayMs) {
 async function ensureDaemonRunning(projectRoot) {
   if (isRunning(projectRoot)) return;
   const repoRoot = getPackageRoot();
-  run(process.execPath, [path.join(repoRoot, "bin", "ufoo.js"), "daemon", "start"]);
+  run(resolveNodeExecutable(), [path.join(repoRoot, "bin", "ufoo.js"), "daemon", "start"]);
   const sock = socketPath(projectRoot);
   for (let i = 0; i < 30; i += 1) {
     if (fs.existsSync(sock)) {
@@ -285,7 +286,7 @@ function runMemoryCommand({
   write = (line) => console.log(line),
   writeError = (line) => console.error(line),
 } = {}) {
-  const MemoryManager = require("./memory");
+  const MemoryManager = require("../../coordination/memory");
   const manager = new MemoryManager(cwd);
   const sub = String(subcommand || "list").trim().toLowerCase();
   const outputJson = opts.json === true;
@@ -474,7 +475,7 @@ function resolveOnlineAuthToken(opts) {
   let tokens = null;
   try {
     // eslint-disable-next-line global-require
-    tokens = require("./online/tokens");
+    tokens = require("../../online/tokens");
   } catch {
     return "";
   }
@@ -512,7 +513,7 @@ async function runCli(argv) {
       .description("Run repo doctor checks")
       .action(() => {
         const repoRoot = getPackageRoot();
-        const RepoDoctor = require("./doctor");
+        const RepoDoctor = require("./features/doctor");
         const doctor = new RepoDoctor(repoRoot);
         const ok = doctor.run();
         if (!ok) process.exitCode = 1;
@@ -521,7 +522,7 @@ async function runCli(argv) {
       .command("status")
       .description("Show project status (banner, unread bus, open decisions)")
       .action(async () => {
-        const StatusDisplay = require("./status");
+        const StatusDisplay = require("../../coordination/status");
         const status = new StatusDisplay(process.cwd());
         await status.show();
       });
@@ -687,8 +688,8 @@ async function runCli(argv) {
 
     program
       .command("launch")
-      .description("Launch an agent (ucode, uclaude, ucodex)")
-      .argument("<agent>", "Agent type: ucode|uclaude|ucodex|claude|codex")
+      .description("Launch an agent (uclaude, ucodex, uagy, ucode)")
+      .argument("<agent>", "Agent type: uclaude|ucodex|uagy|ucode|claude|codex|agy")
       .argument("[nickname]", "Optional nickname for the agent")
       .option("--profile <id>", "Prompt profile to assign after launch")
       .action(async (agent, nickname, opts) => {
@@ -699,15 +700,17 @@ async function runCli(argv) {
           // Normalize agent type
           const agentLower = agent.toLowerCase();
           let normalizedAgent = "";
-          if (agentLower === "ucode" || agentLower === "ufoo-code" || agentLower === "ufoo") {
-            normalizedAgent = "ucode";
-          } else if (agentLower === "uclaude" || agentLower === "claude-code" || agentLower === "claude") {
+          if (agentLower === "uclaude" || agentLower === "claude-code" || agentLower === "claude") {
             normalizedAgent = "claude";
           } else if (agentLower === "ucodex" || agentLower === "codex" || agentLower === "openai") {
             normalizedAgent = "codex";
+          } else if (agentLower === "uagy" || agentLower === "agy" || agentLower === "antigravity") {
+            normalizedAgent = "agy";
+          } else if (agentLower === "ucode" || agentLower === "ufoo-code" || agentLower === "ufoo") {
+            normalizedAgent = "ucode";
           } else {
             console.error(`Unknown agent type: ${agent}`);
-            console.error("Valid types: ucode, uclaude, ucodex, claude, codex");
+            console.error("Valid types: uclaude, ucodex, uagy, ucode, claude, codex, agy");
             process.exitCode = 1;
             return;
           }
@@ -732,7 +735,7 @@ async function runCli(argv) {
       .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("--agent <type>", "Agent type: codex|claude|ucode|agy")
       .option("--nickname <name>", "Optional nickname")
       .option("--scope <scope>", "Launch scope: inplace|window", "inplace")
       .option("--json", "Output role list as JSON")
@@ -914,7 +917,7 @@ async function runCli(argv) {
         const normalized = normalizeReportPhase(action);
         const text = Array.isArray(messageParts) ? messageParts.join(" ").trim() : String(messageParts || "").trim();
         const projectRoot = process.cwd();
-        const { listReports } = require("./report/store");
+        const { listReports } = require("../../coordination/report/store");
 
         if ((action || "").toLowerCase() === "list") {
           try {
@@ -1001,8 +1004,8 @@ async function runCli(argv) {
       .argument("[action]", "doctor|prepare|build", "doctor")
       .option("--skip-install", "Skip npm install even if node_modules is missing")
       .action((action, opts) => {
-        const { inspectUcodeSetup, formatUcodeDoctor, prepareAndInspectUcode } = require("./agent/ucodeDoctor");
-        const { buildUcodeCore } = require("./agent/ucodeBuild");
+        const { inspectUcodeSetup, formatUcodeDoctor, prepareAndInspectUcode } = require("../../code/launcher/ucodeDoctor");
+        const { buildUcodeCore } = require("../../code/launcher/ucodeBuild");
         const normalized = String(action || "doctor").trim().toLowerCase();
         if (normalized !== "doctor" && normalized !== "prepare" && normalized !== "build") {
           console.error("ucode action must be doctor|prepare|build");
@@ -1043,7 +1046,7 @@ async function runCli(argv) {
       .option("--modules <list>", "Comma-separated modules (context,bus,resources)", "context")
       .option("--project <dir>", "Target project directory", process.cwd())
       .action(async (opts) => {
-        const UfooInit = require("./init");
+        const UfooInit = require("./features/init");
         const repoRoot = getPackageRoot();
         const init = new UfooInit(repoRoot);
         try {
@@ -1059,7 +1062,7 @@ async function runCli(argv) {
       .command("list")
       .description("List available skills")
       .action(() => {
-        const SkillsManager = require("./skills");
+        const SkillsManager = require("./features/skills");
         const repoRoot = getPackageRoot();
         const manager = new SkillsManager(repoRoot);
         const skillsList = manager.list();
@@ -1073,7 +1076,7 @@ async function runCli(argv) {
       .option("--codex", "Install into ~/.codex/skills")
       .option("--agents", "Install into ~/.agents/skills")
       .action(async (name, opts) => {
-        const SkillsManager = require("./skills");
+        const SkillsManager = require("./features/skills");
         const repoRoot = getPackageRoot();
         const manager = new SkillsManager(repoRoot);
         try {
@@ -1445,7 +1448,7 @@ async function runCli(argv) {
       .option("--no-bell", "Disable terminal bell")
       .allowUnknownOption(true)
       .action((subscriber, interval, opts) => {
-        const EventBus = require("./bus");
+        const EventBus = require("../../coordination/bus");
         const eventBus = new EventBus(process.cwd());
         const parsedInterval = parseInt(interval, 10);
         eventBus
@@ -1469,7 +1472,7 @@ async function runCli(argv) {
       .option("--reset", "Truncate pending queue before listening")
       .option("--auto-join", "Auto-join bus to get subscriber ID")
       .action((subscriber, opts) => {
-        const EventBus = require("./bus");
+        const EventBus = require("../../coordination/bus");
         const eventBus = new EventBus(process.cwd());
         eventBus
           .listen(subscriber, {
@@ -1490,7 +1493,7 @@ async function runCli(argv) {
       .option("--stop", "Stop running daemon")
       .option("--status", "Check daemon status")
       .action((opts) => {
-        const EventBus = require("./bus");
+        const EventBus = require("../../coordination/bus");
         const eventBus = new EventBus(process.cwd());
         (async () => {
           try {
@@ -1513,7 +1516,7 @@ async function runCli(argv) {
       .description("Inject /bus into a Terminal.app tab by subscriber ID")
       .argument("<subscriber>", "Subscriber ID to inject into")
       .action((subscriber) => {
-        const EventBus = require("./bus");
+        const EventBus = require("../../coordination/bus");
         const eventBus = new EventBus(process.cwd());
         (async () => {
           try {
@@ -1531,7 +1534,7 @@ async function runCli(argv) {
       .option("--reason <reason>", "Wake reason")
       .option("--no-shake", "Disable window shake")
       .action((target, opts) => {
-        const EventBus = require("./bus");
+        const EventBus = require("../../coordination/bus");
         const eventBus = new EventBus(process.cwd());
         (async () => {
           try {
@@ -1547,7 +1550,7 @@ async function runCli(argv) {
       .description("Activate (focus) the terminal/tmux window of an agent")
       .argument("<agent-id>", "Agent ID or nickname to activate")
       .action((agentId) => {
-        const AgentActivator = require("./bus/activate");
+        const AgentActivator = require("../../coordination/bus/activate");
         const activator = new AgentActivator(process.cwd());
         (async () => {
           try {
@@ -1564,7 +1567,7 @@ async function runCli(argv) {
       .allowUnknownOption(true)
       .argument("<args...>", "Arguments passed to bus module")
       .action(async (args) => {
-        const EventBus = require("./bus");
+        const EventBus = require("../../coordination/bus");
         const eventBus = new EventBus(process.cwd());
         const cmd = args[0];
         const cmdArgs = args.slice(1);
@@ -1609,7 +1612,7 @@ async function runCli(argv) {
       .description("Build unified input timeline (incremental by default)")
       .option("--force", "Full rebuild (ignore watermark)")
       .action((opts) => {
-        const { buildTimeline } = require("./history/inputTimeline");
+        const { buildTimeline } = require("../../coordination/history/inputTimeline");
         const result = buildTimeline(process.cwd(), { force: opts.force === true });
         console.log(`Timeline: ${result.count} total, ${result.newCount} new → ${result.file}`);
       });
@@ -1618,7 +1621,7 @@ async function runCli(argv) {
       .description("Show recent timeline entries")
       .argument("[limit]", "Number of entries to show", "50")
       .action((limit) => {
-        const { showTimeline } = require("./history/inputTimeline");
+        const { showTimeline } = require("../../coordination/history/inputTimeline");
         showTimeline(process.cwd(), parseInt(limit, 10) || 50);
       });
     history
@@ -1626,7 +1629,7 @@ async function runCli(argv) {
       .description("Render timeline as injectable prompt context")
       .argument("[limit]", "Number of entries to include", "30")
       .action((limit) => {
-        const { renderTimelineForPrompt } = require("./history/inputTimeline");
+        const { renderTimelineForPrompt } = require("../../coordination/history/inputTimeline");
         const text = renderTimelineForPrompt(process.cwd(), parseInt(limit, 10) || 30);
         if (text) {
           console.log(text);
@@ -1646,7 +1649,7 @@ async function runCli(argv) {
 
     // 检查是否是 --version 或 -V 参数
     if (argv.includes("--version") || argv.includes("-V")) {
-      const { showUfooBanner } = require("./utils/banner");
+      const { showUfooBanner } = require("../../ui/format/banner");
       showUfooBanner({ version: pkg.version });
       return;
     }
@@ -1686,7 +1689,7 @@ async function runCli(argv) {
     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 solo run <profile> [--agent <codex|claude|ucode|agy>] [--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>]");
@@ -1711,20 +1714,20 @@ async function runCli(argv) {
   }
 
   if (cmd === "--version" || cmd === "-V") {
-    const { showUfooBanner } = require("./utils/banner");
+    const { showUfooBanner } = require("../../ui/format/banner");
     showUfooBanner({ version: pkg.version });
     return;
   }
 
   if (cmd === "doctor") {
-    const RepoDoctor = require("./doctor");
+    const RepoDoctor = require("./features/doctor");
     const doctor = new RepoDoctor(repoRoot);
     const ok = doctor.run();
     if (!ok) process.exitCode = 1;
     return;
   }
   if (cmd === "status") {
-    const StatusDisplay = require("./status");
+    const StatusDisplay = require("../../coordination/status");
     const status = new StatusDisplay(process.cwd());
     status.show().catch((err) => {
       console.error(err.message);
@@ -1733,7 +1736,7 @@ async function runCli(argv) {
     return;
   }
   if (cmd === "daemon") {
-    run(process.execPath, [path.join(repoRoot, "bin", "ufoo.js"), "daemon", ...rest]);
+    run(resolveNodeExecutable(), [path.join(repoRoot, "bin", "ufoo.js"), "daemon", ...rest]);
     return;
   }
   if (cmd === "chat") {
@@ -1741,7 +1744,7 @@ async function runCli(argv) {
     if (rest.includes("-g") || rest.includes("--global")) {
       chatArgs.push("-g");
     }
-    run(process.execPath, [path.join(repoRoot, "bin", "ufoo.js"), ...chatArgs]);
+    run(resolveNodeExecutable(), [path.join(repoRoot, "bin", "ufoo.js"), ...chatArgs]);
     return;
   }
   if (cmd === "project") {
@@ -1831,7 +1834,7 @@ async function runCli(argv) {
   if (cmd === "report") {
     const action = String(rest[0] || "").toLowerCase();
     const normalized = normalizeReportPhase(action);
-    const { listReports } = require("./report/store");
+    const { listReports } = require("../../coordination/report/store");
 
     if (action === "list") {
       const agentIdx = rest.indexOf("--agent");
@@ -1946,8 +1949,8 @@ async function runCli(argv) {
   }
   if (cmd === "ucode") {
     const action = String(rest[0] || "doctor").trim().toLowerCase();
-    const { inspectUcodeSetup, formatUcodeDoctor, prepareAndInspectUcode } = require("./agent/ucodeDoctor");
-    const { buildUcodeCore } = require("./agent/ucodeBuild");
+    const { inspectUcodeSetup, formatUcodeDoctor, prepareAndInspectUcode } = require("../../code/launcher/ucodeDoctor");
+    const { buildUcodeCore } = require("../../code/launcher/ucodeBuild");
     const skipInstall = rest.includes("--skip-install");
     if (action !== "doctor" && action !== "prepare" && action !== "build") {
       console.error("ucode action must be doctor|prepare|build");
@@ -2015,7 +2018,7 @@ async function runCli(argv) {
     return;
   }
   if (cmd === "init") {
-    const UfooInit = require("./init");
+    const UfooInit = require("./features/init");
     const init = new UfooInit(repoRoot);
 
     const getOpt = (name, def) => {
@@ -2037,7 +2040,7 @@ async function runCli(argv) {
     return;
   }
   if (cmd === "skills") {
-    const SkillsManager = require("./skills");
+    const SkillsManager = require("./features/skills");
     const manager = new SkillsManager(repoRoot);
     const sub = rest[0] || "";
 
@@ -2297,7 +2300,7 @@ async function runCli(argv) {
   if (cmd === "bus") {
     const sub = rest[0] || "";
     if (sub === "alert") {
-      const EventBus = require("./bus");
+      const EventBus = require("../../coordination/bus");
       const eventBus = new EventBus(process.cwd());
       const args = rest.slice(1);
       const subscriber = args[0];
@@ -2323,7 +2326,7 @@ async function runCli(argv) {
       return;
     }
     if (sub === "listen") {
-      const EventBus = require("./bus");
+      const EventBus = require("../../coordination/bus");
       const eventBus = new EventBus(process.cwd());
       const args = rest.slice(1);
       const subscriber = args.find((arg) => !arg.startsWith("--"));
@@ -2342,7 +2345,7 @@ async function runCli(argv) {
     }
     if (sub === "daemon") {
       // 使用 JavaScript daemon
-      const EventBus = require("./bus");
+      const EventBus = require("../../coordination/bus");
       const eventBus = new EventBus(process.cwd());
 
       (async () => {
@@ -2369,7 +2372,7 @@ async function runCli(argv) {
     }
     if (sub === "inject") {
       // 使用 JavaScript inject
-      const EventBus = require("./bus");
+      const EventBus = require("../../coordination/bus");
       const eventBus = new EventBus(process.cwd());
 
       (async () => {
@@ -2387,7 +2390,7 @@ async function runCli(argv) {
       return;
     }
     if (sub === "wake") {
-      const EventBus = require("./bus");
+      const EventBus = require("../../coordination/bus");
       const eventBus = new EventBus(process.cwd());
       (async () => {
         try {
@@ -2406,7 +2409,7 @@ async function runCli(argv) {
     }
 
     // Use JavaScript EventBus module for core commands
-    const EventBus = require("./bus");
+    const EventBus = require("../../coordination/bus");
     const eventBus = new EventBus(process.cwd());
 
     (async () => {
@@ -2444,7 +2447,7 @@ async function runCli(argv) {
   if (cmd === "history") {
     const sub = rest[0] || "show";
     const cwd = process.cwd();
-    const { buildTimeline, showTimeline, renderTimelineForPrompt } = require("./history/inputTimeline");
+    const { buildTimeline, showTimeline, renderTimelineForPrompt } = require("../../coordination/history/inputTimeline");
 
     if (sub === "build") {
       const force = rest.includes("--force");

package/src/app/index.js

@@ -0,0 +1,6 @@
+"use strict";
+
+module.exports = {
+  chat: require("./chat"),
+  cli: require("./cli"),
+};

package/src/code/agent.js

@@ -16,7 +16,7 @@ const {
   createEscapeTagStripper,
   stripLeakedEscapeTags,
 } = require("./tui");
-const { stripBlessedTags } = require("../chat/text");
+const { stripBlessedTags } = require("../app/chat/text");
 const { loadConfig, defaultAgentModelForProvider, sameModelProvider } = require("../config");
 const {
   resolveSessionId,
@@ -24,7 +24,7 @@ const {
   saveSessionSnapshot,
   loadSessionSnapshot,
 } = require("./sessionStore");
-const { buildPromptContext } = require("./prompts");
+const { buildPromptContext } = require("../agents/prompts/native");
 const {
   buildSkillInjections,
   formatSkillsList,
@@ -50,10 +50,11 @@ function normalizeLine(input = "") {
   return String(input || "").trim();
 }
 
-function parseProbeMarkerCommand(input = "") {
+function parseLegacyUfooMarkerCommand(input = "") {
   const text = String(input || "").trim();
   if (!text) return "";
-  // Accept only strict probe markers: "<prefix> <single-marker-token>".
+  // Old daemons injected strict "<prefix> <single-token>" commands for
+  // session discovery. Keep ignoring those inputs after removing injection.
   const match = text.match(/^(?:\$ufoo|\/ufoo|ufoo)\s+([A-Za-z0-9][A-Za-z0-9._:-]{0,63})$/);
   return match ? String(match[1] || "").trim() : "";
 }
@@ -1321,11 +1322,11 @@ function runSingleCommand(line = "", workspaceRoot = process.cwd()) {
       ].join("\n"),
     };
   }
-  const probeMarker = parseProbeMarkerCommand(text);
-  if (probeMarker) {
+  const legacyUfooMarker = parseLegacyUfooMarkerCommand(text);
+  if (legacyUfooMarker) {
     return {
-      kind: "probe",
-      marker: probeMarker,
+      kind: "legacy_ufoo_marker",
+      marker: legacyUfooMarker,
     };
   }
   if (text === "ubus" || text === "/ubus") {
@@ -1613,7 +1614,7 @@ async function runUcodeCoreAgent({
         rl.close();
         return;
       }
-      if (result.kind === "probe") {
+      if (result.kind === "legacy_ufoo_marker") {
         return;
       }
       if (result.kind === "help" || result.kind === "tool" || result.kind === "skills" || result.kind === "error") {

package/src/code/index.js

@@ -32,6 +32,7 @@ const {
   saveSessionSnapshot,
   loadSessionSnapshot,
 } = require("./sessionStore");
+const launcher = require("./launcher");
 
 module.exports = {
   TOOL_NAMES,
@@ -67,4 +68,5 @@ module.exports = {
   getSessionFilePath,
   saveSessionSnapshot,
   loadSessionSnapshot,
+  ...launcher,
 };

package/src/code/launcher/index.js

@@ -0,0 +1,9 @@
+"use strict";
+
+module.exports = {
+  ...require("./ucode"),
+  ...require("./ucodeBootstrap"),
+  ...require("./ucodeBuild"),
+  ...require("./ucodeDoctor"),
+  ...require("./ucodeRuntimeConfig"),
+};

package/src/{agent → code/launcher}/ucode.js

@@ -1,11 +1,10 @@
-const { loadConfig } = require("../config");
+const { loadConfig } = require("../../config");
 const path = require("path");
 const fs = require("fs");
 
 function bundledModuleRoots() {
-  const repoRoot = path.join(__dirname, "..", "..");
   return [
-    path.join(repoRoot, "src", "code"),
+    path.join(__dirname, ".."),
   ];
 }
 
@@ -22,7 +21,7 @@ function resolveFirstExisting(paths = []) {
 }
 
 function defaultBundledCoreRoot() {
-  const root = path.join(__dirname, "..", "code");
+  const root = path.join(__dirname, "..");
   const agentEntry = path.join(root, "agent.js");
   if (resolveFirstExisting([agentEntry])) return root;
   return root;
@@ -289,8 +288,8 @@ function resolveCandidateCoreRoot({
 
 function resolveNativeFallbackCommand({ env = process.env } = {}) {
   const candidates = [
-    path.resolve(__dirname, "..", "code", "agent.js"),
-    path.resolve(__dirname, "..", "..", "bin", "ucode-core.js"),
+    path.resolve(__dirname, "..", "agent.js"),
+    path.resolve(__dirname, "..", "..", "..", "bin", "ucode-core.js"),
   ];
   for (const entry of candidates) {
     try {
@@ -299,7 +298,7 @@ function resolveNativeFallbackCommand({ env = process.env } = {}) {
           return {
             command: process.execPath,
             args: [entry],
-            root: path.resolve(__dirname, "..", "code"),
+            root: path.resolve(__dirname, ".."),
             kind: "native",
             available: true,
             resolvedPath: entry,
@@ -308,7 +307,7 @@ function resolveNativeFallbackCommand({ env = process.env } = {}) {
         return {
           command: process.execPath,
           args: [entry, "agent"],
-          root: path.resolve(__dirname, "..", "code"),
+          root: path.resolve(__dirname, ".."),
           kind: "native",
           available: true,
           resolvedPath: entry,

package/src/{agent → code/launcher}/ucodeBootstrap.js

@@ -1,7 +1,7 @@
 const fs = require("fs");
 const path = require("path");
-const { getUfooPaths } = require("../ufoo/paths");
-const { buildDefaultStartupBootstrapPrompt } = require("./defaultBootstrap");
+const { getUfooPaths } = require("../../coordination/state/paths");
+const { buildDefaultStartupBootstrapPrompt } = require("../../agents/prompts/defaultBootstrap");
 
 function readFileSafe(filePath = "") {
   if (!filePath) return "";
@@ -77,7 +77,7 @@ function buildBootstrapContent({
 
 function hasUfooProtocolPrompt(promptText = "") {
   const text = String(promptText || "");
-  return text.includes("ufoo protocol:") && text.includes("ufoo ctx decisions -l");
+  return text.includes("Session harness: ufoo") && text.includes("ufoo ctx decisions -l");
 }
 
 function mergeDefaultUfooProtocolPrompt(projectRoot = "", promptText = "") {

package/src/{agent → code/launcher}/ucodeBuild.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const path = require("path");
-const { loadConfig } = require("../config");
+const { loadConfig } = require("../../config");
 const {
   resolveNativeFallbackCommand,
 } = require("./ucode");
@@ -12,7 +12,7 @@ function resolveCoreRoot({
   void env;
   void config;
   const native = resolveNativeFallbackCommand();
-  return native.root || path.resolve(__dirname, "..", "code");
+  return native.root || path.resolve(__dirname, "..");
 }
 
 function inspectUcodeBuildSetup({

package/src/{agent → code/launcher}/ucodeDoctor.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const path = require("path");
-const { loadConfig } = require("../config");
+const { loadConfig } = require("../../config");
 const {
   resolveNativeFallbackCommand,
   defaultBundledPromptFile,
@@ -20,7 +20,7 @@ function inspectUcodeSetup({
   const native = resolveNativeImpl({ env, config, cwd: root });
   const coreAvailable = Boolean(native && native.available !== false && native.command);
   const core = native ? {
-    root: native.root || path.resolve(__dirname, "..", "code"),
+    root: native.root || path.resolve(__dirname, ".."),
     command: native.command,
     args: native.args || [],
     available: coreAvailable,

package/src/{agent → code/launcher}/ucodeRuntimeConfig.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const path = require("path");
-const { loadGlobalUcodeConfig } = require("../config");
+const { loadGlobalUcodeConfig } = require("../../config");
 
 function readJson(filePath = "", fallback = {}) {
   if (!filePath) return fallback;
@@ -134,4 +134,3 @@ module.exports = {
   inspectUcodeRuntimeConfig,
   prepareUcodeRuntimeConfig,
 };
-

package/src/code/nativeRunner.js

@@ -1,10 +1,10 @@
 const { randomUUID } = require("crypto");
 const { loadConfig, defaultAgentModelForProvider, sameModelProvider } = require("../config");
 const { runToolCall } = require("./dispatch");
-const { getReadToolDescription } = require("./prompts/toolDescriptions/read");
-const { getWriteToolDescription } = require("./prompts/toolDescriptions/write");
-const { getEditToolDescription } = require("./prompts/toolDescriptions/edit");
-const { getBashToolDescription } = require("./prompts/toolDescriptions/bash");
+const { getReadToolDescription } = require("../agents/prompts/native/toolDescriptions/read");
+const { getWriteToolDescription } = require("../agents/prompts/native/toolDescriptions/write");
+const { getEditToolDescription } = require("../agents/prompts/native/toolDescriptions/edit");
+const { getBashToolDescription } = require("../agents/prompts/native/toolDescriptions/bash");
 
 const CORE_TOOL_NAMES = new Set(["read", "write", "edit", "bash"]);
 const DEFAULT_OPENAI_BASE_URL = "https://api.openai.com/v1";