@proxysoul/soulforge 2.18.3 → 2.18.4

package/dist/index.js

@@ -5202,25 +5202,56 @@ function loadConfig() {
   if (!existsSync10(configDir2)) {
     mkdirSync8(configDir2, { recursive: true, mode: 448 });
   }
-  if (!existsSync10(configFile)) {
-    writeFileSync7(configFile, JSON.stringify(DEFAULT_CONFIG, null, 2));
-    if (!_presetOverlay)
-      return DEFAULT_CONFIG;
-  }
   let userConfig = {};
-  try {
-    userConfig = JSON.parse(readFileSync8(configFile, "utf-8"));
-  } catch (err2) {
-    logBackgroundError("config", `Failed to parse ${configFile}: ${err2 instanceof Error ? err2.message : String(err2)} \u2014 using defaults`);
-    if (!_presetOverlay)
-      return DEFAULT_CONFIG;
+  let fileExists = existsSync10(configFile);
+  if (!fileExists) {
+    writeFileSync7(configFile, JSON.stringify(DEFAULT_CONFIG, null, 2));
+    fileExists = true;
+  } else {
+    try {
+      userConfig = JSON.parse(readFileSync8(configFile, "utf-8"));
+    } catch (err2) {
+      logBackgroundError("config", `Failed to parse ${configFile}: ${err2 instanceof Error ? err2.message : String(err2)} \u2014 using defaults`);
+      userConfig = {};
+    }
   }
   let merged = { ...DEFAULT_CONFIG };
   if (_presetOverlay)
     merged = applyConfigPatch(merged, _presetOverlay);
-  merged = { ...merged, ...userConfig };
+  const userPatch = diffAgainstDefaults(userConfig);
+  if (Object.keys(userPatch).length > 0) {
+    merged = applyConfigPatch(merged, userPatch);
+  }
   return merged;
 }
+function diffAgainstDefaults(userConfig) {
+  const out2 = {};
+  const defaults = DEFAULT_CONFIG;
+  const nested = new Set(NESTED_KEYS);
+  for (const [key, value] of Object.entries(userConfig)) {
+    if (value === undefined)
+      continue;
+    const def = defaults[key];
+    if (nested.has(key) && value && typeof value === "object" && !Array.isArray(value) && def && typeof def === "object" && !Array.isArray(def)) {
+      const subPatch = {};
+      const defRec = def;
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue === undefined)
+          continue;
+        if (JSON.stringify(subValue) !== JSON.stringify(defRec[subKey])) {
+          subPatch[subKey] = subValue;
+        }
+      }
+      if (Object.keys(subPatch).length > 0)
+        out2[key] = subPatch;
+      continue;
+    }
+    if (JSON.stringify(value) !== JSON.stringify(def)) {
+      out2[key] = value;
+    }
+  }
+  return out2;
+}
 function loadProjectConfig(cwd) {
   const projectFile = join11(cwd, ".soulforge", "config.json");
   if (!existsSync10(projectFile))
@@ -71714,7 +71745,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@proxysoul/soulforge",
-    version: "2.18.3",
+    version: "2.18.4",
     description: "Graph-powered code intelligence \u2014 multi-agent coding with codebase-aware AI",
     repository: {
       type: "git",
@@ -74060,6 +74091,17 @@ function createReasoningFetchWrapper(reasoningBody) {
 }
 
 // src/core/llm/providers/custom.ts
+function normalizeBaseURLPath(baseURL) {
+  return baseURL.replace(/\/v1(?:\/)?$/i, "").replace(/\/+$/, "");
+}
+function resolveModelsAPIUrl(config2) {
+  if (config2.modelsAPI === false)
+    return null;
+  if (config2.modelsAPI)
+    return config2.modelsAPI;
+  const normalized = normalizeBaseURLPath(config2.baseURL);
+  return `${normalized}/models`;
+}
 function normalizeModels(models) {
   if (!models || models.length === 0)
     return [];
@@ -74097,22 +74139,41 @@ function buildCustomProvider(config2) {
       return client.chatModel(modelId);
     },
     async fetchModels() {
-      if (!config2.modelsAPI)
+      const modelsUrl = resolveModelsAPIUrl(config2);
+      if (!modelsUrl)
         return null;
       const apiKey = envVar ? getProviderApiKey(envVar) ?? "" : "";
       const headers = { "Content-Type": "application/json" };
       if (apiKey)
         headers.Authorization = `Bearer ${apiKey}`;
-      const res = await fetch(config2.modelsAPI, {
-        headers,
-        signal: AbortSignal.timeout(5000)
-      });
+      let res;
+      try {
+        res = await fetch(modelsUrl, {
+          headers,
+          signal: AbortSignal.timeout(2000)
+        });
+      } catch {
+        return null;
+      }
       if (!res.ok)
         return null;
-      const data = await res.json();
-      if (!Array.isArray(data.data))
+      let parsed;
+      try {
+        parsed = await res.json();
+      } catch {
         return null;
-      return data.data.map((m) => ({ id: m.id, name: m.id }));
+      }
+      if (!Array.isArray(parsed.data))
+        return null;
+      return parsed.data.map((m) => {
+        const rawContext = m.context_length ?? m.max_context_length ?? m.model_info?.max_input_tokens ?? m.meta?.n_ctx_train;
+        const contextWindow = typeof rawContext === "number" ? rawContext : typeof rawContext === "string" ? Number(rawContext) : undefined;
+        return {
+          id: m.id,
+          name: m.id,
+          ...contextWindow !== undefined && !Number.isNaN(contextWindow) ? { contextWindow } : {}
+        };
+      });
     },
     fallbackModels: normalizeModels(config2.models),
     contextWindows: [],
@@ -468144,17 +468205,14 @@ function expandEnv(value) {
   return value;
 }
 function validatePreset(raw2, origin) {
-  if (!raw2 || typeof raw2 !== "object") {
-    throw new Error(`Preset at ${origin} is not an object`);
-  }
-  const obj = raw2;
-  if (typeof obj.name !== "string" || !/^[a-z0-9][a-z0-9-]*$/.test(obj.name)) {
-    throw new Error(`Preset at ${origin}: invalid or missing "name"`);
-  }
-  if (typeof obj.version !== "string" || !/^\d+\.\d+\.\d+$/.test(obj.version)) {
-    throw new Error(`Preset at ${origin}: invalid or missing "version" (semver required)`);
+  const expanded = expandEnv(raw2);
+  const parsed = PresetSchema.safeParse(expanded);
+  if (!parsed.success) {
+    const issue2 = parsed.error.issues[0];
+    const path = issue2?.path.length ? issue2.path.join(".") : "<root>";
+    throw new Error(`Preset at ${origin}: ${path} \u2014 ${issue2?.message ?? "invalid shape"}`);
   }
-  return expandEnv(obj);
+  return parsed.data;
 }
 function cacheFile(name39, version2) {
   return join55(getCacheDir(), `${name39}@${version2}.json`);
@@ -468249,11 +468307,28 @@ async function resolvePresets(specs, opts = {}) {
     failures
   };
 }
-var NETWORK_TIMEOUT_MS2 = 1e4, MAX_PRESET_BYTES;
+var NETWORK_TIMEOUT_MS2 = 1e4, MAX_PRESET_BYTES, PresetSchema;
 var init_loader3 = __esm(() => {
+  init_zod();
   init_platform();
   init_registry2();
   MAX_PRESET_BYTES = 512 * 1024;
+  PresetSchema = exports_external.object({
+    name: exports_external.string().regex(/^[a-z0-9][a-z0-9-]*$/, "name must be lowercase, start with [a-z0-9], hyphen-separated"),
+    version: exports_external.string().regex(/^\d+\.\d+\.\d+$/, "version must be semver (x.y.z)"),
+    description: exports_external.string().optional(),
+    author: exports_external.string().optional(),
+    homepage: exports_external.string().optional(),
+    tags: exports_external.array(exports_external.string()).optional(),
+    router: exports_external.record(exports_external.string(), exports_external.unknown()).optional(),
+    routerRules: exports_external.unknown().optional(),
+    providers: exports_external.unknown().optional(),
+    theme: exports_external.unknown().optional(),
+    themes: exports_external.record(exports_external.string(), exports_external.unknown()).optional(),
+    hooks: exports_external.record(exports_external.string(), exports_external.unknown()).optional(),
+    prompts: exports_external.record(exports_external.string(), exports_external.unknown()).optional(),
+    config: exports_external.record(exports_external.string(), exports_external.unknown()).optional()
+  }).passthrough();
 });
 
 // src/core/presets/merge.ts

package/dist/workers/intelligence.worker.js

@@ -29346,30 +29346,58 @@ function loadConfig() {
       mode: 448
     });
   }
-  if (!existsSync7(configFile)) {
-    writeFileSync3(configFile, JSON.stringify(DEFAULT_CONFIG, null, 2));
-    if (!_presetOverlay)
-      return DEFAULT_CONFIG;
-  }
   let userConfig = {};
-  try {
-    userConfig = JSON.parse(readFileSync4(configFile, "utf-8"));
-  } catch (err2) {
-    logBackgroundError("config", `Failed to parse ${configFile}: ${err2 instanceof Error ? err2.message : String(err2)} \u2014 using defaults`);
-    if (!_presetOverlay)
-      return DEFAULT_CONFIG;
+  let fileExists = existsSync7(configFile);
+  if (!fileExists) {
+    writeFileSync3(configFile, JSON.stringify(DEFAULT_CONFIG, null, 2));
+    fileExists = true;
+  } else {
+    try {
+      userConfig = JSON.parse(readFileSync4(configFile, "utf-8"));
+    } catch (err2) {
+      logBackgroundError("config", `Failed to parse ${configFile}: ${err2 instanceof Error ? err2.message : String(err2)} \u2014 using defaults`);
+      userConfig = {};
+    }
   }
   let merged = {
     ...DEFAULT_CONFIG
   };
   if (_presetOverlay)
     merged = applyConfigPatch(merged, _presetOverlay);
-  merged = {
-    ...merged,
-    ...userConfig
-  };
+  const userPatch = diffAgainstDefaults(userConfig);
+  if (Object.keys(userPatch).length > 0) {
+    merged = applyConfigPatch(merged, userPatch);
+  }
   return merged;
 }
+function diffAgainstDefaults(userConfig) {
+  const out2 = {};
+  const defaults = DEFAULT_CONFIG;
+  const nested = new Set(NESTED_KEYS);
+  for (const [key2, value] of Object.entries(userConfig)) {
+    if (value === undefined)
+      continue;
+    const def = defaults[key2];
+    if (nested.has(key2) && value && typeof value === "object" && !Array.isArray(value) && def && typeof def === "object" && !Array.isArray(def)) {
+      const subPatch = {};
+      const defRec = def;
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue === undefined)
+          continue;
+        if (JSON.stringify(subValue) !== JSON.stringify(defRec[subKey])) {
+          subPatch[subKey] = subValue;
+        }
+      }
+      if (Object.keys(subPatch).length > 0)
+        out2[key2] = subPatch;
+      continue;
+    }
+    if (JSON.stringify(value) !== JSON.stringify(def)) {
+      out2[key2] = value;
+    }
+  }
+  return out2;
+}
 function loadProjectConfig(cwd) {
   const projectFile = join9(cwd, ".soulforge", "config.json");
   if (!existsSync7(projectFile))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proxysoul/soulforge",
-  "version": "2.18.3",
+  "version": "2.18.4",
   "description": "Graph-powered code intelligence — multi-agent coding with codebase-aware AI",
   "repository": {
     "type": "git",

package/scripts/launcher.mjs

@@ -78,12 +78,43 @@ if (!existsSync(entry)) {
   process.exit(1);
 }
 
+// detached:true puts the child in its own process group (POSIX) / detaches
+// from the parent console (Windows). The child's cleanup path calls
+// `kill(-pid, SIGTERM)` to reap orphaned grandchildren — without a separate
+// group that signal would also terminate this launcher, causing zsh/bash to
+// print "terminated soulforge" and scroll past the child's exit banner.
 const child = spawn(bun, [entry, ...process.argv.slice(2)], {
   stdio: "inherit",
+  detached: !isWindows,
   windowsHide: false,
 });
+
+// Forward terminal signals to the child's group. On POSIX with detached:true
+// the TTY no longer broadcasts SIGINT to the child automatically, so we relay.
+// On Windows the console still routes Ctrl+C/Break to the child; these
+// handlers are harmless no-ops there (signal forwarding via process.kill on
+// Windows just terminates — child handles its own console events).
+const FORWARDED = ["SIGINT", "SIGTERM", "SIGHUP"];
+for (const sig of FORWARDED) {
+  process.on(sig, () => {
+    try {
+      if (isWindows) {
+        // Windows: signal the child directly; no process-group concept.
+        child.kill(sig);
+      } else {
+        // POSIX: signal the child's process group so its own children get it too.
+        process.kill(-child.pid, sig);
+      }
+    } catch {
+      // Child already gone — let our own exit logic run.
+    }
+  });
+}
+
 child.on("exit", (code, signal) => {
   if (signal) {
+    // Re-raise so the parent shell sees the correct exit status, but only
+    // for genuine signal terminations — clean exits with code 0 fall through.
     process.kill(process.pid, signal);
   } else {
     process.exit(code ?? 0);