@jiggai/recipes 0.2.23 → 0.2.25

package/src/lib/template.ts

@@ -0,0 +1,10 @@
+/**
+ * Tiny, safe template renderer: replaces {{key}} with vars[key].
+ * No conditionals, no eval.
+ */
+export function renderTemplate(raw: string, vars: Record<string, string>): string {
+  return raw.replace(/\{\{\s*([a-zA-Z0-9_.-]+)\s*\}\}/g, (_m, key) => {
+    const v = vars[key];
+    return typeof v === "string" ? v : "";
+  });
+}

package/src/lib/ticket-finder.ts

@@ -1,49 +1,66 @@
-import path from 'node:path';
-import fs from 'node:fs/promises';
+import path from "node:path";
+import fs from "node:fs/promises";
+import { fileExists } from "./fs-utils";
+import { ticketStageDir, type TicketLane } from "./lanes";
 
-async function fileExists(p: string) {
-  try {
-    await fs.access(p);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-export type TicketLane = 'backlog' | 'in-progress' | 'testing' | 'done';
+export type { TicketLane };
 
 export function laneDir(teamDir: string, lane: TicketLane) {
-  return path.join(teamDir, 'work', lane);
+  return ticketStageDir(teamDir, lane);
 }
 
+const LANE_SEARCH_ORDER: TicketLane[] = ["backlog", "in-progress", "testing", "done"];
+
 export function allLaneDirs(teamDir: string) {
-  return [
-    laneDir(teamDir, 'backlog'),
-    laneDir(teamDir, 'in-progress'),
-    laneDir(teamDir, 'testing'),
-    laneDir(teamDir, 'done'),
-  ];
+  return LANE_SEARCH_ORDER.map((lane) => ticketStageDir(teamDir, lane));
+}
+
+/**
+ * Compute the next ticket number (max existing + 1) by scanning ticket lane dirs.
+ * Used when creating new tickets (e.g. dispatch).
+ */
+export async function computeNextTicketNumber(teamDir: string): Promise<number> {
+  let max = 0;
+  for (const lane of LANE_SEARCH_ORDER) {
+    const dir = ticketStageDir(teamDir, lane);
+    if (!(await fileExists(dir))) continue;
+    const files = await fs.readdir(dir);
+    for (const f of files) {
+      const m = f.match(TICKET_FILENAME_REGEX);
+      if (m) max = Math.max(max, Number(m[1]));
+    }
+  }
+  return max + 1;
 }
 
+/** Regex for ticket filenames: 0001-slug.md */
+export const TICKET_FILENAME_REGEX = /^(\d{4})-(.+)\.md$/;
+
 export function parseTicketArg(ticketArgRaw: string) {
   const raw = String(ticketArgRaw ?? "").trim();
 
   // Accept "30" as shorthand for ticket 0030.
   const padded = raw.match(/^\d+$/) && raw.length < 4 ? raw.padStart(4, "0") : raw;
 
-  const ticketNum = padded.match(/^\d{4}$/)
-    ? padded
-    : (padded.match(/^(\d{4})-/)?.[1] ?? null);
+  const idMatch = padded.match(/^(\d{4})-/);
+  const ticketNum = padded.match(/^\d{4}$/) ? padded : (idMatch ? idMatch[1] : null);
 
   return { ticketArg: padded, ticketNum };
 }
 
+/** Parse ticket number and slug from filename. Returns null if not a valid ticket filename. */
+export function parseTicketFilename(filename: string): { ticketNumStr: string; slug: string } | null {
+  const m = filename.match(TICKET_FILENAME_REGEX);
+  if (!m) return null;
+  return { ticketNumStr: m[1], slug: m[2] };
+}
+
 export async function findTicketFile(opts: {
   teamDir: string;
   ticket: string;
   lanes?: TicketLane[];
 }) {
-  const lanes = opts.lanes ?? ['backlog', 'in-progress', 'testing', 'done'];
+  const lanes = opts.lanes ?? LANE_SEARCH_ORDER;
   const { ticketArg, ticketNum } = parseTicketArg(String(opts.ticket));
 
   for (const lane of lanes) {

package/src/lib/ticket-workflow.ts

@@ -1,39 +1,36 @@
-import fs from 'node:fs/promises';
-import path from 'node:path';
+import fs from "node:fs/promises";
+import path from "node:path";
 
-import { ensureLaneDir } from './lanes';
-
-async function fileExists(p: string) {
-  try {
-    await fs.stat(p);
-    return true;
-  } catch {
-    return false;
-  }
-}
+import { fileExists } from "./fs-utils";
+import { ensureLaneDir } from "./lanes";
+import { DEFAULT_TICKET_NUMBER } from "./constants";
+import { findTicketFile as findTicketFileFromFinder } from "./ticket-finder";
+import { parseTicketFilename } from "./ticket-finder";
 
 async function ensureDir(p: string) {
   await fs.mkdir(p, { recursive: true });
 }
 
+function patchTicketFields(
+  md: string,
+  opts: { ownerSafe: string; status: string; assignmentRel: string }
+): string {
+  let out = md;
+  if (out.match(/^Owner:\s.*$/m)) out = out.replace(/^Owner:\s.*$/m, `Owner: ${opts.ownerSafe}`);
+  else out = out.replace(/^(# .+\n)/, `$1\nOwner: ${opts.ownerSafe}\n`);
+
+  if (out.match(/^Status:\s.*$/m)) out = out.replace(/^Status:\s.*$/m, `Status: ${opts.status}`);
+  else out = out.replace(/^(# .+\n)/, `$1\nStatus: ${opts.status}\n`);
+
+  if (out.match(/^Assignment:\s.*$/m)) out = out.replace(/^Assignment:\s.*$/m, `Assignment: ${opts.assignmentRel}`);
+  else out = out.replace(/^Owner:.*$/m, (line) => `${line}\nAssignment: ${opts.assignmentRel}`);
+
+  return out;
+}
+
+/** Re-export for callers expecting (teamDir, ticketArg) signature. Delegates to ticket-finder. */
 export async function findTicketFile(teamDir: string, ticketArgRaw: string) {
-  const stageDir = (stage: string) => path.join(teamDir, 'work', stage);
-  const searchDirs = [stageDir('backlog'), stageDir('in-progress'), stageDir('testing'), stageDir('done')];
-
-  const ticketArg = String(ticketArgRaw ?? '').trim();
-  const padded = ticketArg.match(/^\d+$/) && ticketArg.length < 4 ? ticketArg.padStart(4, '0') : ticketArg;
-  const ticketNum = padded.match(/^\d{4}$/) ? padded : (padded.match(/^(\d{4})-/)?.[1] ?? null);
-
-  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$/, '') === padded) return path.join(dir, f);
-    }
-  }
-  return null;
+  return findTicketFileFromFinder({ teamDir, ticket: ticketArgRaw });
 }
 
 export async function takeTicket(opts: { teamDir: string; ticket: string; owner?: string; overwriteAssignment: boolean }) {
@@ -50,33 +47,18 @@ export async function takeTicket(opts: { teamDir: string; ticket: string; owner?
   const filename = path.basename(srcPath);
   const destPath = path.join(inProgressDir, filename);
 
-  const m = filename.match(/^(\d{4})-(.+)\.md$/);
-  const ticketNumStr = m?.[1] ?? (opts.ticket.match(/^\d{4}$/) ? opts.ticket : '0000');
-  const slug = m?.[2] ?? 'ticket';
+  const parsed = parseTicketFilename(filename) ?? { ticketNumStr: opts.ticket.match(/^\d{4}$/) ? opts.ticket : DEFAULT_TICKET_NUMBER, slug: "ticket" };
+  const { ticketNumStr, slug } = parsed;
 
   const assignmentsDir = path.join(teamDir, 'work', 'assignments');
   await ensureDir(assignmentsDir);
   const assignmentPath = path.join(assignmentsDir, `${ticketNumStr}-assigned-${ownerSafe}.md`);
   const assignmentRel = path.relative(teamDir, assignmentPath);
 
-  const patch = (md: string) => {
-    let out = md;
-    if (out.match(/^Owner:\s.*$/m)) out = out.replace(/^Owner:\s.*$/m, `Owner: ${ownerSafe}`);
-    else out = out.replace(/^(# .+\n)/, `$1\nOwner: ${ownerSafe}\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(/^Assignment:\s.*$/m)) out = out.replace(/^Assignment:\s.*$/m, `Assignment: ${assignmentRel}`);
-    else out = out.replace(/^Owner:.*$/m, (line) => `${line}\nAssignment: ${assignmentRel}`);
-
-    return out;
-  };
-
   const alreadyInProgress = srcPath === destPath;
 
   const md = await fs.readFile(srcPath, 'utf8');
-  const nextMd = patch(md);
+  const nextMd = patchTicketFields(md, { ownerSafe, status: 'in-progress', assignmentRel });
   await fs.writeFile(srcPath, nextMd, 'utf8');
 
   if (!alreadyInProgress) {
@@ -109,33 +91,18 @@ export async function handoffTicket(opts: { teamDir: string; ticket: string; tes
   const filename = path.basename(srcPath);
   const destPath = path.join(testingDir, filename);
 
-  const m = filename.match(/^(\d{4})-(.+)\.md$/);
-  const ticketNumStr = m?.[1] ?? (opts.ticket.match(/^\d{4}$/) ? opts.ticket : '0000');
-  const slug = m?.[2] ?? 'ticket';
+  const parsed = parseTicketFilename(filename) ?? { ticketNumStr: opts.ticket.match(/^\d{4}$/) ? opts.ticket : DEFAULT_TICKET_NUMBER, slug: "ticket" };
+  const { ticketNumStr, slug } = parsed;
 
   const assignmentsDir = path.join(teamDir, 'work', 'assignments');
   await ensureDir(assignmentsDir);
   const assignmentPath = path.join(assignmentsDir, `${ticketNumStr}-assigned-${testerSafe}.md`);
   const assignmentRel = path.relative(teamDir, assignmentPath);
 
-  const patch = (md: string) => {
-    let out = md;
-    if (out.match(/^Owner:\s.*$/m)) out = out.replace(/^Owner:\s.*$/m, `Owner: ${testerSafe}`);
-    else out = out.replace(/^(# .+\n)/, `$1\nOwner: ${testerSafe}\n`);
-
-    if (out.match(/^Status:\s.*$/m)) out = out.replace(/^Status:\s.*$/m, 'Status: testing');
-    else out = out.replace(/^(# .+\n)/, `$1\nStatus: testing\n`);
-
-    if (out.match(/^Assignment:\s.*$/m)) out = out.replace(/^Assignment:\s.*$/m, `Assignment: ${assignmentRel}`);
-    else out = out.replace(/^Owner:.*$/m, (line) => `${line}\nAssignment: ${assignmentRel}`);
-
-    return out;
-  };
-
   const alreadyInTesting = srcPath === destPath;
 
   const md = await fs.readFile(srcPath, 'utf8');
-  const nextMd = patch(md);
+  const nextMd = patchTicketFields(md, { ownerSafe: testerSafe, status: 'testing', assignmentRel });
   await fs.writeFile(srcPath, nextMd, 'utf8');
 
   if (!alreadyInTesting) {

package/src/lib/workspace.ts

@@ -0,0 +1,33 @@
+import path from "node:path";
+import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
+import { ensureDir } from "./fs-utils";
+import { ticketStageDir } from "./lanes";
+
+export function resolveWorkspaceRoot(api: OpenClawPluginApi): string {
+  const root = api.config.agents?.defaults?.workspace;
+  if (!root) throw new Error("agents.defaults.workspace is not set in config");
+  return root;
+}
+
+export function resolveTeamDir(api: OpenClawPluginApi, teamId: string): string {
+  const workspaceRoot = resolveWorkspaceRoot(api);
+  return path.resolve(workspaceRoot, "..", "workspace-" + teamId);
+}
+
+export async function ensureTicketStageDirs(teamDir: string): Promise<void> {
+  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")),
+  ]);
+}
+
+export async function resolveTeamContext(api: OpenClawPluginApi, teamId: string): Promise<{ workspaceRoot: string; teamDir: string }> {
+  const workspaceRoot = resolveWorkspaceRoot(api);
+  const teamDir = path.resolve(workspaceRoot, "..", "workspace-" + teamId);
+  await ensureTicketStageDirs(teamDir);
+  return { workspaceRoot, teamDir };
+}

package/src/marketplaceFetch.ts

@@ -17,7 +17,7 @@ export async function fetchMarketplaceRecipeMarkdown(params: {
     throw new Error(`Registry lookup failed (${metaRes.status}): ${metaUrl}\n\n${hint}`);
   }
 
-  const metaData = (await metaRes.json()) as any;
+  const metaData = (await metaRes.json()) as { sourceUrl?: string };
   const recipe = metaData?.recipe;
   const sourceUrl = String(recipe?.sourceUrl ?? "").trim();
   if (!metaData?.ok || !sourceUrl) {

package/src/toolsInvoke.ts

@@ -2,6 +2,10 @@
 // flag "file read + network send" when both patterns live in the same file.
 // This module intentionally contains the network call (fetch) but no filesystem reads.
 
+export const TOOLS_INVOKE_TIMEOUT_MS = 30_000;
+export const RETRY_DELAY_BASE_MS = 150;
+export const GATEWAY_DEFAULT_PORT = 18789;
+
 export type ToolTextResult = { content?: Array<{ type: string; text?: string }> };
 
 export type ToolsInvokeRequest = {
@@ -18,47 +22,52 @@ type ToolsInvokeResponse = {
   error?: { message?: string } | string;
 };
 
-export async function toolsInvoke<T = unknown>(api: any, req: ToolsInvokeRequest): Promise<T> {
-  const port = api.config.gateway?.port ?? 18789;
+import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
+
+function parseToolsInvokeError(json: ToolsInvokeResponse, status: number): string {
+  const msg =
+    (typeof json.error === "object" && json.error?.message) ||
+    (typeof json.error === "string" ? json.error : null) ||
+    `tools/invoke failed (${status})`;
+  return msg;
+}
+
+async function doSingleToolsInvoke<T>(url: string, token: string, req: ToolsInvokeRequest): Promise<T> {
+  const ac = new AbortController();
+  const t = setTimeout(() => ac.abort(), TOOLS_INVOKE_TIMEOUT_MS);
+  const res = await fetch(url, {
+    method: "POST",
+    signal: ac.signal,
+    headers: { "content-type": "application/json", authorization: `Bearer ${token}` },
+    body: JSON.stringify(req),
+  }).finally(() => clearTimeout(t));
+
+  const json = (await res.json()) as ToolsInvokeResponse;
+  if (!res.ok || !json.ok) throw new Error(parseToolsInvokeError(json, res.status));
+  return json.result as T;
+}
+
+/**
+ * Invoke a tool via gateway /tools/invoke (with retries).
+ * @param api - OpenClaw plugin API
+ * @param req - Tool name, action, args, optional sessionKey
+ * @returns Tool result (typed via generic)
+ * @throws On missing token, HTTP error, or after retries
+ */
+export async function toolsInvoke<T = unknown>(api: OpenClawPluginApi, req: ToolsInvokeRequest): Promise<T> {
+  const port = api.config.gateway?.port ?? GATEWAY_DEFAULT_PORT;
   const token = api.config.gateway?.auth?.token;
   if (!token) throw new Error("Missing gateway.auth.token in openclaw config (required for tools/invoke)");
 
-  // We sometimes see transient undici network errors in the CLI environment
-  // (ECONNRESET/ECONNREFUSED) even when the Gateway is healthy.
-  // A small retry makes recipe cron reconciliation much less flaky.
   const url = `http://127.0.0.1:${port}/tools/invoke`;
-
   let lastErr: unknown = null;
+
   for (let attempt = 1; attempt <= 3; attempt++) {
     try {
-      const ac = new AbortController();
-      const timeoutMs = 30_000;
-      const t = setTimeout(() => ac.abort(), timeoutMs);
-
-      const res = await fetch(url, {
-        method: "POST",
-        signal: ac.signal,
-        headers: {
-          "content-type": "application/json",
-          authorization: `Bearer ${token}`,
-        },
-        body: JSON.stringify(req),
-      }).finally(() => clearTimeout(t));
-
-      const json = (await res.json()) as ToolsInvokeResponse;
-      if (!res.ok || !json.ok) {
-        const msg =
-          (typeof json.error === "object" && json.error?.message) ||
-          (typeof json.error === "string" ? json.error : null) ||
-          `tools/invoke failed (${res.status})`;
-        throw new Error(msg);
-      }
-
-      return json.result as T;
+      return await doSingleToolsInvoke<T>(url, token, req);
     } catch (e) {
       lastErr = e;
-      if (attempt >= 3) break;
-      await new Promise((r) => setTimeout(r, 150 * attempt));
+      if (attempt < 3) await new Promise((r) => setTimeout(r, RETRY_DELAY_BASE_MS * attempt));
     }
   }