@d3ara1n/pi-scout 1.1.0 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d3ara1n/pi-scout",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "type": "module",
   "description": "Per-turn side agent decision framework for pi — uses a cheap model to select skills and route models before each conversation turn",
   "main": "src/index.ts",

package/src/config.ts

@@ -12,64 +12,52 @@ import type { ScoutConfig } from "./types.ts";
 import { DEFAULT_CONFIG } from "./types.ts";
 
 function getAgentDir(): string {
-	const envDir = process.env.PI_AGENT_DIR;
-	if (envDir) return envDir;
-	return path.join(os.homedir(), ".pi", "agent");
+  const envDir = process.env.PI_AGENT_DIR;
+  if (envDir) return envDir;
+  return path.join(os.homedir(), ".pi", "agent");
 }
 
 function readSettingsFile(filePath: string): any {
-	try {
-		if (!fs.existsSync(filePath)) return {};
-		const content = fs.readFileSync(filePath, "utf-8");
-		return JSON.parse(content);
-	} catch {
-		return {};
-	}
+  try {
+    const content = fs.readFileSync(filePath, "utf-8");
+    return JSON.parse(content);
+  } catch {
+    return {};
+  }
 }
 
-function merge(target: any, source: any): any {
-	if (!source || typeof source !== "object") return target;
-	if (!target || typeof target !== "object") return source;
-	const result = { ...target };
-	for (const key of Object.keys(source)) {
-		if (source[key] && typeof source[key] === "object" && !Array.isArray(source[key])) {
-			result[key] = merge(result[key], source[key]);
-		} else {
-			result[key] = source[key];
-		}
-	}
-	return result;
+/** Read the `scout` block from a settings file. */
+function readScout(filePath: string): Record<string, any> | undefined {
+  const raw = readSettingsFile(filePath)?.scout;
+  return raw && typeof raw === "object" ? raw : undefined;
 }
 
 /**
- * Load scout config from merged settings.
+ * Load scout config. Project overrides global wholesale; per-field `??
+ * DEFAULT` fills any gap. (No field-level merge — project replaces global.)
  * @param cwd - Project working directory
  */
 export function loadScoutConfig(cwd?: string): ScoutConfig {
-	const globalSettings = readSettingsFile(path.join(getAgentDir(), "settings.json"));
-	const projectSettings = cwd
-		? readSettingsFile(path.join(cwd, ".pi", "settings.json"))
-		: {};
-	const settings = merge(globalSettings, projectSettings);
+  const globalRaw = readScout(path.join(getAgentDir(), "settings.json"));
+  const projectRaw = cwd ? readScout(path.join(cwd, ".pi", "settings.json")) : undefined;
+  const raw = projectRaw ?? globalRaw;
+  if (!raw) return DEFAULT_CONFIG;
 
-	const raw = settings?.scout;
-	if (!raw) return DEFAULT_CONFIG;
-
-	return {
-		enabled: raw.enabled ?? DEFAULT_CONFIG.enabled,
-		sideAgentRole: raw.sideAgentRole ?? DEFAULT_CONFIG.sideAgentRole,
-		maxSelectedSkills: raw.maxSelectedSkills ?? DEFAULT_CONFIG.maxSelectedSkills,
-		modules: {
-			skillRouter: raw.modules?.skillRouter ?? DEFAULT_CONFIG.modules.skillRouter,
-			modelRouter: raw.modules?.modelRouter ?? DEFAULT_CONFIG.modules.modelRouter,
-			shortCircuit: raw.modules?.shortCircuit ?? DEFAULT_CONFIG.modules.shortCircuit,
-		},
-		shortCircuit: {
-			trivialAck: raw.shortCircuit?.trivialAck ?? DEFAULT_CONFIG.shortCircuit.trivialAck,
-			maxAckLength: raw.shortCircuit?.maxAckLength ?? DEFAULT_CONFIG.shortCircuit.maxAckLength,
-			ackPhrases: Array.isArray(raw.shortCircuit?.ackPhrases)
-				? raw.shortCircuit.ackPhrases.filter((p: any) => typeof p === "string")
-				: DEFAULT_CONFIG.shortCircuit.ackPhrases,
-		},
-	};
+  return {
+    enabled: raw.enabled ?? DEFAULT_CONFIG.enabled,
+    sideAgentRole: raw.sideAgentRole ?? DEFAULT_CONFIG.sideAgentRole,
+    maxSelectedSkills: raw.maxSelectedSkills ?? DEFAULT_CONFIG.maxSelectedSkills,
+    modules: {
+      skillRouter: raw.modules?.skillRouter ?? DEFAULT_CONFIG.modules.skillRouter,
+      modelRouter: raw.modules?.modelRouter ?? DEFAULT_CONFIG.modules.modelRouter,
+      shortCircuit: raw.modules?.shortCircuit ?? DEFAULT_CONFIG.modules.shortCircuit,
+    },
+    shortCircuit: {
+      trivialAck: raw.shortCircuit?.trivialAck ?? DEFAULT_CONFIG.shortCircuit.trivialAck,
+      maxAckLength: raw.shortCircuit?.maxAckLength ?? DEFAULT_CONFIG.shortCircuit.maxAckLength,
+      ackPhrases: Array.isArray(raw.shortCircuit?.ackPhrases)
+        ? raw.shortCircuit.ackPhrases.filter((p: any) => typeof p === "string")
+        : DEFAULT_CONFIG.shortCircuit.ackPhrases,
+    },
+  };
 }