@d3ara1n/pi-scout 1.1.0 → 1.1.1

package/src/side-agent.ts

@@ -1,69 +1,67 @@
 /**
  * Side agent invocation logic.
  *
- * Calls the side agent model using pi-ai's complete() function
+ * Calls the side agent via model-roles' complete() (auth resolved internally)
  * and parses the JSON decision response.
  */
 
-import { complete } from "@earendil-works/pi-ai";
+import type { ModelRolesAPI } from "@d3ara1n/pi-model-roles";
 import type { ScoutDecision } from "./types.ts";
 
 /** Minimal type for side agent context — matches pi-ai's Context interface. */
 interface SideAgentContext {
-	systemPrompt?: string;
-	messages: Array<{ role: "user"; content: string; timestamp: number }>;
+  systemPrompt?: string;
+  messages: Array<{ role: "user"; content: string; timestamp: number }>;
 }
 
 /**
  * Call the side agent and return its decision.
  *
- * @param sideModel - The Model instance to use (from pi-model-roles "side" role)
- * @param apiKey - API key for the side model
- * @param headers - Custom headers for the side model
+ * @param rolesApi - ModelRolesAPI (provides complete() with auth resolved internally)
+ * @param roleName - Role name whose model + auth to use (from scout config)
  * @param systemPrompt - Scout system prompt (includes skills/roles for cache friendliness)
  * @param userMessage - Fully assembled user message (includes context, current role, user prompt)
  * @returns Parsed ScoutDecision, or a safe fallback on error
  */
 export async function callSideAgent(
-	sideModel: any,
-	apiKey: string | undefined,
-	headers: Record<string, string> | undefined,
-	systemPrompt: string,
-	userMessage: string,
+  rolesApi: ModelRolesAPI,
+  roleName: string,
+  systemPrompt: string,
+  userMessage: string,
 ): Promise<ScoutDecision> {
-	const fallback: ScoutDecision = { skills: [], role: null, reasoning: "side agent error", source: "side-agent" };
+  const fallback: ScoutDecision = {
+    skills: [],
+    role: null,
+    reasoning: "side agent error",
+    source: "side-agent",
+  };
 
-	const context: SideAgentContext = {
-		systemPrompt,
-		messages: [
-			{
-				role: "user",
-				content: userMessage,
-				timestamp: Date.now(),
-			},
-		],
-	};
+  const context: SideAgentContext = {
+    systemPrompt,
+    messages: [
+      {
+        role: "user",
+        content: userMessage,
+        timestamp: Date.now(),
+      },
+    ],
+  };
 
-	const options: Record<string, any> = {
-		maxTokens: 256,
-		cacheRetention: "short",
-	};
+  try {
+    const result = await rolesApi.complete(roleName, context, {
+      cacheRetention: "short",
+    });
+    const text =
+      result.content
+        ?.filter((block: any) => block.type === "text")
+        ?.map((block: any) => block.text)
+        ?.join("") ?? "";
 
-	if (apiKey) options.apiKey = apiKey;
-	if (headers) options.headers = headers;
-
-	try {
-		const result = await complete(sideModel, context, options);
-		const text = result.content
-			?.filter((block: any) => block.type === "text")
-			?.map((block: any) => block.text)
-			?.join("") ?? "";
-
-		return parseDecision(text);
-	} catch (err) {
-		console.warn("[pi-scout] Side agent call failed:", err);
-		return fallback;
-	}
+    return parseDecision(text);
+  } catch (err) {
+    console.warn("[pi-scout] Side agent call failed:", err);
+    return fallback;
+  }
 }
 
 /**
@@ -71,31 +69,32 @@ export async function callSideAgent(
  * Tolerant of markdown wrapping, extra whitespace, etc.
  */
 function parseDecision(raw: string): ScoutDecision {
-	const fallback: ScoutDecision = { skills: [], role: null, reasoning: "parse error", source: "side-agent" };
+  const fallback: ScoutDecision = {
+    skills: [],
+    role: null,
+    reasoning: "parse error",
+    source: "side-agent",
+  };
 
-	// Strip markdown code fences if present
-	let text = raw.trim();
-	if (text.startsWith("```")) {
-		text = text.replace(/^```(?:json)?\n?/, "").replace(/\n?```$/, "");
-	}
+  // Strip markdown code fences if present
+  let text = raw.trim();
+  if (text.startsWith("```")) {
+    text = text.replace(/^```(?:json)?\n?/, "").replace(/\n?```$/, "");
+  }
 
-	try {
-		const parsed = JSON.parse(text);
+  try {
+    const parsed = JSON.parse(text);
 
-		return {
-			skills: Array.isArray(parsed.skills)
-				? parsed.skills.filter((s: any) => typeof s === "string")
-				: [],
-			role: typeof parsed.role === "string" && parsed.role !== "null"
-				? parsed.role
-				: null,
-			reasoning: typeof parsed.reasoning === "string"
-				? parsed.reasoning
-				: "no reasoning provided",
-			source: "side-agent",
-		};
-	} catch {
-		console.warn("[pi-scout] Failed to parse side agent response:", raw.slice(0, 200));
-		return fallback;
-	}
+    return {
+      skills: Array.isArray(parsed.skills)
+        ? parsed.skills.filter((s: any) => typeof s === "string")
+        : [],
+      role: typeof parsed.role === "string" && parsed.role !== "null" ? parsed.role : null,
+      reasoning: typeof parsed.reasoning === "string" ? parsed.reasoning : "no reasoning provided",
+      source: "side-agent",
+    };
+  } catch {
+    console.warn("[pi-scout] Failed to parse side agent response:", raw.slice(0, 200));
+    return fallback;
+  }
 }

