* fix(ci): restore browser preview module and onboarding e2e The web bundle imported a browser-preview store that was never added, so production builds and every Playwright signup failed before the shell rendered. Mobile check failed because Expo packages were a patch behind the SDK. Restore the store, type the optional desktop bridge, and walk whichever onboarding step scripted CI actually opens. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(ci): stop the blank web client and the send 500 The core barrel pulled git checkout into the browser, so node:child_process crashed the page before sign-up. Serve that module from a node export instead. Add the missing run tool-call budget columns that threads/send writes. Guard an indexed shell flag for typecheck, and expect the files key the desktop preload already exposes. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(ci): isolate pnpm setup and the takeover membership The Team Computer takeover journey inserted a space member the default-space trigger had already created, so shared Postgres rejected the unique pair. Self-hosted jobs now keep a per-job pnpm home and store, and artifact uploads no longer fail a job that already passed. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(ci): clear typecheck, lint, and unit failures Inbound channel rosters can mark a participant list as authoritative. Answered channel asks stay off the group, and clearing a thread waits until delegated returns land. Lint, unit, and web e2e contracts follow the current shell, composer, and settings. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): align e2e with the shipped shell and onboarding Web E2E still expected older focus buttons, nested project rows, and settings that never opened MCP. Persist the signed-in space, list non-default spaces under Projekte, and keep the quote control on screen. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): open group reply from a revealed hover rail The first user row covered its Reply control until the rail accepted pointer events. The group transcript now reveals that rail, then replies. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): stop the shell render loop and settle computer and mention UI A working bot rewrote preview state on every render, the computer menu never stayed still, and the mention picker did not expose its expanded state or option name. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(ci): stop idle probes hanging and accept a follow-up send Background probes walked every process fd and timed out on the shared runner. Linux now tracks the marker with flock and /proc/locks. A new composer draft can send while an earlier send is still refreshing, and group members stay mentionable. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(adapters): detect background work when flock ids are padded The idle probe compared /proc/locks with an unpadded device key, so majors or minors under 16 never matched. It deleted the live marker and reported idle while the command still held the lock. Probe by taking the lock, and print the cancel key the way the kernel does. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(adapters): stabilize background-work probe tests on self-hosted CI Clear stale marker files before each probe scenario and allow longer polling so launch can acquire flock on busy persistent runners. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): do not block onboarding on spaces list Render the first onboarding step from me and integration setup alone. Resolve the optional skip-to-app redirect after that so Playwright signups are not stuck on the loading shell when spaces.list is slow. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(ci): restore green gates after second main rebase Re-apply biome formatting on Shell/SortableGroup and strict TypeScript assertions in computer-idle tests dropped when skipping the duplicate conflict-resolution commit. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): wait for onboarding bootstrap before E2E proceeds Expose data-onboarding-step on the onboarding shell and have Playwright wait until loading finishes. Ignore ad-hoc screenshot scripts on self-hosted runners so they do not fail lint. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): fall back when onboarding bootstrap stalls Race me/integration setup against a timeout and promote loading to the emoji step after 20s so Playwright is not blocked on a hung RPC. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): render onboarding immediately for E2E signups Start on the emoji step instead of a loading shell that waits on RPC. Bootstrap can still redirect once me and integration setup resolve. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(ci): stabilize web e2e on self-hosted runners Per-job pnpm stores broke node_modules symlinks when setup-node restored cached installs, so Vite could not resolve react during dependency optimization. Keep a runner-scoped store, clear stale Vite caches, and pin Playwright to one worker in CI to reduce onboarding RPC contention. Add Vite resolve aliases for react/react-dom, wait for an interactive onboarding step in E2E helpers, and include the React hook smoke spec from main. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): resolve React aliases through pnpm package layout Root node_modules/react does not exist under pnpm, so Vite aliases pointed at missing paths and broke production builds and the Playwright webServer. Resolve react and react-dom from the web package and map jsx-runtime to the actual entry files. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(core): type the lazy child_process spawn cache Main's lazy require left spawn typed as null after assignment, which broke Typecheck on the rebased branch. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(db): mock git-checkout export path in unit tests Vitest resolves vi.mock against package exports; the .js suffix is not declared for @rakazo/core/git-checkout. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): stabilize E2E after main sidebar and onboarding changes Use first() for duplicate transcript lines, wait for interactive onboarding before model-required assertions, and allow project sidebar to settle after create. Extend the Playwright job timeout so the single-worker suite can finish. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): restore Projekte sidebar and integrations MCP entry Use the default space for Unterhaltungen/Projekte separation instead of the active space header, persist the bootstrapped space in localStorage, wire SettingsOverlay to MCP management, and compare hover tones on inactive rows. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): satisfy biome format on homeSpaceId line Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): align sidebar E2E with nested Projekte shell layout Scope Unterhaltungen assertions to conversation rows only, target project-space Chief actions under .sidebar-projekte, and stabilize hover-tone polling. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix: satisfy lint after main merge (format and unused var) Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): show project-space 1:1 bots in Projekte sidebar Include lone bots in projectSidebarGroups, render bot rows in Projekte, and stabilize E2E for nested sidebar layout and duplicate group entries. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): disambiguate duplicate group sidebar buttons in E2E Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): align spaces and group-chats E2E with Projekte sidebar IA Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): dedupe Projekte sidebar rows and stabilize E2E specs - Deduplicate project space and group-chat entries in projectSidebarGroups - Scope group-chats/spaces E2E clicks to first Projekte match after IA split - Wait for shell ready before mention-picker keyboard test; restore main locators - Fix PrivacySettingsOverlay lint and align biome schema with CLI 2.5.13 Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): restrict project drag handle and stabilize space E2E - Move SortableGroup drag listeners to ProjectDragGrip only so sidebar clicks work - Scope space delete actions to project-space rows; wait for menu in E2E - Switch group settings E2E via direct navigation after unsaved draft check - Merge main (DataTrustPanel) and fix Shell import order for CI lint Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): stabilize message hover Escape assertion in E2E Assert the More menu closes and the hover rail stays visible instead of requiring focus restoration, which is flaky across Chromium builds. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * chore: format apps/api/src/app.ts after main merge Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> * fix(web): stabilize team-computer E2E send after bot switch Wait for shell ready and use the Send button instead of Enter after switching bots and closing the computer overlay. The prior run timed out on threads/send with only an apps/api format commit in between. Co-authored-by: cynarAI <cynarAI@users.noreply.github.com> --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: cynarAI <cynarAI@users.noreply.github.com>
310 lines
9.5 KiB
TypeScript
310 lines
9.5 KiB
TypeScript
import type { JobPublisher } from "@rakazo/adapter-kit";
|
|
import { routineJobKey, routineWakeupJob } from "@rakazo/adapter-kit";
|
|
import {
|
|
cronFromPreset,
|
|
isOneShotRoutineCron,
|
|
isOneShotRoutineCrons,
|
|
nextCronDate,
|
|
ONCE_ROUTINE_CRON,
|
|
} from "@rakazo/core";
|
|
import type { PrismaClient, ThreadEvents } from "@rakazo/db";
|
|
|
|
export { isOneShotRoutineCron, ONCE_ROUTINE_CRON };
|
|
|
|
export const SCHEDULE_TOOL_NAMES = new Set(["schedule_create", "schedule_list", "schedule_cancel"]);
|
|
|
|
export function filterBuiltinToolsForRun<T extends { name: string }>(
|
|
tools: T[],
|
|
runTrigger: string,
|
|
): T[] {
|
|
return runTrigger === "routine" ? tools.filter((tool) => tool.name !== "schedule_create") : tools;
|
|
}
|
|
|
|
/** Keep cross-bot messaging thread-specific while exposing schedules in DMs and groups. */
|
|
export function filterBuiltinToolsForThread<T extends { name: string }>(
|
|
tools: T[],
|
|
groupId: string | null | undefined,
|
|
): T[] {
|
|
const inGroup = Boolean(groupId);
|
|
return tools.filter((tool) => {
|
|
if (tool.name === "handoff_to_bot") return inGroup;
|
|
if (tool.name === "message_bot") return !inGroup;
|
|
return true;
|
|
});
|
|
}
|
|
|
|
type ScheduleUnit = "minutes" | "hours" | "days" | "seconds";
|
|
|
|
export type ResolvedSchedule =
|
|
| { ok: true; cron: string; nextRunAt: Date; oneShot: boolean }
|
|
| { ok: false; error: string };
|
|
|
|
export function resolveScheduleTiming(
|
|
input: {
|
|
cron?: unknown;
|
|
every?: unknown;
|
|
unit?: unknown;
|
|
runAt?: unknown;
|
|
delayMinutes?: unknown;
|
|
delaySeconds?: unknown;
|
|
},
|
|
timezone = "UTC",
|
|
): ResolvedSchedule {
|
|
const hasRepeat =
|
|
input.cron !== undefined || input.every !== undefined || input.unit !== undefined;
|
|
const hasOneShot =
|
|
input.runAt !== undefined ||
|
|
input.delayMinutes !== undefined ||
|
|
input.delaySeconds !== undefined;
|
|
if (hasRepeat && hasOneShot) {
|
|
return {
|
|
ok: false,
|
|
error: "Provide either a repeating schedule or a one-shot time, not both.",
|
|
};
|
|
}
|
|
if (!hasRepeat && !hasOneShot) {
|
|
return {
|
|
ok: false,
|
|
error:
|
|
"Provide cron, every/unit for repeating schedules, or runAt/delayMinutes/delaySeconds for one-shot.",
|
|
};
|
|
}
|
|
|
|
if (hasOneShot) {
|
|
const oneShotFields = [input.runAt, input.delayMinutes, input.delaySeconds].filter(
|
|
(value) => value !== undefined,
|
|
);
|
|
if (oneShotFields.length !== 1) {
|
|
return {
|
|
ok: false,
|
|
error:
|
|
"Provide exactly one of runAt, delayMinutes, or delaySeconds for a one-shot schedule.",
|
|
};
|
|
}
|
|
let nextRunAt: Date;
|
|
if (input.delaySeconds !== undefined) {
|
|
const delaySeconds = Number(input.delaySeconds);
|
|
if (!Number.isFinite(delaySeconds) || delaySeconds < 0) {
|
|
return { ok: false, error: "delaySeconds must be a non-negative number." };
|
|
}
|
|
nextRunAt = new Date(Date.now() + delaySeconds * 1_000);
|
|
} else if (input.delayMinutes !== undefined) {
|
|
const delayMinutes = Number(input.delayMinutes);
|
|
if (!Number.isFinite(delayMinutes) || delayMinutes < 0) {
|
|
return { ok: false, error: "delayMinutes must be a non-negative number." };
|
|
}
|
|
nextRunAt = new Date(Date.now() + delayMinutes * 60_000);
|
|
} else {
|
|
const parsed = new Date(String(input.runAt ?? ""));
|
|
if (!Number.isFinite(parsed.getTime())) {
|
|
return { ok: false, error: "runAt must be a valid ISO datetime." };
|
|
}
|
|
nextRunAt = parsed;
|
|
}
|
|
if (nextRunAt.getTime() <= Date.now()) {
|
|
return { ok: false, error: "One-shot schedules must run in the future." };
|
|
}
|
|
return { ok: true, cron: ONCE_ROUTINE_CRON, nextRunAt, oneShot: true };
|
|
}
|
|
|
|
if (input.cron !== undefined) {
|
|
const cron = String(input.cron).trim();
|
|
if (!cron) return { ok: false, error: "cron must be a non-empty 5-field cron expression." };
|
|
if (isOneShotRoutineCron(cron)) {
|
|
return {
|
|
ok: false,
|
|
error: "Use runAt, delayMinutes, or delaySeconds for one-shot schedules.",
|
|
};
|
|
}
|
|
const intervalError = validateRepeatingCron(cron);
|
|
if (intervalError) return { ok: false, error: intervalError };
|
|
try {
|
|
const nextRunAt = nextCronDate(cron, new Date(), timezone);
|
|
return { ok: true, cron, nextRunAt, oneShot: false };
|
|
} catch {
|
|
return { ok: false, error: "cron must be a valid 5-field cron expression." };
|
|
}
|
|
}
|
|
|
|
const every = Number(input.every);
|
|
const unit = String(input.unit ?? "") as ScheduleUnit;
|
|
if (!Number.isFinite(every) || every <= 0 || !Number.isInteger(every)) {
|
|
return { ok: false, error: "every must be a positive whole number." };
|
|
}
|
|
if (unit === "seconds") {
|
|
return { ok: false, error: "minimum interval is 1 minute" };
|
|
}
|
|
if (!["minutes", "hours", "days"].includes(unit)) {
|
|
return { ok: false, error: 'unit must be "minutes", "hours", or "days".' };
|
|
}
|
|
if (unit === "minutes" && every < 1) {
|
|
return { ok: false, error: "minimum interval is 1 minute" };
|
|
}
|
|
const cron = cronFromPreset({ freq: "Interval", n: every, unit });
|
|
const intervalError = validateRepeatingCron(cron);
|
|
if (intervalError) return { ok: false, error: intervalError };
|
|
try {
|
|
const nextRunAt = nextCronDate(cron, new Date(), timezone);
|
|
return { ok: true, cron, nextRunAt, oneShot: false };
|
|
} catch {
|
|
return { ok: false, error: "every/unit produced an invalid cron expression." };
|
|
}
|
|
}
|
|
|
|
function validateRepeatingCron(cron: string): string | null {
|
|
const parts = cron.trim().split(/\s+/);
|
|
if (parts.length !== 5) return "cron must be a 5-field cron expression.";
|
|
const minuteExpr = parts[0] ?? "*";
|
|
const step = /^\*\/(\d+)$/.exec(minuteExpr);
|
|
if (step) {
|
|
const n = Number(step[1]);
|
|
if (!Number.isFinite(n) || n < 1 || !Number.isInteger(n)) {
|
|
return "minimum interval is 1 minute";
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
export interface ScheduleToolDeps {
|
|
prisma: PrismaClient;
|
|
events: ThreadEvents;
|
|
jobs: JobPublisher;
|
|
}
|
|
|
|
/** Persist and enqueue a bot routine that wakes in the originating thread. */
|
|
export async function createScheduleFromTool(
|
|
deps: ScheduleToolDeps,
|
|
input: {
|
|
spaceId: string;
|
|
botId: string;
|
|
userId: string;
|
|
threadId: string;
|
|
name: string;
|
|
prompt: string;
|
|
timezone?: string;
|
|
schedule: Record<string, unknown>;
|
|
},
|
|
) {
|
|
const name = input.name.trim();
|
|
const prompt = input.prompt.trim();
|
|
if (!name) return { error: "name is required." };
|
|
if (!prompt) return { error: "prompt is required." };
|
|
|
|
const timezone = String(input.timezone ?? "UTC");
|
|
const resolved = resolveScheduleTiming(input.schedule, timezone);
|
|
if (!resolved.ok) return { error: resolved.error };
|
|
|
|
const row = await deps.prisma.routine.create({
|
|
data: {
|
|
spaceId: input.spaceId,
|
|
botId: input.botId,
|
|
userId: input.userId,
|
|
threadId: input.threadId,
|
|
name,
|
|
prompt,
|
|
crons: [resolved.cron],
|
|
timezone,
|
|
notify: true,
|
|
active: true,
|
|
nextRunAt: resolved.nextRunAt,
|
|
},
|
|
});
|
|
|
|
try {
|
|
await deps.jobs.enqueue(routineWakeupJob(row.id, resolved.nextRunAt));
|
|
} catch {
|
|
try {
|
|
await deps.prisma.routine.delete({ where: { id: row.id } });
|
|
} catch {
|
|
// Do not soft-return while the row may still be active.
|
|
await deps.prisma.routine.update({
|
|
where: { id: row.id },
|
|
data: { active: false, nextRunAt: null },
|
|
});
|
|
}
|
|
return { error: "Could not schedule the reminder. Try again." };
|
|
}
|
|
|
|
try {
|
|
await deps.events.append({
|
|
spaceId: input.spaceId,
|
|
threadId: input.threadId,
|
|
botId: input.botId,
|
|
type: "routine.created",
|
|
payload: { name: row.name },
|
|
});
|
|
} catch {
|
|
// Match routines.create: the reminder is live even if the thread signal fails.
|
|
}
|
|
|
|
return {
|
|
ok: true as const,
|
|
routineId: row.id,
|
|
name: row.name,
|
|
cron: row.crons[0],
|
|
nextRunAt: row.nextRunAt?.toISOString() ?? null,
|
|
oneShot: resolved.oneShot,
|
|
};
|
|
}
|
|
|
|
/** List bot routines, optionally restricted to the current group thread. */
|
|
export async function listSchedulesFromTool(
|
|
deps: Pick<ScheduleToolDeps, "prisma">,
|
|
input: { spaceId: string; botId: string; userId: string; threadId?: string },
|
|
) {
|
|
const rows = await deps.prisma.routine.findMany({
|
|
where: {
|
|
spaceId: input.spaceId,
|
|
botId: input.botId,
|
|
userId: input.userId,
|
|
...(input.threadId ? { threadId: input.threadId } : {}),
|
|
},
|
|
orderBy: { createdAt: "desc" },
|
|
});
|
|
return {
|
|
routines: rows.map((row) => ({
|
|
routineId: row.id,
|
|
name: row.name,
|
|
prompt: row.prompt,
|
|
crons: row.crons,
|
|
active: row.active,
|
|
nextRunAt: row.nextRunAt?.toISOString() ?? null,
|
|
oneShot: isOneShotRoutineCrons(row.crons),
|
|
})),
|
|
};
|
|
}
|
|
|
|
/** Cancel a bot routine, optionally restricted to the current group thread. */
|
|
export async function cancelScheduleFromTool(
|
|
deps: ScheduleToolDeps,
|
|
input: {
|
|
spaceId: string;
|
|
botId: string;
|
|
userId: string;
|
|
threadId?: string;
|
|
routineId?: string;
|
|
name?: string;
|
|
},
|
|
) {
|
|
const routineId = input.routineId?.trim();
|
|
const name = input.name?.trim();
|
|
if (!routineId && !name) {
|
|
return { error: "Provide routineId or the exact schedule name to cancel." };
|
|
}
|
|
|
|
const existing = await deps.prisma.routine.findFirst({
|
|
where: {
|
|
spaceId: input.spaceId,
|
|
botId: input.botId,
|
|
userId: input.userId,
|
|
...(input.threadId ? { threadId: input.threadId } : {}),
|
|
...(routineId ? { id: routineId } : { name: name! }),
|
|
},
|
|
});
|
|
if (!existing) return { error: "Schedule not found." };
|
|
|
|
await deps.prisma.routine.delete({ where: { id: existing.id } });
|
|
await deps.jobs.cancel(routineJobKey(existing.id));
|
|
return { ok: true as const, routineId: existing.id, name: existing.name };
|
|
}
|