u-foo 1.2.11 → 1.2.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u-foo",
-  "version": "1.2.11",
+  "version": "1.2.12",
   "description": "Multi-Agent Workspace Protocol. Just add u. claude → uclaude, codex → ucodex.",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://ufoo.dev",

package/src/agent/ucodeRuntimeConfig.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const path = require("path");
-const { loadConfig } = require("../config");
+const { loadGlobalUcodeConfig } = require("../config");
 
 function readJson(filePath = "", fallback = {}) {
   if (!filePath) return fallback;
@@ -58,10 +58,10 @@ function resolveRuntimeValues({
 function inspectUcodeRuntimeConfig({
   projectRoot = process.cwd(),
   env = process.env,
-  loadConfigImpl = loadConfig,
+  loadConfigImpl = loadGlobalUcodeConfig,
 } = {}) {
   const root = path.resolve(projectRoot);
-  const config = loadConfigImpl(root);
+  const config = loadConfigImpl();
   const resolved = resolveRuntimeValues({
     env,
     config,
@@ -84,7 +84,7 @@ function inspectUcodeRuntimeConfig({
 function prepareUcodeRuntimeConfig({
   projectRoot = process.cwd(),
   env = process.env,
-  loadConfigImpl = loadConfig,
+  loadConfigImpl = loadGlobalUcodeConfig,
 } = {}) {
   const inspection = inspectUcodeRuntimeConfig({
     projectRoot,

package/src/chat/commandExecutor.js

@@ -2,7 +2,7 @@ const path = require("path");
 const EventBus = require("../bus");
 const { IPC_REQUEST_TYPES } = require("../shared/eventContract");
 const UfooInit = require("../init");
-const { loadConfig: loadProjectConfig, saveConfig: saveProjectConfig } = require("../config");
+const { loadConfig: loadProjectConfig, saveConfig: saveProjectConfig, loadGlobalUcodeConfig, saveGlobalUcodeConfig } = require("../config");
 const { resolveTransport } = require("../code/nativeRunner");
 const { parseIntervalMs, formatIntervalMs } = require("./cronScheduler");
 
@@ -64,6 +64,8 @@ function createCommandExecutor(options = {}) {
     activateAgent = async () => {},
     loadConfig = loadProjectConfig,
     saveConfig = saveProjectConfig,
+    loadUcodeConfig = loadGlobalUcodeConfig,
+    saveUcodeConfig = saveGlobalUcodeConfig,
     createCronTask = () => null,
     listCronTasks = () => [],
     stopCronTask = () => false,
@@ -558,7 +560,7 @@ function createCommandExecutor(options = {}) {
     const action = (!first || hasInlineKv) ? "set" : first;
 
     if (action === "show" || action === "status") {
-      const config = loadConfig(projectRoot) || {};
+      const config = loadUcodeConfig() || {};
       const provider = String(config.ucodeProvider || "").trim();
       const model = String(config.ucodeModel || "").trim();
       const url = String(config.ucodeBaseUrl || "").trim();
@@ -592,8 +594,8 @@ function createCommandExecutor(options = {}) {
         logMessage("error", "{white-fg}✗{/white-fg} Usage: /settings ucode set provider=<openai|anthropic> model=<id> url=<baseUrl> key=<apiKey>");
         return;
       }
-      saveConfig(projectRoot, updates);
-      logMessage("system", "{white-fg}✓{/white-fg} ucode config updated");
+      saveUcodeConfig(updates);
+      logMessage("system", "{white-fg}✓{/white-fg} ucode config updated (global)");
       if (Object.prototype.hasOwnProperty.call(updates, "ucodeProvider")) {
         logMessage("system", `  • provider: ${updates.ucodeProvider || "(unset)"}`);
       }
@@ -606,7 +608,7 @@ function createCommandExecutor(options = {}) {
       if (Object.prototype.hasOwnProperty.call(updates, "ucodeApiKey")) {
         logMessage("system", `  • key: ${maskSecret(updates.ucodeApiKey)}`);
       }
-      const nextConfig = loadConfig(projectRoot) || {};
+      const nextConfig = loadUcodeConfig() || {};
       logMessage("system", `  • transport: ${inferUcodeTransport(nextConfig.ucodeProvider, nextConfig.ucodeBaseUrl)} (auto)`);
       return;
     }
@@ -624,8 +626,8 @@ function createCommandExecutor(options = {}) {
         logMessage("error", "{white-fg}✗{/white-fg} Usage: /settings ucode clear [provider|model|url|key|all]");
         return;
       }
-      saveConfig(projectRoot, updates);
-      logMessage("system", "{white-fg}✓{/white-fg} ucode config cleared");
+      saveUcodeConfig(updates);
+      logMessage("system", "{white-fg}✓{/white-fg} ucode config cleared (global)");
       return;
     }
 

package/src/config.js

@@ -2,6 +2,8 @@ const fs = require("fs");
 const os = require("os");
 const path = require("path");
 
+const UCODE_FIELDS = ["ucodeProvider", "ucodeModel", "ucodeBaseUrl", "ucodeApiKey", "ucodeAgentDir"];
+
 const DEFAULT_CONFIG = {
   launchMode: "auto",
   agentProvider: "codex-cli",
@@ -9,12 +11,15 @@ const DEFAULT_CONFIG = {
   assistantEngine: "auto",
   assistantModel: "",
   assistantUfooCmd: "",
+  autoResume: false,
+};
+
+const DEFAULT_UCODE_CONFIG = {
   ucodeProvider: "",
   ucodeModel: "",
   ucodeBaseUrl: "",
   ucodeApiKey: "",
   ucodeAgentDir: "",
-  autoResume: false,
 };
 
 function normalizeLaunchMode(value) {
@@ -58,9 +63,7 @@ function loadJsonSafe(filePath) {
 
 function loadConfig(projectRoot) {
   try {
-    const globalRaw = loadJsonSafe(globalConfigPath());
-    const projectRaw = loadJsonSafe(configPath(projectRoot));
-    const raw = { ...globalRaw, ...projectRaw };
+    const raw = loadJsonSafe(configPath(projectRoot));
     return {
       ...DEFAULT_CONFIG,
       ...raw,
@@ -69,15 +72,12 @@ function loadConfig(projectRoot) {
       assistantEngine: normalizeAssistantEngine(raw.assistantEngine),
       assistantModel: typeof raw.assistantModel === "string" ? raw.assistantModel : "",
       assistantUfooCmd: typeof raw.assistantUfooCmd === "string" ? raw.assistantUfooCmd : "",
-      ucodeProvider: typeof raw.ucodeProvider === "string" ? raw.ucodeProvider : "",
-      ucodeModel: typeof raw.ucodeModel === "string" ? raw.ucodeModel : "",
-      ucodeBaseUrl: typeof raw.ucodeBaseUrl === "string" ? raw.ucodeBaseUrl : "",
-      ucodeApiKey: typeof raw.ucodeApiKey === "string" ? raw.ucodeApiKey : "",
-      ucodeAgentDir: typeof raw.ucodeAgentDir === "string" ? raw.ucodeAgentDir : "",
       autoResume: raw.autoResume !== false,
+      // Merge ucode fields from global config so callers still see them
+      ...loadGlobalUcodeConfig(),
     };
   } catch {
-    return { ...DEFAULT_CONFIG };
+    return { ...DEFAULT_CONFIG, ...DEFAULT_UCODE_CONFIG };
   }
 }
 
@@ -90,29 +90,62 @@ function saveConfig(projectRoot, config) {
   } catch {
     existing = {};
   }
+  // Strip ucode fields — they belong in global config only
+  const projectUpdates = {};
+  for (const [k, v] of Object.entries(config)) {
+    if (!UCODE_FIELDS.includes(k)) {
+      projectUpdates[k] = v;
+    }
+  }
   const merged = {
     ...DEFAULT_CONFIG,
     ...existing,
-    ...config,
+    ...projectUpdates,
   };
+  // Remove any stale ucode fields from project config
+  for (const f of UCODE_FIELDS) {
+    delete merged[f];
+  }
   merged.launchMode = normalizeLaunchMode(merged.launchMode);
   merged.agentProvider = normalizeAgentProvider(merged.agentProvider);
   merged.assistantEngine = normalizeAssistantEngine(merged.assistantEngine);
   merged.assistantModel = typeof merged.assistantModel === "string" ? merged.assistantModel : "";
   merged.assistantUfooCmd = typeof merged.assistantUfooCmd === "string" ? merged.assistantUfooCmd : "";
-  merged.ucodeProvider = typeof merged.ucodeProvider === "string" ? merged.ucodeProvider : "";
-  merged.ucodeModel = typeof merged.ucodeModel === "string" ? merged.ucodeModel : "";
-  merged.ucodeBaseUrl = typeof merged.ucodeBaseUrl === "string" ? merged.ucodeBaseUrl : "";
-  merged.ucodeApiKey = typeof merged.ucodeApiKey === "string" ? merged.ucodeApiKey : "";
-  merged.ucodeAgentDir = typeof merged.ucodeAgentDir === "string" ? merged.ucodeAgentDir : "";
   merged.autoResume = merged.autoResume !== false;
   fs.writeFileSync(target, JSON.stringify(merged, null, 2));
   return merged;
 }
 
+function loadGlobalUcodeConfig() {
+  const raw = loadJsonSafe(globalConfigPath());
+  return {
+    ucodeProvider: typeof raw.ucodeProvider === "string" ? raw.ucodeProvider : "",
+    ucodeModel: typeof raw.ucodeModel === "string" ? raw.ucodeModel : "",
+    ucodeBaseUrl: typeof raw.ucodeBaseUrl === "string" ? raw.ucodeBaseUrl : "",
+    ucodeApiKey: typeof raw.ucodeApiKey === "string" ? raw.ucodeApiKey : "",
+    ucodeAgentDir: typeof raw.ucodeAgentDir === "string" ? raw.ucodeAgentDir : "",
+  };
+}
+
+function saveGlobalUcodeConfig(updates = {}) {
+  const target = globalConfigPath();
+  fs.mkdirSync(path.dirname(target), { recursive: true });
+  const existing = loadJsonSafe(target);
+  const merged = { ...existing };
+  for (const [k, v] of Object.entries(updates)) {
+    if (UCODE_FIELDS.includes(k)) {
+      merged[k] = typeof v === "string" ? v : "";
+    }
+  }
+  fs.writeFileSync(target, JSON.stringify(merged, null, 2));
+  return merged;
+}
+
 module.exports = {
   loadConfig,
   saveConfig,
+  loadGlobalUcodeConfig,
+  saveGlobalUcodeConfig,
   normalizeLaunchMode,
   normalizeAgentProvider,
   normalizeAssistantEngine,