@clawcipes/recipes 0.1.1 → 0.1.3

package/index.ts

@@ -200,8 +200,46 @@ function upsertAgentInConfig(cfgObj: any, snippet: AgentConfigSnippet) {
     tools: snippet.tools ? { ...snippet.tools } : prev?.tools,
   };
 
-  if (idx >= 0) list[idx] = nextAgent;
-  else list.push(nextAgent);
+  if (idx >= 0) {
+    list[idx] = nextAgent;
+    return;
+  }
+
+  // New agent: append to end of list.
+  // (We still separately enforce that main exists and stays first/default.)
+  list.push(nextAgent);
+}
+
+function ensureMainFirstInAgentsList(cfgObj: any, api: OpenClawPluginApi) {
+  if (!cfgObj.agents) cfgObj.agents = {};
+  if (!Array.isArray(cfgObj.agents.list)) cfgObj.agents.list = [];
+
+  const list: any[] = cfgObj.agents.list;
+
+  const workspaceRoot =
+    cfgObj.agents?.defaults?.workspace ??
+    api.config.agents?.defaults?.workspace ??
+    "~/.openclaw/workspace";
+
+  const idx = list.findIndex((a) => a?.id === "main");
+  const prevMain = idx >= 0 ? list[idx] : {};
+
+  // Enforce: main exists, is first, and is the default.
+  const main = {
+    ...prevMain,
+    id: "main",
+    default: true,
+    workspace: prevMain?.workspace ?? workspaceRoot,
+    sandbox: prevMain?.sandbox ?? { mode: "off" },
+  };
+
+  // Ensure only one default.
+  for (const a of list) {
+    if (a?.id !== "main" && a?.default) a.default = false;
+  }
+
+  if (idx >= 0) list.splice(idx, 1);
+  list.unshift(main);
 }
 
 async function applyAgentSnippetsToOpenClawConfig(api: OpenClawPluginApi, snippets: AgentConfigSnippet[]) {
@@ -211,22 +249,36 @@ async function applyAgentSnippetsToOpenClawConfig(api: OpenClawPluginApi, snippe
 
   // Some loaders return { cfg, ... }. If so, normalize.
   const cfgObj = (current.cfg ?? current) as any;
+
+  // Always keep main first/default when multi-agent workflows are in play.
+  ensureMainFirstInAgentsList(cfgObj, api);
+
   for (const s of snippets) upsertAgentInConfig(cfgObj, s);
 
+  // Re-assert ordering/default after upserts.
+  ensureMainFirstInAgentsList(cfgObj, api);
+
   await (api.runtime as any).config?.writeConfigFile?.(cfgObj);
   return { updatedAgents: snippets.map((s) => s.id) };
 }
 
-async function scaffoldAgentFromRecipe(api: OpenClawPluginApi, recipe: RecipeFrontmatter, opts: {
-  agentId: string;
-  agentName?: string;
-  update?: boolean;
-  vars?: Record<string, string>;
-}) {
-  const cfg = getCfg(api);
+async function scaffoldAgentFromRecipe(
+  api: OpenClawPluginApi,
+  recipe: RecipeFrontmatter,
+  opts: {
+    agentId: string;
+    agentName?: string;
+    update?: boolean;
+    vars?: Record<string, string>;
 
-  const agentDir = workspacePath(api, cfg.workspaceAgentsDir, opts.agentId);
-  await ensureDir(agentDir);
+    // Where to write the scaffolded files (may be a shared team workspace role folder)
+    filesRootDir: string;
+
+    // What to set in agents.list[].workspace (may be shared team workspace root)
+    workspaceRootDir: string;
+  },
+) {
+  await ensureDir(opts.filesRootDir);
 
   const templates = recipe.templates ?? {};
   const files = recipe.files ?? [];
@@ -237,7 +289,7 @@ async function scaffoldAgentFromRecipe(api: OpenClawPluginApi, recipe: RecipeFro
     const raw = templates[f.template];
     if (typeof raw !== "string") throw new Error(`Missing template: ${f.template}`);
     const rendered = renderTemplate(raw, vars);
-    const target = path.join(agentDir, f.path);
+    const target = path.join(opts.filesRootDir, f.path);
     const mode = opts.update ? (f.mode ?? "overwrite") : (f.mode ?? "createOnly");
     const r = await writeFileSafely(target, rendered, mode);
     fileResults.push({ path: target, wrote: r.wrote, reason: r.reason });
@@ -245,13 +297,14 @@ async function scaffoldAgentFromRecipe(api: OpenClawPluginApi, recipe: RecipeFro
 
   const configSnippet: AgentConfigSnippet = {
     id: opts.agentId,
-    workspace: agentDir,
+    workspace: opts.workspaceRootDir,
     identity: { name: opts.agentName ?? recipe.name ?? opts.agentId },
     tools: recipe.tools ?? {},
   };
 
   return {
-    agentDir,
+    filesRootDir: opts.filesRootDir,
+    workspaceRootDir: opts.workspaceRootDir,
     fileResults,
     next: {
       configSnippet,
@@ -269,6 +322,27 @@ const recipesPlugin = {
     properties: {},
   },
   register(api: OpenClawPluginApi) {
+    // On plugin load, ensure multi-agent config has an explicit agents.list with main at top.
+    // This is idempotent and only writes if a change is required.
+    (async () => {
+      try {
+        const current = (api.runtime as any).config?.loadConfig?.();
+        if (!current) return;
+        const cfgObj = (current.cfg ?? current) as any;
+
+        const before = JSON.stringify(cfgObj.agents?.list ?? null);
+        ensureMainFirstInAgentsList(cfgObj, api);
+        const after = JSON.stringify(cfgObj.agents?.list ?? null);
+
+        if (before !== after) {
+          await (api.runtime as any).config?.writeConfigFile?.(cfgObj);
+          console.error("[recipes] ensured agents.list includes main as first/default");
+        }
+      } catch (e) {
+        console.error(`[recipes] warning: failed to ensure main agent in agents.list: ${(e as Error).message}`);
+      }
+    })();
+
     api.registerCli(
       ({ program }) => {
         const cmd = program.command("recipes").description("Manage markdown recipes (scaffold agents/teams)");
@@ -443,7 +517,8 @@ const recipesPlugin = {
             if (!workspaceRoot) throw new Error("agents.defaults.workspace is not set in config");
 
             const teamId = String(options.teamId);
-            const teamDir = workspacePath(api, cfg.workspaceTeamsDir, teamId);
+            // Team workspace root (shared by all role agents): ~/.openclaw/workspace-<teamId>
+            const teamDir = path.resolve(workspaceRoot, "..", `workspace-${teamId}`);
 
             const inboxDir = path.join(teamDir, "inbox");
             const backlogDir = path.join(teamDir, "work", "backlog");
@@ -592,10 +667,16 @@ const recipesPlugin = {
               return;
             }
 
+            const baseWorkspace = api.config.agents?.defaults?.workspace ?? "~/.openclaw/workspace";
+            // Put standalone agent workspaces alongside the default workspace (same parent dir).
+            const resolvedWorkspaceRoot = path.resolve(baseWorkspace, "..", `workspace-${options.agentId}`);
+
             const result = await scaffoldAgentFromRecipe(api, recipe, {
               agentId: options.agentId,
               agentName: options.name,
               update: !!options.overwrite,
+              filesRootDir: resolvedWorkspaceRoot,
+              workspaceRootDir: resolvedWorkspaceRoot,
               vars: {
                 agentId: options.agentId,
                 agentName: options.name ?? recipe.name ?? options.agentId,
@@ -636,8 +717,15 @@ const recipesPlugin = {
               return;
             }
 
-            const teamDir = workspacePath(api, cfg.workspaceTeamsDir, teamId);
+            const baseWorkspace = api.config.agents?.defaults?.workspace;
+            if (!baseWorkspace) throw new Error("agents.defaults.workspace is not set in config");
+
+            // Team workspace root (shared by all role agents): ~/.openclaw/workspace-<teamId>
+            const teamDir = path.resolve(baseWorkspace, "..", `workspace-${teamId}`);
             await ensureDir(teamDir);
+
+            const rolesDir = path.join(teamDir, "roles");
+            await ensureDir(rolesDir);
             const notesDir = path.join(teamDir, "notes");
             const workDir = path.join(teamDir, "work");
             const backlogDir = path.join(workDir, "backlog");
@@ -695,16 +783,22 @@ const recipesPlugin = {
                 tools: a.tools ?? recipe.tools,
               };
 
+              const roleDir = path.join(rolesDir, role);
               const r = await scaffoldAgentFromRecipe(api, scopedRecipe, {
                 agentId,
                 agentName,
                 update: !!options.overwrite,
+                // Write role-specific files under roles/<role>/
+                filesRootDir: roleDir,
+                // But set the agent workspace root to the shared team workspace
+                workspaceRootDir: teamDir,
                 vars: {
                   teamId,
                   teamDir,
                   role,
                   agentId,
                   agentName,
+                  roleDir,
                 },
               });
               results.push({ role, agentId, ...r });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawcipes/recipes",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Clawcipes recipes plugin for OpenClaw (markdown recipes -> scaffold agents/teams)",
   "main": "index.ts",
   "type": "commonjs",