ofiere-openclaw-plugin 4.47.0 → 4.48.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ofiere-openclaw-plugin",
-  "version": "4.47.0",
+  "version": "4.48.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, loadChiefStaffDefaults, loadDispatchContextBySession, resolveStaffModels, type SubagentRow, type DispatchContextRow } from "./staffPersona.js";
+import { loadSubagentRow, buildStaffPersonaBlock, readDispatchSubagentId, loadChiefStaffDefaults, loadChiefAgentConfig, loadDispatchContextBySession, resolveStaffModels, type SubagentRow, type DispatchContextRow } from "./staffPersona.js";
 
 interface ToolResult {
   content: Array<{ type: "text"; text: string }>;
@@ -453,8 +453,11 @@ export function registerAttachmentContextHook(args: {
         if (subagentId) {
           staffRow = await loadSubagentRow(supabase, userId, subagentId);
           if (staffRow && staffRow.chief_agent_id === resolvedAgentId) {
-            const chiefDefaults = await loadChiefStaffDefaults(supabase, userId, staffRow.chief_agent_id).catch(() => null);
-            const resolved = resolveStaffModels(staffRow, chiefDefaults);
+            const [chiefDefaults, chiefConfig] = await Promise.all([
+              loadChiefStaffDefaults(supabase, userId, staffRow.chief_agent_id).catch(() => null),
+              loadChiefAgentConfig(supabase, userId, staffRow.chief_agent_id).catch(() => null),
+            ]);
+            const resolved = resolveStaffModels(staffRow, chiefDefaults, chiefConfig);
             staffPrefix = buildStaffPersonaBlock(staffRow, resolved) + "\n\n---\n\n";
             api.logger?.debug?.(
               `[ofiere-staff] subagent ${subagentId} (${staffRow.name}) reporting to ${resolvedAgentId} — persona injected; resolved models: ${JSON.stringify(resolved)}`,

package/src/staffPersona.ts

@@ -127,7 +127,7 @@ export interface ResolvedStaffModels {
   tool_call_model: string | null;
   function_call_model: string | null;
   vision_model: string | null;
-  source: Record<StaffModelSlot, "staff" | "chief_default" | "chief_fallback" | null>;
+  source: Record<StaffModelSlot, "staff" | "chief_default" | "chief_primary" | "chief_fallback" | null>;
 }
 
 const SLOTS: StaffModelSlot[] = [
@@ -138,6 +138,17 @@ const SLOTS: StaffModelSlot[] = [
   "vision_model",
 ];
 
+// Cycle 7b BUGSHOOT-3 — chief's own ofie_agent_config row, used as the third
+// fallback tier when neither the staff slot nor the chief STAFF MODEL slot is
+// set. Mirrors the dispatcher's loadStaffPrimaryModel chain.
+export interface ChiefAgentConfigRow {
+  agent_id: string;
+  primary_model: string | null;
+  coding_model: string | null;
+  tool_call_model: string | null;
+  vision_model: string | null;
+}
+
 export async function loadChiefStaffDefaults(
   supabase: SupabaseClient,
   userId: string,
@@ -155,19 +166,42 @@ export async function loadChiefStaffDefaults(
   return data as ChiefStaffDefaultsRow;
 }
 
+export async function loadChiefAgentConfig(
+  supabase: SupabaseClient,
+  userId: string,
+  chiefAgentId: string,
+): Promise<ChiefAgentConfigRow | null> {
+  const { data, error } = await supabase
+    .from("ofie_agent_config")
+    .select("agent_id, primary_model, coding_model, tool_call_model, vision_model")
+    .eq("user_id", userId)
+    .eq("agent_id", chiefAgentId)
+    .maybeSingle();
+  if (error || !data) return null;
+  return data as ChiefAgentConfigRow;
+}
+
 /**
- * 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).
+ * Resolution chain at delegate_to_staff time (BUGSHOOT-3):
+ *   1. staff.<slot>                       (per-staff override)
+ *   2. chief_staff_defaults.<slot>        (chief-level STAFF MODEL)
+ *   3. ofie_agent_config.<slot>           (chief's OWN slot, NEW)
+ *   4. ofie_agent_config.primary_model    (chief's primary, last-resort sub)
+ *   5. null                               (gateway picks gateway default)
+ *
+ * Tier 3 was added in BUGSHOOT-3 because the prior chain stopped at tier 2 and
+ * relied on an implicit "gateway default" — which is opaque and led to BUG 10
+ * when the staff override held a model id the gateway rejected. With tier 3,
+ * an empty staff slot deterministically inherits the chief's actual model.
  *
- * The chief's own model is intentionally not touched. Empty staff slot +
- * empty chief STAFF MODEL = inherit chief's primary_model (gateway default).
+ * Tier 4 (slot → primary_model fallback) handles the common case where chief
+ * has only a primary_model set and no per-slot routing — a staff with
+ * coding_model blank still inherits chief's primary_model rather than null.
  */
 export function resolveStaffModels(
   staff: SubagentRow,
   chiefDefaults: ChiefStaffDefaultsRow | null,
+  chiefConfig?: ChiefAgentConfigRow | null,
 ): ResolvedStaffModels {
   const out: ResolvedStaffModels = {
     primary_model: null,
@@ -183,15 +217,26 @@ export function resolveStaffModels(
       vision_model: null,
     },
   };
+  const chiefPrimary = typeof chiefConfig?.primary_model === "string" && chiefConfig.primary_model.trim()
+    ? chiefConfig.primary_model.trim()
+    : 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;
+    const chiefSlotVal = chiefConfig ? (chiefConfig 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 if (chiefSlotVal && chiefSlotVal.trim()) {
+      out[slot] = chiefSlotVal;
+      out.source[slot] = "chief_primary";
+    } else if (chiefPrimary) {
+      // Sub-fallback: chief has a primary_model but no per-slot override.
+      out[slot] = chiefPrimary;
+      out.source[slot] = "chief_primary";
     } else {
       out[slot] = null;
       out.source[slot] = "chief_fallback";
@@ -225,8 +270,11 @@ export function buildStaffPersonaBlock(
     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 sourceLabel = (s: "staff" | "chief_default" | "chief_primary" | "chief_fallback" | null) =>
+      s === "staff" ? "per-staff override"
+      : s === "chief_default" ? "chief STAFF MODEL"
+      : s === "chief_primary" ? "chief's own model"
+      : "inherits chief (gateway default)";
     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)})`);