ofiere-openclaw-plugin 4.43.0 → 4.45.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ofiere-openclaw-plugin",
-  "version": "4.43.0",
+  "version": "4.45.0",
   "type": "module",
   "description": "OpenClaw plugin for Ofiere PM - 16 meta-tools covering tasks, agents, projects, scheduling, knowledge, workflows, notifications, memory, prompts, constellation, space file management, execution plan builder, SOP management, agent brain, talent management, and corporate frameworks",
   "keywords": ["openclaw", "ofiere", "project-management", "agents", "plugin"],

package/src/attachments.ts

@@ -15,7 +15,7 @@ import {
   invalidateAgentTier,
 } from "./agent-tier.js";
 import { issueAttachmentToken, verifyAttachmentToken } from "./attach-token.js";
-import { loadSubagentRow, buildStaffPersonaBlock, readDispatchSubagentId, type SubagentRow } from "./staffPersona.js";
+import { loadSubagentRow, buildStaffPersonaBlock, readDispatchSubagentId, loadChiefStaffDefaults, resolveStaffModels, type SubagentRow } from "./staffPersona.js";
 
 interface ToolResult {
   content: Array<{ type: "text"; text: string }>;
@@ -433,9 +433,11 @@ export function registerAttachmentContextHook(args: {
         if (subagentId) {
           staffRow = await loadSubagentRow(supabase, userId, subagentId);
           if (staffRow && staffRow.chief_agent_id === resolvedAgentId) {
-            staffPrefix = buildStaffPersonaBlock(staffRow) + "\n\n---\n\n";
+            const chiefDefaults = await loadChiefStaffDefaults(supabase, userId, staffRow.chief_agent_id).catch(() => null);
+            const resolved = resolveStaffModels(staffRow, chiefDefaults);
+            staffPrefix = buildStaffPersonaBlock(staffRow, resolved) + "\n\n---\n\n";
             api.logger?.debug?.(
-              `[ofiere-staff] subagent ${subagentId} (${staffRow.name}) reporting to ${resolvedAgentId} — persona injected`,
+              `[ofiere-staff] subagent ${subagentId} (${staffRow.name}) reporting to ${resolvedAgentId} — persona injected; resolved models: ${JSON.stringify(resolved)}`,
             );
           } else if (staffRow) {
             api.logger?.warn?.(

package/src/staffPersona.ts

@@ -16,6 +16,8 @@ export interface SubagentRow {
   function_call_model: string | null;
   vision_model: string | null;
   mcp_server_ids: string[] | null;
+  attached_sop_ids: string[] | null;
+  attached_framework_ids: string[] | null;
 }
 
 export async function loadSubagentRow(
@@ -26,7 +28,7 @@ export async function loadSubagentRow(
   const { data, error } = await supabase
     .from("agent_subagents")
     .select(
-      "id, chief_agent_id, name, role, codename, system_prompt, mission, responsibilities, instructions, primary_model, coding_model, tool_call_model, function_call_model, vision_model, mcp_server_ids",
+      "id, chief_agent_id, name, role, codename, system_prompt, mission, responsibilities, instructions, primary_model, coding_model, tool_call_model, function_call_model, vision_model, mcp_server_ids, attached_sop_ids, attached_framework_ids",
     )
     .eq("user_id", userId)
     .eq("id", subagentId)
@@ -57,7 +59,105 @@ export function readDispatchSubagentId(ctx: any, event?: any): string | null {
   return null;
 }
 
-export function buildStaffPersonaBlock(staff: SubagentRow): string {
+export type StaffModelSlot =
+  | "primary_model"
+  | "coding_model"
+  | "tool_call_model"
+  | "function_call_model"
+  | "vision_model";
+
+export interface ChiefStaffDefaultsRow {
+  chief_agent_id: string;
+  primary_model: string | null;
+  coding_model: string | null;
+  tool_call_model: string | null;
+  function_call_model: string | null;
+  vision_model: string | null;
+}
+
+export interface ResolvedStaffModels {
+  primary_model: string | null;
+  coding_model: string | null;
+  tool_call_model: string | null;
+  function_call_model: string | null;
+  vision_model: string | null;
+  source: Record<StaffModelSlot, "staff" | "chief_default" | "chief_fallback" | null>;
+}
+
+const SLOTS: StaffModelSlot[] = [
+  "primary_model",
+  "coding_model",
+  "tool_call_model",
+  "function_call_model",
+  "vision_model",
+];
+
+export async function loadChiefStaffDefaults(
+  supabase: SupabaseClient,
+  userId: string,
+  chiefAgentId: string,
+): Promise<ChiefStaffDefaultsRow | null> {
+  const { data, error } = await supabase
+    .from("chief_staff_defaults")
+    .select(
+      "chief_agent_id, primary_model, coding_model, tool_call_model, function_call_model, vision_model",
+    )
+    .eq("user_id", userId)
+    .eq("chief_agent_id", chiefAgentId)
+    .maybeSingle();
+  if (error || !data) return null;
+  return data as ChiefStaffDefaultsRow;
+}
+
+/**
+ * Resolution chain at delegate_to_staff time:
+ *   staff.<slot>          (per-staff override on agent_subagents)
+ *   ?? chief_staff_defaults.<slot>     (chief-level "STAFF MODEL")
+ *   ?? null   (caller falls back to the chief's own model — that lookup
+ *              happens in the OpenClaw runtime, not here).
+ *
+ * The chief's own model is intentionally not touched. Empty staff slot +
+ * empty chief STAFF MODEL = inherit chief's primary_model (gateway default).
+ */
+export function resolveStaffModels(
+  staff: SubagentRow,
+  chiefDefaults: ChiefStaffDefaultsRow | null,
+): ResolvedStaffModels {
+  const out: ResolvedStaffModels = {
+    primary_model: null,
+    coding_model: null,
+    tool_call_model: null,
+    function_call_model: null,
+    vision_model: null,
+    source: {
+      primary_model: null,
+      coding_model: null,
+      tool_call_model: null,
+      function_call_model: null,
+      vision_model: null,
+    },
+  };
+  for (const slot of SLOTS) {
+    const staffVal = (staff as any)[slot] as string | null | undefined;
+    const chiefVal = chiefDefaults ? (chiefDefaults as any)[slot] as string | null | undefined : null;
+    if (staffVal && staffVal.trim()) {
+      out[slot] = staffVal;
+      out.source[slot] = "staff";
+    } else if (chiefVal && chiefVal.trim()) {
+      out[slot] = chiefVal;
+      out.source[slot] = "chief_default";
+    } else {
+      out[slot] = null;
+      out.source[slot] = "chief_fallback";
+    }
+  }
+  return out;
+}
+
+export function buildStaffPersonaBlock(
+  staff: SubagentRow,
+  resolved?: ResolvedStaffModels,
+): string {
   const lines: string[] = [];
   lines.push(`# STAFF IDENTITY`);
   lines.push(
@@ -78,5 +178,18 @@ export function buildStaffPersonaBlock(staff: SubagentRow): string {
   if (staff.instructions?.trim()) {
     lines.push(``, `## Operating Instructions`, staff.instructions.trim());
   }
+  if (resolved && (resolved.primary_model || resolved.coding_model || resolved.tool_call_model || resolved.function_call_model || resolved.vision_model)) {
+    const sourceLabel = (s: "staff" | "chief_default" | "chief_fallback" | null) =>
+      s === "staff" ? "per-staff override" : s === "chief_default" ? "chief STAFF MODEL" : "inherits chief";
+    const rows: string[] = [];
+    if (resolved.primary_model) rows.push(`- primary: \`${resolved.primary_model}\` (${sourceLabel(resolved.source.primary_model)})`);
+    if (resolved.coding_model) rows.push(`- coding: \`${resolved.coding_model}\` (${sourceLabel(resolved.source.coding_model)})`);
+    if (resolved.tool_call_model) rows.push(`- tool_call: \`${resolved.tool_call_model}\` (${sourceLabel(resolved.source.tool_call_model)})`);
+    if (resolved.function_call_model) rows.push(`- function_call: \`${resolved.function_call_model}\` (${sourceLabel(resolved.source.function_call_model)})`);
+    if (resolved.vision_model) rows.push(`- vision: \`${resolved.vision_model}\` (${sourceLabel(resolved.source.vision_model)})`);
+    if (rows.length) {
+      lines.push(``, `## Configured Models`, ...rows);
+    }
+  }
   return lines.join("\n");
 }