package/src/skill-inject.ts

@@ -10,14 +10,15 @@
  */
 
 /** Match pi's entire skills section: intro paragraph + XML block. */
-const SKILLS_SECTION_RE = /\n\nThe following skills provide specialized instructions[\s\S]*?<\/available_skills>/;
+const SKILLS_SECTION_RE =
+  /\n\nThe following skills provide specialized instructions[\s\S]*?<\/available_skills>/;
 
 /** Track skill names already shown to the LLM in this session. */
 let shownSkills: Set<string> = new Set();
 
 /** Reset the cache — called on session_start. */
 export function resetSkillCache(): void {
-	shownSkills = new Set();
+  shownSkills = new Set();
 }
 
 /**
@@ -33,51 +34,53 @@ export function resetSkillCache(): void {
  * @returns Modified system prompt
  */
 export function filterSkillsBlock(
-	systemPrompt: string,
-	selectedSkills: string[],
-	allSkills: Array<{ name: string; description: string; filePath: string }>,
+  systemPrompt: string,
+  selectedSkills: string[],
+  allSkills: Array<{ name: string; description: string; filePath: string }>,
 ): string {
-	if (selectedSkills.length === 0) {
-		return systemPrompt.replace(SKILLS_SECTION_RE, "");
-	}
+  if (selectedSkills.length === 0) {
+    return systemPrompt.replace(SKILLS_SECTION_RE, "");
+  }
 
-	const skillMap = new Map(allSkills.map((s) => [s.name, s]));
-	const entries: string[] = [];
-	const newlyShown: string[] = [];
+  const skillMap = new Map(allSkills.map((s) => [s.name, s]));
+  const entries: string[] = [];
+  const newlyShown: string[] = [];
 
-	for (const name of selectedSkills) {
-		const skill = skillMap.get(name);
-		if (!skill) continue;
+  for (const name of selectedSkills) {
+    const skill = skillMap.get(name);
+    if (!skill) continue;
 
-		if (shownSkills.has(name)) {
-			// Already introduced — compact form
-			entries.push(`  <skill name="${esc(skill.name)}" location="${esc(skill.filePath)}" />`);
-		} else {
-			// First time — include description
-			entries.push(`  <skill name="${esc(skill.name)}" location="${esc(skill.filePath)}">${esc(skill.description)}</skill>`);
-			newlyShown.push(name);
-		}
-	}
+    if (shownSkills.has(name)) {
+      // Already introduced — compact form
+      entries.push(`  <skill name="${esc(skill.name)}" location="${esc(skill.filePath)}" />`);
+    } else {
+      // First time — include description
+      entries.push(
+        `  <skill name="${esc(skill.name)}" location="${esc(skill.filePath)}">${esc(skill.description)}</skill>`,
+      );
+      newlyShown.push(name);
+    }
+  }
 
-	if (entries.length === 0) {
-		return systemPrompt.replace(SKILLS_SECTION_RE, "");
-	}
+  if (entries.length === 0) {
+    return systemPrompt.replace(SKILLS_SECTION_RE, "");
+  }
 
-	// Update cache
-	for (const name of newlyShown) {
-		shownSkills.add(name);
-	}
+  // Update cache
+  for (const name of newlyShown) {
+    shownSkills.add(name);
+  }
 
-	const compact = `\n\nActive skills (use \`read\` to load a skill's file):\n<available_skills>\n${entries.join("\n")}\n</available_skills>`;
+  const compact = `\n\nActive skills (use \`read\` to load a skill's file):\n<available_skills>\n${entries.join("\n")}\n</available_skills>`;
 
-	return systemPrompt.replace(SKILLS_SECTION_RE, compact);
+  return systemPrompt.replace(SKILLS_SECTION_RE, compact);
 }
 
 function esc(str: string): string {
-	return str
-		.replace(/&/g, "&amp;")
-		.replace(/</g, "&lt;")
-		.replace(/>/g, "&gt;")
-		.replace(/"/g, "&quot;")
-		.replace(/'/g, "&apos;");
+  return str
+    .replace(/&/g, "&amp;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&apos;");
 }