@clawcipes/recipes 0.2.7 → 0.2.8

package/index.ts

@@ -2,21 +2,9 @@ import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
 import path from "node:path";
 import fs from "node:fs/promises";
 import crypto from "node:crypto";
-import os from "node:os";
 import JSON5 from "json5";
 import YAML from "yaml";
-
-import { renderTeamMd, renderTicketsMd } from "./src/lib/scaffold-templates";
-import { upsertBindingInConfig as upsertBindingInConfigCore } from "./src/lib/bindings";
-import { handoffTicket as handoffTicketCore } from "./src/lib/ticket-workflow";
-import { ensureLaneDir, RecipesCliError } from "./src/lib/lanes";
-import { findTicketFile as findTicketFileAnyLane, parseOwnerFromMd } from "./src/lib/ticket-finder";
-import {
-  DEFAULT_ALLOWED_PREFIXES,
-  DEFAULT_PROTECTED_TEAM_IDS,
-  executeWorkspaceCleanup,
-  planWorkspaceCleanup,
-} from "./src/lib/cleanup-workspaces";
+import { buildRemoveTeamPlan, executeRemoveTeamPlan, loadCronStore, saveCronStore } from "./src/lib/remove-team";
 
 type RecipesConfig = {
   workspaceRecipesDir?: string;
@@ -201,32 +189,23 @@ async function ensureDir(p: string) {
   await fs.mkdir(p, { recursive: true });
 }
 
-function formatRecipesCliError(commandLabel: string, err: unknown) {
-  if (err instanceof RecipesCliError) {
-    const lines = [
-      `[recipes] ERROR: ${err.message}`,
-      `- command: ${err.command ?? commandLabel}`,
-      ...(err.missingPath ? [`- path: ${err.missingPath}`] : []),
-      ...(err.suggestedFix ? [`- suggested fix: ${err.suggestedFix}`] : []),
-    ];
-    return lines.join("\n");
-  }
-
-  if (err instanceof Error) {
-    return `[recipes] ERROR: ${err.message}\n- command: ${commandLabel}`;
-  }
-
-  return `[recipes] ERROR: ${String(err)}\n- command: ${commandLabel}`;
+function ticketStageDir(teamDir: string, stage: "backlog" | "in-progress" | "testing" | "done" | "assignments") {
+  return stage === "assignments"
+    ? path.join(teamDir, "work", "assignments")
+    : path.join(teamDir, "work", stage);
 }
 
-async function runRecipesCommand<T>(commandLabel: string, fn: () => Promise<T>): Promise<T | null> {
-  try {
-    return await fn();
-  } catch (err) {
-    console.error(formatRecipesCliError(commandLabel, err));
-    process.exitCode = process.exitCode && process.exitCode !== 0 ? process.exitCode : 1;
-    return null;
-  }
+async function ensureTicketStageDirs(teamDir: string) {
+  // Idempotent. Used to harden ticket commands for older team workspaces.
+  // NOTE: creating these directories is safe even if empty.
+  await Promise.all([
+    ensureDir(path.join(teamDir, "work")),
+    ensureDir(ticketStageDir(teamDir, "backlog")),
+    ensureDir(ticketStageDir(teamDir, "in-progress")),
+    ensureDir(ticketStageDir(teamDir, "testing")),
+    ensureDir(ticketStageDir(teamDir, "done")),
+    ensureDir(ticketStageDir(teamDir, "assignments")),
+  ]);
 }
 
 type CronInstallMode = "off" | "prompt" | "on";
@@ -286,73 +265,17 @@ type OpenClawCronJob = {
   description?: string;
 };
 
-type CronStoreV1 = {
-  version: 1;
-  jobs: any[];
-};
-
-function cronStorePath() {
-  // Gateway cron store (default): ~/.openclaw/cron/jobs.json
-  return path.join(os.homedir(), ".openclaw", "cron", "jobs.json");
-}
-
-async function loadCronStore(): Promise<CronStoreV1> {
-  try {
-    const raw = await fs.readFile(cronStorePath(), "utf8");
-    const parsed = JSON.parse(raw) as CronStoreV1;
-    if (parsed && parsed.version === 1 && Array.isArray(parsed.jobs)) return parsed;
-  } catch {
-    // ignore
+function spawnOpenClawJson(args: string[]) {
+  const { spawnSync } = require("node:child_process") as typeof import("node:child_process");
+  const res = spawnSync("openclaw", args, { encoding: "utf8" });
+  if (res.status !== 0) {
+    const err = new Error(`openclaw ${args.join(" ")} failed (exit=${res.status})`);
+    (err as any).stdout = res.stdout;
+    (err as any).stderr = res.stderr;
+    throw err;
   }
-  return { version: 1, jobs: [] };
-}
-
-async function saveCronStore(store: CronStoreV1) {
-  const p = cronStorePath();
-  await ensureDir(path.dirname(p));
-  await fs.writeFile(p, JSON.stringify(store, null, 2) + "\n", "utf8");
-}
-
-function buildCronJobPayloadAgentTurn(message: string) {
-  return {
-    kind: "agentTurn",
-    message,
-    timeoutSeconds: 60,
-  };
-}
-
-function buildCronJobFromSpec(opts: {
-  name: string;
-  description?: string;
-  scheduleExpr: string;
-  tz?: string;
-  message: string;
-  enabled: boolean;
-  agentId: string;
-  delivery?: { channel?: string; to?: string };
-}) {
-  const now = Date.now();
-  const delivery =
-    opts.delivery?.channel && opts.delivery?.to
-      ? { mode: "announce", channel: opts.delivery.channel, to: opts.delivery.to, bestEffort: true }
-      : { mode: "announce" };
-
-  return {
-    id: crypto.randomUUID(),
-    agentId: opts.agentId || "main",
-    name: opts.name,
-    description: opts.description,
-    enabled: opts.enabled,
-    deleteAfterRun: false,
-    createdAtMs: now,
-    updatedAtMs: now,
-    schedule: { kind: "cron", expr: opts.scheduleExpr, tz: opts.tz },
-    sessionTarget: "isolated",
-    wakeMode: "next-heartbeat",
-    payload: buildCronJobPayloadAgentTurn(opts.message),
-    delivery,
-    state: {},
-  };
+  const out = String(res.stdout ?? "").trim();
+  return out ? (JSON.parse(out) as any) : null;
 }
 
 function normalizeCronJobs(frontmatter: RecipeFrontmatter): CronJobSpec[] {
@@ -421,25 +344,15 @@ async function reconcileRecipeCronJobs(opts: {
     const header = `Recipe ${opts.scope.recipeId} defines ${desired.length} cron job(s).\nThese run automatically on a schedule. Install them?`;
     userOptIn = await promptYesNo(header);
     if (!userOptIn && !process.stdin.isTTY) {
-      console.error("Non-interactive mode: skipping cron installation (no consent). Use cronInstallation=on to force install.");
+      console.error("Non-interactive mode: defaulting cron install to disabled.");
     }
   }
 
-  // Never install cron jobs without explicit consent (unless cronInstallation=on).
-  if (!userOptIn) {
-    return {
-      ok: true,
-      changed: false,
-      note: "cron-installation-declined" as const,
-      desiredCount: desired.length,
-    };
-  }
-
   const statePath = path.join(opts.scope.stateDir, "notes", "cron-jobs.json");
   const state = await loadCronMappingState(statePath);
 
-  const store = await loadCronStore();
-  const byId = new Map((store.jobs ?? []).map((j: any) => [j.id, j] as const));
+  const list = spawnOpenClawJson(["cron", "list", "--json"]) as { jobs: OpenClawCronJob[] };
+  const byId = new Map((list?.jobs ?? []).map((j) => [j.id, j] as const));
 
   const now = Date.now();
   const desiredIds = new Set(desired.map((j) => j.id));
@@ -456,9 +369,7 @@ async function reconcileRecipeCronJobs(opts: {
       timezone: j.timezone ?? "",
       channel: j.channel ?? "last",
       to: j.to ?? "",
-      agentId:
-        j.agentId ??
-        (opts.scope.kind === "team" ? `${(opts.scope as any).teamId}-lead` : ""),
+      agentId: j.agentId ?? "",
       name,
       description: j.description ?? "",
     };
@@ -471,43 +382,65 @@ async function reconcileRecipeCronJobs(opts: {
     const wantEnabled = userOptIn ? Boolean(j.enabledByDefault) : false;
 
     if (!existing) {
-      // Create new job in cron store.
-      const newJob = buildCronJobFromSpec({
+      // Create new job.
+      const args = [
+        "cron",
+        "add",
+        "--json",
+        "--name",
         name,
-        description: j.description,
-        scheduleExpr: j.schedule,
-        tz: j.timezone,
-        message: j.message,
-        enabled: wantEnabled,
-        agentId: desiredSpec.agentId || "main",
-        delivery: j.channel && j.to ? { channel: j.channel, to: j.to } : undefined,
-      });
-
-      store.jobs.push(newJob);
-      state.entries[key] = { installedCronId: newJob.id, specHash, updatedAtMs: now, orphaned: false };
-      results.push({ action: "created", key, installedCronId: newJob.id, enabled: wantEnabled });
+        "--cron",
+        j.schedule,
+        "--message",
+        j.message,
+        "--announce",
+      ];
+      if (!wantEnabled) args.push("--disabled");
+      if (j.description) args.push("--description", j.description);
+      if (j.timezone) args.push("--tz", j.timezone);
+      if (j.channel) args.push("--channel", j.channel);
+      if (j.to) args.push("--to", j.to);
+      if (j.agentId) args.push("--agent", j.agentId);
+
+      const created = spawnOpenClawJson(args) as any;
+      const newId = created?.id ?? created?.job?.id;
+      if (!newId) throw new Error("Failed to parse cron add output (missing id)");
+
+      state.entries[key] = { installedCronId: newId, specHash, updatedAtMs: now, orphaned: false };
+      results.push({ action: "created", key, installedCronId: newId, enabled: wantEnabled });
       continue;
     }
 
     // Update existing job if spec changed.
     if (prev?.specHash !== specHash) {
-      existing.name = name;
-      existing.description = j.description ?? existing.description;
-      existing.schedule = { kind: "cron", expr: j.schedule, tz: j.timezone };
-      existing.payload = buildCronJobPayloadAgentTurn(j.message);
-      existing.agentId = desiredSpec.agentId || existing.agentId || "main";
-      if (j.channel && j.to) existing.delivery = { mode: "announce", channel: j.channel, to: j.to, bestEffort: true };
-      existing.updatedAtMs = now;
+      const editArgs = [
+        "cron",
+        "edit",
+        existing.id,
+        "--name",
+        name,
+        "--cron",
+        j.schedule,
+        "--message",
+        j.message,
+        "--announce",
+      ];
+      if (j.description) editArgs.push("--description", j.description);
+      if (j.timezone) editArgs.push("--tz", j.timezone);
+      if (j.channel) editArgs.push("--channel", j.channel);
+      if (j.to) editArgs.push("--to", j.to);
+      if (j.agentId) editArgs.push("--agent", j.agentId);
+
+      spawnOpenClawJson(editArgs);
       results.push({ action: "updated", key, installedCronId: existing.id });
     } else {
       results.push({ action: "unchanged", key, installedCronId: existing.id });
     }
 
-    // Enabled precedence: if user did not opt in, force disabled.
+    // Enabled precedence: if user did not opt in, force disabled. Otherwise preserve current enabled state.
     if (!userOptIn) {
       if (existing.enabled) {
-        existing.enabled = false;
-        existing.updatedAtMs = now;
+        spawnOpenClawJson(["cron", "edit", existing.id, "--disable"]);
         results.push({ action: "disabled", key, installedCronId: existing.id });
       }
     }
@@ -523,8 +456,7 @@ async function reconcileRecipeCronJobs(opts: {
 
     const job = byId.get(entry.installedCronId);
     if (job && job.enabled) {
-      job.enabled = false;
-      job.updatedAtMs = now;
+      spawnOpenClawJson(["cron", "edit", job.id, "--disable"]);
       results.push({ action: "disabled-removed", key, installedCronId: job.id });
     }
 
@@ -532,7 +464,6 @@ async function reconcileRecipeCronJobs(opts: {
   }
 
   await writeJsonFile(statePath, state);
-  await saveCronStore(store);
 
   const changed = results.some((r) => r.action === "created" || r.action === "updated" || r.action?.startsWith("disabled"));
   return { ok: true, changed, results };
@@ -654,7 +585,24 @@ function stableStringify(x: any) {
 }
 
 function upsertBindingInConfig(cfgObj: any, binding: BindingSnippet) {
-  return upsertBindingInConfigCore(cfgObj, binding);
+  if (!Array.isArray(cfgObj.bindings)) cfgObj.bindings = [];
+  const list: any[] = cfgObj.bindings;
+
+  const sig = stableStringify({ agentId: binding.agentId, match: binding.match });
+  const idx = list.findIndex((b) => stableStringify({ agentId: b?.agentId, match: b?.match }) === sig);
+
+  if (idx >= 0) {
+    // Update in place (preserve ordering)
+    list[idx] = { ...list[idx], ...binding };
+    return { changed: false, note: "already-present" as const };
+  }
+
+  // Most-specific-first: if a peer match is specified, insert at front so it wins.
+  // Otherwise append.
+  if (binding.match?.peer) list.unshift(binding);
+  else list.push(binding);
+
+  return { changed: true, note: "added" as const };
 }
 
 function removeBindingsInConfig(cfgObj: any, opts: { agentId?: string; match: BindingMatch }) {
@@ -1073,11 +1021,11 @@ const recipesPlugin = {
           });
 
         cmd
-          .command("install")
+          .command("install-skill")
           .description(
             "Install a skill from ClawHub (confirmation-gated). Default: global (~/.openclaw/skills). Use --agent-id or --team-id for scoped installs.",
           )
-          .argument("<idOrSlug>", "Recipe id OR ClawHub skill slug")
+          .argument("<skill>", "ClawHub skill slug (e.g. github)")
           .option("--yes", "Skip confirmation prompt")
           .option("--global", "Install into global shared skills (~/.openclaw/skills) (default when no scope flags)")
           .option("--agent-id <agentId>", "Install into a specific agent workspace (workspace-<agentId>)")
@@ -1186,22 +1134,28 @@ const recipesPlugin = {
               console.error(header);
             }
 
-            // SECURITY NOTE: avoid shelling out from plugins.
-            // We intentionally do NOT auto-run `npx clawhub ...` here.
-            // Instead, print the exact commands to run manually.
-            const commands = missing.map(
-              (slug) => `npx clawhub@latest --workdir "${workdir}" --dir "${dirName}" install "${slug}"`,
-            );
+            // Use clawhub CLI. Force install path based on scope.
+            const { spawnSync } = await import("node:child_process");
+            for (const slug of missing) {
+              const res = spawnSync(
+                "npx",
+                ["clawhub@latest", "--workdir", workdir, "--dir", dirName, "install", slug],
+                { stdio: "inherit" },
+              );
+              if (res.status !== 0) {
+                process.exitCode = res.status ?? 1;
+                console.error(`Failed installing ${slug} (exit=${process.exitCode}).`);
+                return;
+              }
+            }
 
             console.log(
               JSON.stringify(
                 {
-                  ok: false,
-                  reason: "manual-install-required",
-                  missing,
+                  ok: true,
+                  installed: missing,
                   installDir,
-                  commands,
-                  next: "Run the commands above, then: openclaw gateway restart",
+                  next: `Try: openclaw skills list (or check ${installDir})`,
                 },
                 null,
                 2,
@@ -1209,6 +1163,57 @@ const recipesPlugin = {
             );
           });
 
+        async function installMarketplaceRecipe(slug: string, options: any) {
+          const cfg = getCfg(api);
+          const baseWorkspace = api.config.agents?.defaults?.workspace;
+          if (!baseWorkspace) throw new Error("agents.defaults.workspace is not set in config");
+
+          const base = String(options.registryBase ?? "").replace(/\/+$/, "");
+          const s = String(slug ?? "").trim();
+          if (!s) throw new Error("slug is required");
+
+          const metaUrl = `${base}/api/marketplace/recipes/${encodeURIComponent(s)}`;
+          const metaRes = await fetch(metaUrl);
+          if (!metaRes.ok) {
+            const hint = `Recipe not found: ${s}. Did you mean:\n- openclaw recipes install ${s}   # marketplace recipe\n- openclaw recipes install-skill ${s}   # ClawHub skill`;
+            throw new Error(`Registry lookup failed (${metaRes.status}): ${metaUrl}\n\n${hint}`);
+          }
+          const metaData = (await metaRes.json()) as any;
+          const recipe = metaData?.recipe;
+          const sourceUrl = String(recipe?.sourceUrl ?? "").trim();
+          if (!metaData?.ok || !sourceUrl) {
+            throw new Error(`Registry response missing recipe.sourceUrl for ${s}`);
+          }
+
+          const mdRes = await fetch(sourceUrl);
+          if (!mdRes.ok) throw new Error(`Failed downloading recipe markdown (${mdRes.status}): ${sourceUrl}`);
+          const md = await mdRes.text();
+
+          const recipesDir = path.join(baseWorkspace, cfg.workspaceRecipesDir);
+          await ensureDir(recipesDir);
+          const destPath = path.join(recipesDir, `${s}.md`);
+
+          await writeFileSafely(destPath, md, options.overwrite ? "overwrite" : "createOnly");
+
+          console.log(JSON.stringify({ ok: true, slug: s, wrote: destPath, sourceUrl, metaUrl }, null, 2));
+        }
+
+        cmd
+          .command("install")
+          .description("Install a marketplace recipe into your workspace recipes dir (by slug)")
+          .argument("<idOrSlug>", "Marketplace recipe slug (e.g. development-team)")
+          .option("--registry-base <url>", "Marketplace API base URL", "https://clawkitchen.ai")
+          .option("--overwrite", "Overwrite existing recipe file")
+          .action(async (slug: string, options: any) => installMarketplaceRecipe(slug, options));
+
+        cmd
+          .command("install-recipe")
+          .description("Alias for: recipes install <slug>")
+          .argument("<slug>", "Marketplace recipe slug (e.g. development-team)")
+          .option("--registry-base <url>", "Marketplace API base URL", "https://clawkitchen.ai")
+          .option("--overwrite", "Overwrite existing recipe file")
+          .action(async (slug: string, options: any) => installMarketplaceRecipe(slug, options));
+
         cmd
           .command("dispatch")
           .description("Lead/dispatcher: turn a natural-language request into inbox + backlog ticket(s) + assignment stubs")
@@ -1352,6 +1357,82 @@ const recipesPlugin = {
             console.log(JSON.stringify({ ok: true, wrote: plan.files.map((f) => f.path) }, null, 2));
           });
 
+        cmd
+          .command("remove-team")
+          .description("Safe uninstall: remove a scaffolded team workspace + agents + stamped cron jobs")
+          .requiredOption("--team-id <teamId>", "Team id")
+          .option("--plan", "Print plan and exit")
+          .option("--json", "Output JSON")
+          .option("--yes", "Skip confirmation (apply destructive changes)")
+          .option("--include-ambiguous", "Also remove cron jobs that only loosely match the team (dangerous)")
+          .action(async (options: any) => {
+            const teamId = String(options.teamId);
+
+            const workspaceRoot = api.config.agents?.defaults?.workspace;
+            if (!workspaceRoot) throw new Error("agents.defaults.workspace is not set in config");
+
+            const cronJobsPath = path.resolve(workspaceRoot, "..", "cron", "jobs.json");
+
+            const current = (api.runtime as any).config?.loadConfig?.();
+            if (!current) throw new Error("Failed to load config via api.runtime.config.loadConfig()");
+            const cfgObj = (current.cfg ?? current) as any;
+
+            const cronStore = await loadCronStore(cronJobsPath);
+
+            const plan = await buildRemoveTeamPlan({
+              teamId,
+              workspaceRoot,
+              openclawConfigPath: "(managed by api.runtime.config)",
+              cronJobsPath,
+              cfgObj,
+              cronStore,
+            });
+
+            const wantsJson = Boolean(options.json);
+
+            if (options.plan) {
+              console.log(JSON.stringify({ ok: true, plan }, null, 2));
+              return;
+            }
+
+            if (!options.yes && !process.stdin.isTTY) {
+              console.error("Refusing to prompt (non-interactive). Re-run with --yes or --plan.");
+              process.exitCode = 2;
+              console.log(JSON.stringify({ ok: false, plan }, null, 2));
+              return;
+            }
+
+            if (!options.yes && process.stdin.isTTY) {
+              console.log(JSON.stringify({ plan }, null, 2));
+              const ok = await promptYesNo(
+                `This will DELETE workspace-${teamId}, remove matching agents from openclaw config, and remove stamped cron jobs.`,
+              );
+              if (!ok) {
+                console.error("Aborted; no changes made.");
+                return;
+              }
+            }
+
+            const includeAmbiguous = Boolean(options.includeAmbiguous);
+
+            const result = await executeRemoveTeamPlan({
+              plan,
+              includeAmbiguous,
+              cfgObj,
+              cronStore,
+            });
+
+            await (api.runtime as any).config?.writeConfigFile?.(cfgObj);
+            await saveCronStore(cronJobsPath, cronStore);
+
+            if (wantsJson) {
+              console.log(JSON.stringify(result, null, 2));
+            } else {
+              console.log(JSON.stringify(result, null, 2));
+              console.error("Restart required: openclaw gateway restart");
+            }
+          });
+
         cmd
           .command("tickets")
           .description("List tickets for a team (backlog / in-progress / testing / done)")
@@ -1363,6 +1444,8 @@ const recipesPlugin = {
             const teamId = String(options.teamId);
             const teamDir = path.resolve(workspaceRoot, "..", `workspace-${teamId}`);
 
+            await ensureTicketStageDirs(teamDir);
+
             const dirs = {
               backlog: path.join(teamDir, "work", "backlog"),
               inProgress: path.join(teamDir, "work", "in-progress"),
@@ -1373,34 +1456,31 @@ const recipesPlugin = {
             const readTickets = async (dir: string, stage: "backlog" | "in-progress" | "testing" | "done") => {
               if (!(await fileExists(dir))) return [] as any[];
               const files = (await fs.readdir(dir)).filter((f) => f.endsWith(".md")).sort();
-              return Promise.all(
-                files.map(async (f) => {
-                  const m = f.match(/^(\d{4})-(.+)\.md$/);
-                  const file = path.join(dir, f);
-                  let owner: string | null = null;
-                  try {
-                    const md = await fs.readFile(file, 'utf8');
-                    owner = parseOwnerFromMd(md);
-                  } catch {
-                    owner = null;
-                  }
-                  return {
-                    stage,
-                    number: m ? Number(m[1]) : null,
-                    id: m ? `${m[1]}-${m[2]}` : f.replace(/\.md$/, ""),
-                    owner,
-                    file,
-                  };
-                }),
-              );
+              return files.map((f) => {
+                const m = f.match(/^(\d{4})-(.+)\.md$/);
+                return {
+                  stage,
+                  number: m ? Number(m[1]) : null,
+                  id: m ? `${m[1]}-${m[2]}` : f.replace(/\.md$/, ""),
+                  file: path.join(dir, f),
+                };
+              });
             };
 
+            const backlog = await readTickets(dirs.backlog, "backlog");
+            const inProgress = await readTickets(dirs.inProgress, "in-progress");
+            const testing = await readTickets(dirs.testing, "testing");
+            const done = await readTickets(dirs.done, "done");
+
             const out = {
               teamId,
-              backlog: await readTickets(dirs.backlog, "backlog"),
-              inProgress: await readTickets(dirs.inProgress, "in-progress"),
-              testing: await readTickets(dirs.testing, "testing"),
-              done: await readTickets(dirs.done, "done"),
+              // Stable, machine-friendly list for consumers (watchers, dashboards)
+              // Keep the per-lane arrays for backwards-compat.
+              tickets: [...backlog, ...inProgress, ...testing, ...done],
+              backlog,
+              inProgress,
+              testing,
+              done,
             };
 
             if (options.json) {
@@ -1427,12 +1507,13 @@ const recipesPlugin = {
           .requiredOption("--to <stage>", "Destination stage: backlog|in-progress|testing|done")
           .option("--completed", "When moving to done, add Completed: timestamp")
           .option("--yes", "Skip confirmation")
-          .action(async (options: any) =>
-            runRecipesCommand("openclaw recipes move-ticket", async () => {
-              const workspaceRoot = api.config.agents?.defaults?.workspace;
-              if (!workspaceRoot) throw new Error("agents.defaults.workspace is not set in config");
-              const teamId = String(options.teamId);
-              const teamDir = path.resolve(workspaceRoot, "..", `workspace-${teamId}`);
+          .action(async (options: any) => {
+            const workspaceRoot = api.config.agents?.defaults?.workspace;
+            if (!workspaceRoot) throw new Error("agents.defaults.workspace is not set in config");
+            const teamId = String(options.teamId);
+            const teamDir = path.resolve(workspaceRoot, "..", `workspace-${teamId}`);
+
+            await ensureTicketStageDirs(teamDir);
 
             const dest = String(options.to);
             if (!['backlog','in-progress','testing','done'].includes(dest)) {
@@ -1469,11 +1550,7 @@ const recipesPlugin = {
             if (!srcPath) throw new Error(`Ticket not found: ${ticketArg}`);
 
             const destDir = stageDir(dest);
-            if (dest === 'testing') {
-              await ensureLaneDir({ teamDir, lane: 'testing', command: 'openclaw recipes move-ticket' });
-            } else {
-              await ensureDir(destDir);
-            }
+            await ensureDir(destDir);
             const filename = path.basename(srcPath);
             const destPath = path.join(destDir, filename);
 
@@ -1532,7 +1609,7 @@ const recipesPlugin = {
             }
 
             console.log(JSON.stringify({ ok: true, moved: plan }, null, 2));
-          }));
+          });
 
         cmd
           .command("assign")
@@ -1548,18 +1625,44 @@ const recipesPlugin = {
             const teamId = String(options.teamId);
             const teamDir = path.resolve(workspaceRoot, "..", `workspace-${teamId}`);
 
+            await ensureTicketStageDirs(teamDir);
+
             const owner = String(options.owner);
             if (!['dev','devops','lead','test'].includes(owner)) {
               throw new Error("--owner must be one of: dev, devops, lead, test");
             }
 
+            const stageDir = (stage: string) => {
+              if (stage === 'backlog') return path.join(teamDir, 'work', 'backlog');
+              if (stage === 'in-progress') return path.join(teamDir, 'work', 'in-progress');
+              if (stage === 'testing') return path.join(teamDir, 'work', 'testing');
+              if (stage === 'done') return path.join(teamDir, 'work', 'done');
+              throw new Error(`Unknown stage: ${stage}`);
+            };
+            const searchDirs = [stageDir('backlog'), stageDir('in-progress'), stageDir('testing'), stageDir('done')];
+
             const ticketArg = String(options.ticket);
-            const ticketPath = await findTicketFileAnyLane({ teamDir, ticket: ticketArg });
+            const ticketNum = ticketArg.match(/^\d{4}$/) ? ticketArg : (ticketArg.match(/^(\d{4})-/)?.[1] ?? null);
+
+            const findTicketFile = async () => {
+              for (const dir of searchDirs) {
+                if (!(await fileExists(dir))) continue;
+                const files = await fs.readdir(dir);
+                for (const f of files) {
+                  if (!f.endsWith('.md')) continue;
+                  if (ticketNum && f.startsWith(`${ticketNum}-`)) return path.join(dir, f);
+                  if (!ticketNum && f.replace(/\.md$/, '') === ticketArg) return path.join(dir, f);
+                }
+              }
+              return null;
+            };
+
+            const ticketPath = await findTicketFile();
             if (!ticketPath) throw new Error(`Ticket not found: ${ticketArg}`);
 
             const filename = path.basename(ticketPath);
             const m = filename.match(/^(\d{4})-(.+)\.md$/);
-            const ticketNumStr = m?.[1] ?? '0000';
+            const ticketNumStr = m?.[1] ?? (ticketNum ?? '0000');
             const slug = m?.[2] ?? (ticketArg.replace(/^\d{4}-?/, '') || 'ticket');
 
             const assignmentsDir = path.join(teamDir, 'work', 'assignments');
@@ -1605,77 +1708,119 @@ const recipesPlugin = {
           });
 
         cmd
-          .command("handoff")
-          .description("QA handoff: assign ticket to tester + move to testing")
+          .command("take")
+          .description("Shortcut: assign ticket to owner + move to in-progress")
           .requiredOption("--team-id <teamId>", "Team id")
           .requiredOption("--ticket <ticket>", "Ticket id or number")
-          .option("--tester <tester>", "Tester/owner (default: test)", "test")
-          .option("--overwrite", "Overwrite existing assignment file")
+          .option("--owner <owner>", "Owner: dev|devops|lead|test", "dev")
           .option("--yes", "Skip confirmation")
-          .action(async (options: any) =>
-            runRecipesCommand("openclaw recipes handoff", async () => {
-              const workspaceRoot = api.config.agents?.defaults?.workspace;
-              if (!workspaceRoot) throw new Error("agents.defaults.workspace is not set in config");
-              const teamId = String(options.teamId);
-              const teamDir = path.resolve(workspaceRoot, "..", `workspace-${teamId}`);
+          .action(async (options: any) => {
+            const workspaceRoot = api.config.agents?.defaults?.workspace;
+            if (!workspaceRoot) throw new Error("agents.defaults.workspace is not set in config");
+            const teamId = String(options.teamId);
+            const teamDir = path.resolve(workspaceRoot, "..", `workspace-${teamId}`);
 
-            const tester = String(options.tester ?? "test");
+            await ensureTicketStageDirs(teamDir);
 
-            const plan = {
-              teamId,
-              ticket: String(options.ticket),
-              tester,
-              overwriteAssignment: !!options.overwrite,
+            const owner = String(options.owner ?? 'dev');
+            if (!['dev','devops','lead','test'].includes(owner)) {
+              throw new Error("--owner must be one of: dev, devops, lead, test");
+            }
+
+            const stageDir = (stage: string) => {
+              if (stage === 'backlog') return path.join(teamDir, 'work', 'backlog');
+              if (stage === 'in-progress') return path.join(teamDir, 'work', 'in-progress');
+              if (stage === 'testing') return path.join(teamDir, 'work', 'testing');
+              if (stage === 'done') return path.join(teamDir, 'work', 'done');
+              throw new Error(`Unknown stage: ${stage}`);
             };
+            const searchDirs = [stageDir('backlog'), stageDir('in-progress'), stageDir('testing'), stageDir('done')];
+
+            const ticketArg = String(options.ticket);
+            const ticketNum = ticketArg.match(/^\d{4}$/) ? ticketArg : (ticketArg.match(/^(\d{4})-/)?.[1] ?? null);
+
+            const findTicketFile = async () => {
+              for (const dir of searchDirs) {
+                if (!(await fileExists(dir))) continue;
+                const files = await fs.readdir(dir);
+                for (const f of files) {
+                  if (!f.endsWith('.md')) continue;
+                  if (ticketNum && f.startsWith(`${ticketNum}-`)) return path.join(dir, f);
+                  if (!ticketNum && f.replace(/\.md$/, '') === ticketArg) return path.join(dir, f);
+                }
+              }
+              return null;
+            };
+
+            const srcPath = await findTicketFile();
+            if (!srcPath) throw new Error(`Ticket not found: ${ticketArg}`);
+
+            const destDir = stageDir('in-progress');
+            await ensureDir(destDir);
+            const filename = path.basename(srcPath);
+            const destPath = path.join(destDir, filename);
+
+            const patch = (md: string) => {
+              let out = md;
+              if (out.match(/^Owner:\s.*$/m)) out = out.replace(/^Owner:\s.*$/m, `Owner: ${owner}`);
+              else out = out.replace(/^(# .+\n)/, `$1\nOwner: ${owner}\n`);
+
+              if (out.match(/^Status:\s.*$/m)) out = out.replace(/^Status:\s.*$/m, `Status: in-progress`);
+              else out = out.replace(/^(# .+\n)/, `$1\nStatus: in-progress\n`);
+
+              return out;
+            };
+
+            const plan = { from: srcPath, to: destPath, owner };
 
             if (!options.yes && process.stdin.isTTY) {
               console.log(JSON.stringify({ plan }, null, 2));
-              const readline = await import("node:readline/promises");
+              const readline = await import('node:readline/promises');
               const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
               try {
-                const ans = await rl.question(`Handoff to ${tester} and move to testing? (y/N) `);
-                const ok = ans.trim().toLowerCase() === "y" || ans.trim().toLowerCase() === "yes";
+                const ans = await rl.question(`Assign to ${owner} and move to in-progress? (y/N) `);
+                const ok = ans.trim().toLowerCase() === 'y' || ans.trim().toLowerCase() === 'yes';
                 if (!ok) {
-                  console.error("Aborted; no changes made.");
+                  console.error('Aborted; no changes made.');
                   return;
                 }
               } finally {
                 rl.close();
               }
             } else if (!options.yes && !process.stdin.isTTY) {
-              console.error("Refusing to handoff without confirmation in non-interactive mode. Re-run with --yes.");
+              console.error('Refusing to take without confirmation in non-interactive mode. Re-run with --yes.');
               process.exitCode = 2;
               console.log(JSON.stringify({ ok: false, plan }, null, 2));
               return;
             }
 
-            const res = await handoffTicketCore({
-              teamDir,
-              ticket: String(options.ticket),
-              tester,
-              overwriteAssignment: !!options.overwrite,
-            });
+            const md = await fs.readFile(srcPath, 'utf8');
+            const nextMd = patch(md);
+            await fs.writeFile(srcPath, nextMd, 'utf8');
 
-            console.log(
-              JSON.stringify(
-                {
-                  ok: true,
-                  moved: res.moved ? { from: res.srcPath, to: res.destPath } : null,
-                  ticket: path.relative(teamDir, res.destPath),
-                  assignment: path.relative(teamDir, res.assignmentPath),
-                },
-                null,
-                2,
-              ),
-            );
-          }));
+            if (srcPath !== destPath) {
+              await fs.rename(srcPath, destPath);
+            }
+
+            const m = filename.match(/^(\d{4})-(.+)\.md$/);
+            const ticketNumStr = m?.[1] ?? (ticketNum ?? '0000');
+            const slug = m?.[2] ?? (ticketArg.replace(/^\d{4}-?/, '') || 'ticket');
+            const assignmentsDir = path.join(teamDir, 'work', 'assignments');
+            await ensureDir(assignmentsDir);
+            const assignmentPath = path.join(assignmentsDir, `${ticketNumStr}-assigned-${owner}.md`);
+            const assignmentMd = `# Assignment — ${ticketNumStr}-${slug}\n\nAssigned: ${owner}\n\n## Ticket\n${path.relative(teamDir, destPath)}\n\n## Notes\n- Created by: openclaw recipes take\n`;
+            await writeFileSafely(assignmentPath, assignmentMd, 'createOnly');
+
+            console.log(JSON.stringify({ ok: true, plan, assignmentPath }, null, 2));
+          });
 
         cmd
-          .command("take")
-          .description("Shortcut: assign ticket to owner + move to in-progress")
+          .command("handoff")
+          .description("QA handoff: move ticket to testing + assign to tester")
           .requiredOption("--team-id <teamId>", "Team id")
           .requiredOption("--ticket <ticket>", "Ticket id or number")
-          .option("--owner <owner>", "Owner: dev|devops|lead|test", "dev")
+          .option("--tester <owner>", "Tester owner (default: test)", "test")
+          .option("--overwrite", "Overwrite destination ticket file / assignment stub if they already exist")
           .option("--yes", "Skip confirmation")
           .action(async (options: any) => {
             const workspaceRoot = api.config.agents?.defaults?.workspace;
@@ -1683,39 +1828,73 @@ const recipesPlugin = {
             const teamId = String(options.teamId);
             const teamDir = path.resolve(workspaceRoot, "..", `workspace-${teamId}`);
 
-            const owner = String(options.owner ?? 'dev');
-            if (!['dev','devops','lead','test'].includes(owner)) {
-              throw new Error("--owner must be one of: dev, devops, lead, test");
+            const tester = String(options.tester ?? "test");
+            if (!['dev','devops','lead','test'].includes(tester)) {
+              throw new Error("--tester must be one of: dev, devops, lead, test");
             }
 
+            const stageDir = (stage: string) => {
+              if (stage === 'in-progress') return path.join(teamDir, 'work', 'in-progress');
+              if (stage === 'testing') return path.join(teamDir, 'work', 'testing');
+              throw new Error(`Unknown stage: ${stage}`);
+            };
+
             const ticketArg = String(options.ticket);
-            const srcPath = await findTicketFileAnyLane({ teamDir, ticket: ticketArg });
-            if (!srcPath) throw new Error(`Ticket not found: ${ticketArg}`);
+            const ticketNum = ticketArg.match(/^\d{4}$/) ? ticketArg : (ticketArg.match(/^(\d{4})-/)?.[1] ?? null);
 
-            const destDir = stageDir('in-progress');
-            await ensureDir(destDir);
+            const findTicketFile = async (dir: string) => {
+              if (!(await fileExists(dir))) return null;
+              const files = await fs.readdir(dir);
+              for (const f of files) {
+                if (!f.endsWith('.md')) continue;
+                if (ticketNum && f.startsWith(`${ticketNum}-`)) return path.join(dir, f);
+                if (!ticketNum && f.replace(/\.md$/, '') === ticketArg) return path.join(dir, f);
+              }
+              return null;
+            };
+
+            const inProgressDir = stageDir('in-progress');
+            const testingDir = stageDir('testing');
+            await ensureDir(testingDir);
+
+            const srcInProgress = await findTicketFile(inProgressDir);
+            const srcTesting = await findTicketFile(testingDir);
+
+            if (!srcInProgress && !srcTesting) {
+              throw new Error(`Ticket not found in in-progress/testing: ${ticketArg}`);
+            }
+            if (!srcInProgress && srcTesting) {
+              // already in testing (idempotent path)
+            }
+
+            const srcPath = srcInProgress ?? srcTesting!;
             const filename = path.basename(srcPath);
-            const destPath = path.join(destDir, filename);
+            const destPath = path.join(testingDir, filename);
 
             const patch = (md: string) => {
               let out = md;
-              if (out.match(/^Owner:\s.*$/m)) out = out.replace(/^Owner:\s.*$/m, `Owner: ${owner}`);
-              else out = out.replace(/^(# .+\n)/, `$1\nOwner: ${owner}\n`);
+              if (out.match(/^Owner:\s.*$/m)) out = out.replace(/^Owner:\s.*$/m, `Owner: ${tester}`);
+              else out = out.replace(/^(# .+\n)/, `$1\nOwner: ${tester}\n`);
 
-              if (out.match(/^Status:\s.*$/m)) out = out.replace(/^Status:\s.*$/m, `Status: in-progress`);
-              else out = out.replace(/^(# .+\n)/, `$1\nStatus: in-progress\n`);
+              if (out.match(/^Status:\s.*$/m)) out = out.replace(/^Status:\s.*$/m, `Status: testing`);
+              else out = out.replace(/^(# .+\n)/, `$1\nStatus: testing\n`);
 
               return out;
             };
 
-            const plan = { from: srcPath, to: destPath, owner };
+            const plan = {
+              from: srcPath,
+              to: destPath,
+              tester,
+              note: srcTesting ? 'already-in-testing' : 'move-to-testing',
+            };
 
             if (!options.yes && process.stdin.isTTY) {
               console.log(JSON.stringify({ plan }, null, 2));
               const readline = await import('node:readline/promises');
               const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
               try {
-                const ans = await rl.question(`Assign to ${owner} and move to in-progress? (y/N) `);
+                const ans = await rl.question(`Move to testing + assign to ${tester}? (y/N) `);
                 const ok = ans.trim().toLowerCase() === 'y' || ans.trim().toLowerCase() === 'yes';
                 if (!ok) {
                   console.error('Aborted; no changes made.');
@@ -1725,28 +1904,37 @@ const recipesPlugin = {
                 rl.close();
               }
             } else if (!options.yes && !process.stdin.isTTY) {
-              console.error('Refusing to take without confirmation in non-interactive mode. Re-run with --yes.');
+              console.error('Refusing to handoff without confirmation in non-interactive mode. Re-run with --yes.');
               process.exitCode = 2;
               console.log(JSON.stringify({ ok: false, plan }, null, 2));
               return;
             }
 
+            if (srcInProgress && srcPath !== destPath) {
+              if (!options.overwrite && (await fileExists(destPath))) {
+                throw new Error(`Destination exists: ${destPath} (re-run with --overwrite to replace)`);
+              }
+            }
+
             const md = await fs.readFile(srcPath, 'utf8');
             const nextMd = patch(md);
             await fs.writeFile(srcPath, nextMd, 'utf8');
 
-            if (srcPath !== destPath) {
+            if (srcInProgress && srcPath !== destPath) {
+              if (options.overwrite && (await fileExists(destPath))) {
+                await fs.rm(destPath);
+              }
               await fs.rename(srcPath, destPath);
             }
 
             const m = filename.match(/^(\d{4})-(.+)\.md$/);
-            const ticketNumStr = m?.[1] ?? '0000';
+            const ticketNumStr = m?.[1] ?? (ticketNum ?? '0000');
             const slug = m?.[2] ?? (ticketArg.replace(/^\d{4}-?/, '') || 'ticket');
             const assignmentsDir = path.join(teamDir, 'work', 'assignments');
             await ensureDir(assignmentsDir);
-            const assignmentPath = path.join(assignmentsDir, `${ticketNumStr}-assigned-${owner}.md`);
-            const assignmentMd = `# Assignment — ${ticketNumStr}-${slug}\n\nAssigned: ${owner}\n\n## Ticket\n${path.relative(teamDir, destPath)}\n\n## Notes\n- Created by: openclaw recipes take\n`;
-            await writeFileSafely(assignmentPath, assignmentMd, 'createOnly');
+            const assignmentPath = path.join(assignmentsDir, `${ticketNumStr}-assigned-${tester}.md`);
+            const assignmentMd = `# Assignment — ${ticketNumStr}-${slug}\n\nAssigned: ${tester}\n\n## Ticket\n${path.relative(teamDir, destPath)}\n\n## Notes\n- Created by: openclaw recipes handoff\n`;
+            await writeFileSafely(assignmentPath, assignmentMd, options.overwrite ? 'overwrite' : 'createOnly');
 
             console.log(JSON.stringify({ ok: true, plan, assignmentPath }, null, 2));
           });
@@ -1757,61 +1945,26 @@ const recipesPlugin = {
           .requiredOption("--team-id <teamId>", "Team id")
           .requiredOption("--ticket <ticket>", "Ticket id or number")
           .option("--yes", "Skip confirmation")
-          .action(async (options: any) =>
-            runRecipesCommand("openclaw recipes complete", async () => {
-              const workspaceRoot = api.config.agents?.defaults?.workspace;
-              if (!workspaceRoot) throw new Error("agents.defaults.workspace is not set in config");
-              const teamId = String(options.teamId);
-              const teamDir = path.resolve(workspaceRoot, "..", `workspace-${teamId}`);
-
-              const ticketArg = String(options.ticket);
-              const srcPath = await findTicketFileAnyLane({ teamDir, ticket: ticketArg });
-              if (!srcPath) throw new Error(`Ticket not found: ${ticketArg}`);
-
-              const destDir = path.join(teamDir, 'work', 'done');
-              await ensureDir(destDir);
-
-              const filename = path.basename(srcPath);
-              const destPath = path.join(destDir, filename);
-
-              const plan = { from: srcPath, to: destPath, completed: true };
-
-              if (!options.yes && process.stdin.isTTY) {
-                console.log(JSON.stringify({ plan }, null, 2));
-                const readline = await import('node:readline/promises');
-                const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-                try {
-                  const ans = await rl.question(`Move to done and mark completed? (y/N) `);
-                  const ok = ans.trim().toLowerCase() === 'y' || ans.trim().toLowerCase() === 'yes';
-                  if (!ok) {
-                    console.error('Aborted; no changes made.');
-                    return;
-                  }
-                } finally {
-                  rl.close();
-                }
-              } else if (!options.yes && !process.stdin.isTTY) {
-                console.error('Refusing to complete without confirmation in non-interactive mode. Re-run with --yes.');
-                process.exitCode = 2;
-                console.log(JSON.stringify({ ok: false, plan }, null, 2));
-                return;
-              }
-
-              const md = await fs.readFile(srcPath, 'utf8');
-              let out = md;
-              if (out.match(/^Status:\s.*$/m)) out = out.replace(/^Status:\s.*$/m, `Status: done`);
-              else out = out.replace(/^(# .+\n)/, `$1\nStatus: done\n`);
-
-              const completedIso = new Date().toISOString();
-              if (out.match(/^Completed:\s.*$/m)) out = out.replace(/^Completed:\s.*$/m, `Completed: ${completedIso}`);
-              else out = out.replace(/^(# .+\n)/, `$1\nCompleted: ${completedIso}\n`);
-
-              await fs.writeFile(srcPath, out, 'utf8');
-              if (srcPath !== destPath) await fs.rename(srcPath, destPath);
-
-              console.log(JSON.stringify({ ok: true, moved: { from: srcPath, to: destPath }, completed: completedIso }, null, 2));
-            }),
-          );
+          .action(async (options: any) => {
+            const args = [
+              'recipes',
+              'move-ticket',
+              '--team-id',
+              String(options.teamId),
+              '--ticket',
+              String(options.ticket),
+              '--to',
+              'done',
+              '--completed',
+            ];
+            if (options.yes) args.push('--yes');
+
+            const { spawnSync } = await import('node:child_process');
+            const res = spawnSync('openclaw', args, { stdio: 'inherit' });
+            if (res.status !== 0) {
+              process.exitCode = res.status ?? 1;
+            }
+          });
 
         cmd
           .command("scaffold")
@@ -1948,17 +2101,14 @@ const recipesPlugin = {
 
             const planPath = path.join(notesDir, "plan.md");
             const statusPath = path.join(notesDir, "status.md");
-            const qaChecklistPath = path.join(notesDir, "QA_CHECKLIST.md");
             const ticketsPath = path.join(teamDir, "TICKETS.md");
 
             const planMd = `# Plan — ${teamId}\n\n- (empty)\n`;
             const statusMd = `# Status — ${teamId}\n\n- (empty)\n`;
-            const qaChecklistMd = `# QA checklist (template)\n\nUse this checklist for any ticket in work/testing/ before moving it to work/done/.\n\n## Where verification results live\nPreferred (canonical): create a sibling verification note:\n- work/testing/<ticket>.testing-verified.md\n\nAlternative (allowed for tiny changes): add a \"## QA verification\" section directly in the ticket file.\n\n## Rule: when a ticket may move to done\nA ticket may move testing → done only when a verification record exists.\n\n## Copy/paste template\n\n\`\`\`md\n# QA verification — <ticket-id>\n\nTicket: <relative-path-to-ticket>\nVerified by: <name/role>\nDate: <YYYY-MM-DD>\n\n## Environment\n- Machine: <host / OS>\n- Repo(s): <repo + path>\n- Branch/commit: <branch + sha>\n- Build/version: <version if applicable>\n\n## Test plan\n### Commands run\n- <command 1>\n- <command 2>\n\n### Manual checks\n- [ ] Acceptance criteria verified\n- [ ] Negative case / failure mode checked (if applicable)\n- [ ] No unexpected file changes\n\n## Results\nStatus: PASS | FAIL\n\n### Notes\n- <what you observed>\n\n### Evidence\n- Logs/snippets:\n  - <paste key excerpt>\n- Links:\n  - <PR/issue/build link>\n\n## If FAIL\n- What broke:\n- How to reproduce:\n- Suggested fix / owner:\n\`\`\`\n`;
-            const ticketsMd = renderTicketsMd(teamId);
+            const ticketsMd = `# Tickets — ${teamId}\n\n## Naming\n- Backlog tickets live in work/backlog/\n- In-progress tickets live in work/in-progress/\n- Testing tickets live in work/testing/\n- Done tickets live in work/done/\n- Filename ordering is the queue: 0001-..., 0002-...\n\n## Stages\n- backlog → in-progress → testing → done\n\n## QA handoff\n- When work is ready for QA: move the ticket to \`work/testing/\` and assign to test.\n\n## Required fields\nEach ticket should include:\n- Title\n- Context\n- Requirements\n- Acceptance criteria\n- Owner (dev/devops/lead/test)\n- Status (queued/in-progress/testing/done)\n\n## Example\n\n\`\`\`md\n# 0001-example-ticket\n\nOwner: dev\nStatus: queued\n\n## Context\n...\n\n## Requirements\n- ...\n\n## Acceptance criteria\n- ...\n\`\`\`\n`;
 
             await writeFileSafely(planPath, planMd, overwrite ? "overwrite" : "createOnly");
             await writeFileSafely(statusPath, statusMd, overwrite ? "overwrite" : "createOnly");
-            await writeFileSafely(qaChecklistPath, qaChecklistMd, overwrite ? "overwrite" : "createOnly");
             await writeFileSafely(ticketsPath, ticketsMd, overwrite ? "overwrite" : "createOnly");
 
             const agents = recipe.agents ?? [];
@@ -2008,7 +2158,7 @@ const recipesPlugin = {
 
             // Create a minimal TEAM.md
             const teamMdPath = path.join(teamDir, "TEAM.md");
-            const teamMd = renderTeamMd(teamId);
+            const teamMd = `# ${teamId}\n\nShared workspace for this agent team.\n\n## Folders\n- inbox/ — requests\n- outbox/ — deliverables\n- shared-context/ — curated shared context + append-only agent outputs\n- shared/ — legacy shared artifacts (back-compat)\n- notes/ — plan + status\n- work/ — working files\n`;
             await writeFileSafely(teamMdPath, teamMd, options.overwrite ? "overwrite" : "createOnly");
 
             if (options.applyConfig) {
@@ -2041,78 +2191,32 @@ const recipesPlugin = {
               ),
             );
           });
-
-        cmd
-          .command("cleanup-workspaces")
-          .description("Dry-run (default) or delete temporary scaffold/test workspaces under ~/.openclaw with safety rails")
-          .option("--yes", "Actually delete eligible workspaces (otherwise: dry-run)")
-          .option("--dry-run", "Force dry-run (lists candidates; deletes nothing)")
-          .option(
-            "--prefix <prefix>",
-            `Allowed teamId prefix (repeatable). Default: ${DEFAULT_ALLOWED_PREFIXES.join(", ")}`,
-            (val: string, acc: string[]) => {
-              acc.push(String(val));
-              return acc;
-            },
-            [] as string[],
-          )
-          .option("--json", "Output JSON")
-          .action(async (options: any) =>
-            runRecipesCommand("openclaw recipes cleanup-workspaces", async () => {
-              const baseWorkspace = api.config.agents?.defaults?.workspace;
-              if (!baseWorkspace) throw new Error("agents.defaults.workspace is not set in config");
-
-              // Workspaces live alongside the default workspace (same parent dir): ~/.openclaw/workspace-*
-              const rootDir = path.resolve(baseWorkspace, "..");
-
-              const prefixes: string[] = (options.prefix as string[])?.length ? (options.prefix as string[]) : [...DEFAULT_ALLOWED_PREFIXES];
-              const protectedTeamIds: string[] = [...DEFAULT_PROTECTED_TEAM_IDS];
-
-              const plan = await planWorkspaceCleanup({ rootDir, prefixes, protectedTeamIds });
-              const yes = Boolean(options.yes) && !Boolean(options.dryRun);
-              const result = await executeWorkspaceCleanup(plan, { yes });
-
-              if (options.json) {
-                console.log(JSON.stringify(result, null, 2));
-                return;
-              }
-
-              const candidates = result.candidates;
-              const skipped = result.skipped;
-
-              console.log(`Root: ${result.rootDir}`);
-              console.log(`Mode: ${result.dryRun ? "dry-run" : "delete"}`);
-              console.log(`Allowed prefixes: ${prefixes.join(", ")}`);
-              console.log(`Protected teams: ${protectedTeamIds.join(", ")}`);
-
-              console.log(`\nCandidates (${candidates.length})`);
-              for (const c of candidates) console.log(`- ${c.dirName}`);
-
-              console.log(`\nSkipped (${skipped.length})`);
-              for (const s of skipped) {
-                const label = s.dirName + (s.teamId ? ` (${s.teamId})` : "");
-                console.log(`- ${label}: ${s.reason}`);
-              }
-
-              if (result.dryRun) {
-                console.log(`\nDry-run complete. Re-run with --yes to delete the ${candidates.length} candidate(s).`);
-                return;
-              }
-
-              console.log(`\nDeleted (${result.deleted.length})`);
-              for (const p of result.deleted) console.log(`- ${p}`);
-
-              if ((result as any).deleteErrors?.length) {
-                console.log(`\nDelete errors (${(result as any).deleteErrors.length})`);
-                for (const e of (result as any).deleteErrors) console.log(`- ${e.path}: ${e.error}`);
-                process.exitCode = 1;
-              }
-            }),
-          );
       },
       { commands: ["recipes"] },
     );
   },
 };
 
+// Internal helpers used by unit tests. Not part of the public plugin API.
+export const __internal = {
+  ensureMainFirstInAgentsList,
+  upsertBindingInConfig,
+  removeBindingsInConfig,
+  stableStringify,
+
+  patchTicketField(md: string, key: string, value: string) {
+    const lineRe = new RegExp(`^${key}:\\s.*$`, "m");
+    if (md.match(lineRe)) return md.replace(lineRe, `${key}: ${value}`);
+    return md.replace(/^(# .+\n)/, `$1\n${key}: ${value}\n`);
+  },
+
+  patchTicketOwner(md: string, owner: string) {
+    return this.patchTicketField(md, "Owner", owner);
+  },
+
+  patchTicketStatus(md: string, status: string) {
+    return this.patchTicketField(md, "Status", status);
+  },
+};
+
 export default recipesPlugin;