u-foo 2.5.5 → 2.5.7

package/src/code/launcher/ucode.js

@@ -2,55 +2,6 @@ const { loadConfig } = require("../../config");
 const path = require("path");
 const fs = require("fs");
 
-function bundledModuleRoots() {
-  return [
-    path.join(__dirname, ".."),
-  ];
-}
-
-function resolveFirstExisting(paths = []) {
-  for (const candidate of paths) {
-    if (!candidate) continue;
-    try {
-      if (fs.existsSync(candidate)) return candidate;
-    } catch {
-      // ignore
-    }
-  }
-  return "";
-}
-
-function defaultBundledCoreRoot() {
-  const root = path.join(__dirname, "..");
-  const agentEntry = path.join(root, "agent.js");
-  if (resolveFirstExisting([agentEntry])) return root;
-  return root;
-}
-
-function defaultBundledPromptFile() {
-  const moduleRoots = bundledModuleRoots();
-  const candidates = moduleRoots.map((root) => path.join(root, "UCODE_PROMPT.md"));
-  return resolveFirstExisting(candidates) || candidates[0];
-}
-
-function isWindowsPlatform() {
-  return process.platform === "win32";
-}
-
-function canExecutePath(filePath = "") {
-  const target = String(filePath || "").trim();
-  if (!target) return false;
-  try {
-    const stat = fs.statSync(target);
-    if (!stat.isFile()) return false;
-    if (isWindowsPlatform()) return true;
-    fs.accessSync(target, fs.constants.X_OK);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
 function isReadableFile(filePath = "") {
   const target = String(filePath || "").trim();
   if (!target) return false;
@@ -61,113 +12,6 @@ function isReadableFile(filePath = "") {
   }
 }
 
-function resolveExecutableFromPath(command = "", env = process.env) {
-  const text = String(command || "").trim();
-  if (!text) return "";
-  if (path.isAbsolute(text) || text.includes("/") || text.includes("\\")) {
-    return canExecutePath(text) ? path.resolve(text) : "";
-  }
-
-  const pathText = String((env && env.PATH) || process.env.PATH || "").trim();
-  if (!pathText) return "";
-  const dirs = pathText.split(path.delimiter).map((item) => String(item || "").trim()).filter(Boolean);
-  if (dirs.length === 0) return "";
-
-  const hasExplicitExt = /\.[a-zA-Z0-9]+$/.test(text);
-  const exts = isWindowsPlatform()
-    ? String((env && env.PATHEXT) || process.env.PATHEXT || ".EXE;.CMD;.BAT;.COM")
-      .split(";")
-      .map((item) => item.trim())
-      .filter(Boolean)
-    : [""];
-  const suffixes = hasExplicitExt ? [""] : exts;
-
-  for (const dir of dirs) {
-    for (const ext of suffixes) {
-      const candidate = path.join(dir, `${text}${ext}`);
-      if (canExecutePath(candidate)) return candidate;
-    }
-  }
-  return "";
-}
-
-function tokenizeCommand(raw = "") {
-  const text = String(raw || "");
-  const tokens = [];
-  let current = "";
-  let quote = "";
-
-  for (let i = 0; i < text.length; i += 1) {
-    const ch = text[i];
-    if (quote) {
-      if (quote === "\"") {
-        if (ch === "\\") {
-          if (i + 1 < text.length) {
-            const next = text[i + 1];
-            if (next === "\"" || next === "\\") {
-              current += next;
-              i += 1;
-              continue;
-            }
-          }
-          current += "\\";
-          continue;
-        }
-      } else if (quote === "'" && ch === "\\") {
-        current += "\\";
-        continue;
-      }
-      if (ch === quote) {
-        quote = "";
-        continue;
-      }
-      current += ch;
-      continue;
-    }
-
-    if (ch === "'" || ch === "\"") {
-      quote = ch;
-      continue;
-    }
-    if (ch === "\\") {
-      if (i + 1 < text.length) {
-        const next = text[i + 1];
-        if (/\s/.test(next) || next === "'" || next === "\"" || next === "\\") {
-          current += next;
-          i += 1;
-        } else {
-          current += "\\";
-        }
-      } else {
-        current += "\\";
-      }
-      continue;
-    }
-    if (/\s/.test(ch)) {
-      if (current) {
-        tokens.push(current);
-        current = "";
-      }
-      continue;
-    }
-    current += ch;
-  }
-
-  if (quote) {
-    return String(raw || "").trim().split(/\s+/).filter(Boolean);
-  }
-  if (current) tokens.push(current);
-  return tokens;
-}
-
-function splitCommand(raw, fallback = "pi") {
-  const text = String(raw || "").trim();
-  if (!text) return { command: fallback, args: [] };
-  const parts = tokenizeCommand(text);
-  if (parts.length === 0) return { command: fallback, args: [] };
-  return { command: parts[0], args: parts.slice(1) };
-}
-
 function hasAnyArg(args = [], names = []) {
   if (!Array.isArray(args) || args.length === 0) return false;
   const flags = new Set((Array.isArray(names) ? names : []).filter(Boolean));
@@ -182,19 +26,6 @@ function hasAnyArg(args = [], names = []) {
   });
 }
 
-function pickBinEntry(binField = {}) {
-  if (typeof binField === "string" && binField.trim()) {
-    return binField.trim();
-  }
-  if (!binField || typeof binField !== "object") return "";
-  const entries = Object.entries(binField)
-    .filter(([, value]) => typeof value === "string" && value.trim());
-  if (entries.length === 0) return "";
-  const preferred = entries.find(([name]) => /^(ucode|core|cli)$/i.test(String(name)));
-  if (preferred) return preferred[1].trim();
-  return entries[0][1].trim();
-}
-
 function normalizeAppendSystemPromptMode(value = "") {
   const text = String(value || "").trim().toLowerCase();
   if (text === "always" || text === "force" || text === "on" || text === "1" || text === "true") return "always";
@@ -202,20 +33,6 @@ function normalizeAppendSystemPromptMode(value = "") {
   return "auto";
 }
 
-function isLikelyPiCoreCommand(command = "", args = []) {
-  const cmdText = String(command || "").trim();
-  const cmdBase = path.basename(cmdText).toLowerCase();
-  if (cmdBase === "ucode" || cmdBase === "ucode.exe") return true;
-
-  const joined = [cmdText, ...(Array.isArray(args) ? args : [])]
-    .map((part) => String(part || "").toLowerCase())
-    .join(" ");
-  if (!joined) return false;
-  if (joined.includes("/src/code/agent.js")) return true;
-  if (joined.includes("\\src\\code\\agent.js")) return true;
-  return false;
-}
-
 function readLastArgValue(args = [], flag = "") {
   if (!Array.isArray(args) || !flag) return "";
   let value = "";
@@ -224,8 +41,10 @@ function readLastArgValue(args = [], flag = "") {
     if (!item) continue;
     if (item === flag) {
       const next = String(args[i + 1] || "").trim();
-      if (next) value = next;
-      i += 1;
+      if (next && !next.startsWith("--")) {
+        value = next;
+        i += 1;
+      }
       continue;
     }
     if (item.startsWith(`${flag}=`)) {
@@ -236,54 +55,6 @@ function readLastArgValue(args = [], flag = "") {
   return value;
 }
 
-function resolveCoreFromPath(coreRoot = "") {
-  const requestedRoot = String(coreRoot || "").trim();
-  if (!requestedRoot) return null;
-  let stat;
-  try {
-    stat = fs.statSync(requestedRoot);
-  } catch {
-    return null;
-  }
-  if (!stat.isDirectory()) return null;
-
-  const candidates = [
-    requestedRoot,
-    path.join(requestedRoot, "packages", "coding-agent"),
-  ];
-
-  for (const root of candidates) {
-    const packageFile = path.join(root, "package.json");
-    let pkg = null;
-    try {
-      pkg = JSON.parse(fs.readFileSync(packageFile, "utf8"));
-    } catch {
-      continue;
-    }
-    const binRel = pickBinEntry(pkg && pkg.bin ? pkg.bin : {});
-    if (!binRel) continue;
-    const binAbs = path.resolve(root, binRel);
-    if (!fs.existsSync(binAbs)) continue;
-    return {
-      command: process.execPath,
-      args: [binAbs],
-      root,
-    };
-  }
-  return null;
-}
-
-function resolveCandidateCoreRoot({
-  env = process.env,
-  config = {},
-} = {}) {
-  // Native-only mode: external pi-mono path is no longer used as launch fallback.
-  // Keep function for compatibility with older diagnostic surfaces.
-  void env;
-  void config;
-  return null;
-}
-
 function resolveNativeFallbackCommand({ env = process.env } = {}) {
   void env;
   const entry = path.resolve(__dirname, "..", "agent.js");
@@ -342,7 +113,7 @@ function resolveUcodeLaunch({
   const promptFile = String(
     env.UFOO_UCODE_PROMPT_FILE
       || config.ucodePromptFile
-      || defaultBundledPromptFile()
+      || ""
   ).trim();
   const bootstrapFile = String(
     env.UFOO_UCODE_BOOTSTRAP_FILE
@@ -359,16 +130,10 @@ function resolveUcodeLaunch({
       || config.ucodeAppendSystemPromptMode
       || "auto"
   );
+  // Native-only mode: the bundled native core always supports
+  // --append-system-prompt, so only mode=never suppresses injection.
   const hasSystemPromptArg = hasAnyArg(finalArgs, ["--system-prompt", "--append-system-prompt"]);
-  const appendSupported = appendSystemPromptMode === "always"
-    || (
-      appendSystemPromptMode === "auto"
-      && (
-        nativeCore.kind === "native"
-        || isLikelyPiCoreCommand(command, finalArgs)
-      )
-    );
-  if (!hasSystemPromptArg && appendSystemPrompt && appendSystemPromptMode !== "never" && appendSupported) {
+  if (!hasSystemPromptArg && appendSystemPrompt && appendSystemPromptMode !== "never") {
     finalArgs.push("--append-system-prompt", appendSystemPrompt);
   }
   const effectiveProvider = readLastArgValue(finalArgs, "--provider");
@@ -396,20 +161,9 @@ function resolveUcodeLaunch({
 }
 
 module.exports = {
-  bundledModuleRoots,
-  defaultBundledCoreRoot,
-  defaultBundledPromptFile,
-  tokenizeCommand,
-  splitCommand,
   hasAnyArg,
-  pickBinEntry,
   normalizeAppendSystemPromptMode,
-  isLikelyPiCoreCommand,
   readLastArgValue,
-  resolveCoreFromPath,
-  resolveCandidateCoreRoot,
-  canExecutePath,
-  resolveExecutableFromPath,
   resolveNativeFallbackCommand,
   resolveUcodeLaunch,
 };

package/src/code/launcher/ucodeBootstrap.js

@@ -86,16 +86,32 @@ function mergeDefaultUfooProtocolPrompt(projectRoot = "", promptText = "") {
   return [defaultPrompt, currentPrompt].filter(Boolean).join("\n\n");
 }
 
+function isPathInsideRoot(root = "", target = "") {
+  const relative = path.relative(path.resolve(root), path.resolve(target));
+  return Boolean(relative) && !relative.startsWith("..") && !path.isAbsolute(relative);
+}
+
 function prepareUcodeBootstrap({
   projectRoot = process.cwd(),
   promptFile = "",
   promptText = "",
   targetFile = "",
   includeDefaultProtocol = true,
+  allowOutsideProjectRoot = false,
 } = {}) {
   const resolvedProjectRoot = path.resolve(projectRoot);
   const resolvedPrompt = String(promptFile || "").trim();
-  const resolvedTarget = String(targetFile || "").trim() || defaultBootstrapPath(resolvedProjectRoot);
+  const resolvedTarget = path.resolve(
+    resolvedProjectRoot,
+    String(targetFile || "").trim() || defaultBootstrapPath(resolvedProjectRoot)
+  );
+  // The target may come from the project config (.ufoo/config.json), which is
+  // attacker-controlled in a cloned repository. Refuse to write outside the
+  // project root unless the caller marked the target as user-trusted (e.g.
+  // the user's own UFOO_UCODE_BOOTSTRAP_FILE env var).
+  if (!allowOutsideProjectRoot && !isPathInsideRoot(resolvedProjectRoot, resolvedTarget)) {
+    throw new Error(`ucode bootstrap target must stay inside the project root: ${resolvedTarget}`);
+  }
 
   const inlinePromptText = String(promptText || "").trim();
   const resolvedPromptText = inlinePromptText || readFileSafe(resolvedPrompt);
@@ -129,5 +145,6 @@ module.exports = {
   resolveProjectRules,
   defaultBootstrapPath,
   buildBootstrapContent,
+  isPathInsideRoot,
   prepareUcodeBootstrap,
 };

package/src/code/launcher/ucodeBuild.js

@@ -27,15 +27,12 @@ function inspectUcodeBuildSetup({
   const workspaceRoot = root;
   const distCliPath = Array.isArray(native.args) && native.args[0] ? path.resolve(native.args[0]) : "";
   const distCliExists = Boolean(distCliPath && fs.existsSync(distCliPath));
-  const nodeModulesPath = "";
   return {
     projectRoot: root,
     coreRoot,
     workspaceRoot,
     distCliPath,
     distCliExists,
-    nodeModulesPath,
-    nodeModulesExists: Boolean(nodeModulesPath && fs.existsSync(nodeModulesPath)),
   };
 }
 

package/src/code/launcher/ucodeDoctor.js

@@ -3,7 +3,6 @@ const path = require("path");
 const { loadConfig } = require("../../config");
 const {
   resolveNativeFallbackCommand,
-  defaultBundledPromptFile,
 } = require("./ucode");
 const { inspectUcodeBuildSetup } = require("./ucodeBuild");
 const { inspectUcodeRuntimeConfig } = require("./ucodeRuntimeConfig");
@@ -30,7 +29,7 @@ function inspectUcodeSetup({
   const promptFile = String(
     env.UFOO_UCODE_PROMPT_FILE
       || config.ucodePromptFile
-      || defaultBundledPromptFile()
+      || ""
   ).trim();
   const bootstrapFile = String(
     env.UFOO_UCODE_BOOTSTRAP_FILE
@@ -130,8 +129,11 @@ function formatUcodeDoctor(result = {}) {
   if (result.configuredCommand) {
     lines.push(`configured command override (ignored in native-only mode): ${result.configuredCommand}`);
   }
-  lines.push(`prompt: ${result.promptFile || "(none)"}${result.promptExists ? "" : " (missing)"}`);
+  lines.push(`prompt: ${result.promptFile || "(none)"}${result.promptFile && !result.promptExists ? " (missing)" : ""}`);
   lines.push(`bootstrap: ${result.bootstrapFile || "(none)"}`);
+  if (result.bootstrapPrepared && result.bootstrapPrepared.ok === false) {
+    lines.push(`  warning: bootstrap preparation failed: ${result.bootstrapPrepared.error || "unknown error"}`);
+  }
   if (result.build && result.build.coreRoot) {
     lines.push(`build: ${result.build.distCliExists ? "ready" : "missing dist"}`);
     lines.push(`  core root: ${result.build.coreRoot}`);
@@ -166,11 +168,27 @@ function prepareAndInspectUcode({
   loadConfigImpl = loadConfig,
 } = {}) {
   const inspection = inspectUcodeSetup({ projectRoot, env, loadConfigImpl });
-  const prepared = prepareUcodeBootstrap({
-    projectRoot: inspection.projectRoot,
-    promptFile: inspection.promptFile,
-    targetFile: inspection.bootstrapFile,
-  });
+  let prepared;
+  try {
+    prepared = prepareUcodeBootstrap({
+      projectRoot: inspection.projectRoot,
+      promptFile: inspection.promptFile,
+      targetFile: inspection.bootstrapFile,
+      // The user's own env var is trusted; a bootstrap path coming from the
+      // project config must stay inside the project root.
+      allowOutsideProjectRoot: Boolean(String(env.UFOO_UCODE_BOOTSTRAP_FILE || "").trim()),
+      // The native core already injects the ufoo protocol via the modular
+      // prompt (src/agents/prompts/native/ufoo.js); inlining it into the
+      // bootstrap file would append the same protocol text a second time.
+      includeDefaultProtocol: false,
+    });
+  } catch (err) {
+    prepared = {
+      ok: false,
+      file: inspection.bootstrapFile,
+      error: err && err.message ? err.message : "failed to prepare bootstrap",
+    };
+  }
   return {
     ...inspection,
     bootstrapPrepared: prepared,

package/src/code/launcher/ucodeRuntimeConfig.js

@@ -1,5 +1,6 @@
 const fs = require("fs");
 const path = require("path");
+const { randomUUID } = require("crypto");
 const { loadGlobalUcodeConfig } = require("../../config");
 
 function readJson(filePath = "", fallback = {}) {
@@ -14,10 +15,17 @@ function readJson(filePath = "", fallback = {}) {
   }
 }
 
-function writeJson(filePath = "", data = {}) {
+function writeJson(filePath = "", data = {}, { mode = 0 } = {}) {
   if (!filePath) return;
   fs.mkdirSync(path.dirname(filePath), { recursive: true });
-  fs.writeFileSync(filePath, `${JSON.stringify(data, null, 2)}\n`, "utf8");
+  // Write to a temp file and rename so a crash mid-write cannot leave a
+  // truncated JSON file behind.
+  const tmpFile = `${filePath}.${process.pid}-${randomUUID()}.tmp`;
+  fs.writeFileSync(tmpFile, `${JSON.stringify(data, null, 2)}\n`, "utf8");
+  fs.renameSync(tmpFile, filePath);
+  if (mode) {
+    fs.chmodSync(filePath, mode);
+  }
 }
 
 function resolveRuntimeValues({
@@ -103,7 +111,8 @@ function prepareUcodeRuntimeConfig({
       type: "api_key",
       key: inspection.apiKey,
     };
-    writeJson(inspection.authFile, auth);
+    // auth.json carries API keys: keep it readable only by the owner.
+    writeJson(inspection.authFile, auth, { mode: 0o600 });
   }
 
   if (inspection.provider && inspection.baseUrl) {