agent-office 0.4.6 → 0.4.8

package/dist/server/routes.js

@@ -81,11 +81,11 @@ export function generateSystemPrompt(name, status, humanName, humanDescription,
         `   expanded by the shell and your message will be garbled.`,
         ``,
         ` Manage scheduled tasks (optional)`,
-        `   agent-office worker cron \\`,
+        `   agent-office worker cron list \\`,
         `     ${token}`,
         ``,
-        ` Create a cron job (scheduled task)`,
-        `   agent-office worker cron create \\`,
+        ` Request a cron job (requires human approval)`,
+        `   agent-office worker cron request \\`,
         `     --name <job-name> \\`,
         `     --schedule "<cron-expression>" \\`,
         `     --message "<action-to-perform>" \\`,
@@ -97,9 +97,13 @@ export function generateSystemPrompt(name, status, humanName, humanDescription,
         `     --message "Prepare your standup update" \\`,
         `     --respond-to "${humanName} in the standup channel"`,
         ``,
-        `   The final injected message will be formatted as:`,
-        `     Action: <message>`,
-        `     Who to respond to when done: <respond-to>`,
+        `   NOTE: Cron requests must be approved by ${humanName}`,
+        `   before they become active. You will be notified when`,
+        `   your request is approved or rejected.`,
+        ``,
+        ` Check the status of your cron requests`,
+        `   agent-office worker cron requests \\`,
+        `     ${token}`,
         ``,
         `════════════════════════════════════════════════════════`,
         ` IMPORTANT: BASH ESCAPING IN COMMAND ARGUMENTS`,
@@ -145,9 +149,10 @@ export function generateSystemPrompt(name, status, humanName, humanDescription,
         `   messages at any time and those will appear here in`,
         `   your session just like this one. You can reach them`,
         `   by sending a message to --name ${humanName}.`,
-        ` - Optional: Set up recurring scheduled tasks with cron`,
-        `   jobs. Run 'agent-office worker cron list ${token}' to`,
-        `   get started.`,
+        ` - Optional: Request recurring scheduled tasks with cron`,
+        `   jobs. Run 'agent-office worker cron request' to submit`,
+        `   a request. Your human manager must approve it before`,
+        `   it becomes active.`,
         ``,
         `════════════════════════════════════════════════════════`,
         ` IMPORTANT: WAIT FOR A MESSAGE BEFORE DOING ANYTHING`,
@@ -853,6 +858,145 @@ export function createRouter(storage, agenticCodingServer, serverUrl, scheduler)
             res.status(500).json({ error: "Internal server error" });
         }
     });
+    // ── Cron Requests (manage-side: view, approve, reject) ──
+    router.get("/cron-requests", async (req, res) => {
+        try {
+            const { status, session_name } = req.query;
+            const filters = {};
+            if (status)
+                filters.status = status;
+            if (session_name)
+                filters.sessionName = session_name;
+            const rows = await storage.listCronRequests(filters);
+            res.json(rows.map((r) => ({
+                ...r,
+                requested_at: r.requested_at.toISOString(),
+                reviewed_at: r.reviewed_at?.toISOString() ?? null,
+            })));
+        }
+        catch (err) {
+            console.error("GET /cron-requests error:", err);
+            res.status(500).json({ error: "Internal server error" });
+        }
+    });
+    router.post("/cron-requests/:id/approve", async (req, res) => {
+        const id = parseInt(String(req.params.id), 10);
+        if (isNaN(id)) {
+            res.status(400).json({ error: "Invalid cron request id" });
+            return;
+        }
+        const { notes } = req.body;
+        try {
+            const request = await storage.getCronRequestById(id);
+            if (!request) {
+                res.status(404).json({ error: "Cron request not found" });
+                return;
+            }
+            if (request.status !== "pending") {
+                res.status(409).json({ error: `Cron request already ${request.status}` });
+                return;
+            }
+            const { humanName } = await loadHumanConfig(storage);
+            // Update request status
+            const updated = await storage.updateCronRequestStatus(id, "approved", humanName, notes);
+            // Create the actual cron job
+            const cronJob = await storage.createCronJob(request.name, request.session_name, request.schedule, request.timezone, request.message);
+            scheduler.addCronJob(cronJob);
+            // Notify the worker that their request was approved
+            const notificationBody = `Your cron job request "${request.name}" (schedule: ${request.schedule}) has been approved and is now active.${notes ? `\n\nNote from manager: ${notes}` : ""}`;
+            await storage.createMessage(humanName, request.session_name, notificationBody);
+            // Inject notification into the worker's session
+            const session = await storage.getSessionByName(request.session_name);
+            if (session) {
+                const token = `${session.agent_code}@${serverUrl}`;
+                const system = generateSystemPrompt(session.name, session.status, humanName, (await storage.getConfig('human_description')) ?? '', token);
+                const injectText = `[Cron Request Approved] Your cron job request "${request.name}" has been approved and scheduled.${notes ? ` Manager note: ${notes}` : ""}`;
+                try {
+                    await agenticCodingServer.sendMessage(session.session_id, injectText, session.agent, system);
+                }
+                catch {
+                    // If injection fails, the message is still in their mailbox
+                }
+            }
+            const nextRun = cronJob.enabled ? (() => {
+                try {
+                    const options = {};
+                    if (cronJob.timezone)
+                        options.timezone = cronJob.timezone;
+                    const cron = new CronerInstance(cronJob.schedule, options);
+                    const next = cron.nextRun();
+                    return next ? next.toISOString() : null;
+                }
+                catch {
+                    return null;
+                }
+            })() : null;
+            res.json({
+                request: {
+                    ...updated,
+                    requested_at: updated?.requested_at.toISOString(),
+                    reviewed_at: updated?.reviewed_at?.toISOString() ?? null,
+                },
+                cron_job: {
+                    ...cronJob,
+                    next_run: nextRun,
+                    last_run: cronJob.last_run?.toISOString() ?? null,
+                    created_at: cronJob.created_at.toISOString(),
+                },
+            });
+        }
+        catch (err) {
+            console.error("POST /cron-requests/:id/approve error:", err);
+            res.status(500).json({ error: "Internal server error" });
+        }
+    });
+    router.post("/cron-requests/:id/reject", async (req, res) => {
+        const id = parseInt(String(req.params.id), 10);
+        if (isNaN(id)) {
+            res.status(400).json({ error: "Invalid cron request id" });
+            return;
+        }
+        const { notes } = req.body;
+        try {
+            const request = await storage.getCronRequestById(id);
+            if (!request) {
+                res.status(404).json({ error: "Cron request not found" });
+                return;
+            }
+            if (request.status !== "pending") {
+                res.status(409).json({ error: `Cron request already ${request.status}` });
+                return;
+            }
+            const { humanName } = await loadHumanConfig(storage);
+            // Update request status
+            const updated = await storage.updateCronRequestStatus(id, "rejected", humanName, notes);
+            // Notify the worker that their request was rejected
+            const notificationBody = `Your cron job request "${request.name}" (schedule: ${request.schedule}) has been rejected.${notes ? `\n\nReason: ${notes}` : ""}`;
+            await storage.createMessage(humanName, request.session_name, notificationBody);
+            // Inject notification into the worker's session
+            const session = await storage.getSessionByName(request.session_name);
+            if (session) {
+                const token = `${session.agent_code}@${serverUrl}`;
+                const system = generateSystemPrompt(session.name, session.status, humanName, (await storage.getConfig('human_description')) ?? '', token);
+                const injectText = `[Cron Request Rejected] Your cron job request "${request.name}" has been rejected.${notes ? ` Reason: ${notes}` : ""}`;
+                try {
+                    await agenticCodingServer.sendMessage(session.session_id, injectText, session.agent, system);
+                }
+                catch {
+                    // If injection fails, the message is still in their mailbox
+                }
+            }
+            res.json({
+                ...updated,
+                requested_at: updated?.requested_at.toISOString(),
+                reviewed_at: updated?.reviewed_at?.toISOString() ?? null,
+            });
+        }
+        catch (err) {
+            console.error("POST /cron-requests/:id/reject error:", err);
+            res.status(500).json({ error: "Internal server error" });
+        }
+    });
     return router;
 }
 export function createWorkerRouter(storage, agenticCodingServer, serverUrl) {
@@ -1009,7 +1153,32 @@ export function createWorkerRouter(storage, agenticCodingServer, serverUrl) {
             res.status(500).json({ error: "Internal server error" });
         }
     });
-    router.post("/worker/crons", async (req, res) => {
+    // ── Cron Requests (worker can request, human must approve) ──
+    router.get("/worker/cron-requests", async (req, res) => {
+        const { code } = req.query;
+        if (!code || typeof code !== "string") {
+            res.status(400).json({ error: "code query parameter is required" });
+            return;
+        }
+        const session = await storage.getSessionByAgentCode(code);
+        if (!session) {
+            res.status(401).json({ error: "Invalid agent code" });
+            return;
+        }
+        try {
+            const rows = await storage.listCronRequests({ sessionName: session.name });
+            res.json(rows.map((r) => ({
+                ...r,
+                requested_at: r.requested_at.toISOString(),
+                reviewed_at: r.reviewed_at?.toISOString() ?? null,
+            })));
+        }
+        catch (err) {
+            console.error("GET /worker/cron-requests error:", err);
+            res.status(500).json({ error: "Internal server error" });
+        }
+    });
+    router.post("/worker/cron-requests", async (req, res) => {
         const { code } = req.query;
         const { name, schedule, message, timezone } = req.body;
         if (!code || typeof code !== "string") {
@@ -1036,7 +1205,6 @@ export function createWorkerRouter(storage, agenticCodingServer, serverUrl) {
         const trimmedName = name.trim();
         const trimmedSchedule = schedule.trim();
         const trimmedMessage = message.trim();
-        const sessionName = session.name;
         try {
             new CronerInstance(trimmedSchedule);
         }
@@ -1053,35 +1221,16 @@ export function createWorkerRouter(storage, agenticCodingServer, serverUrl) {
                 return;
             }
         }
-        const existing = await storage.cronJobExistsForSession(trimmedName, sessionName);
-        if (existing) {
-            res.status(409).json({ error: `Cron job "${trimmedName}" already exists` });
-            return;
-        }
         try {
-            const cronJobrow = await storage.createCronJob(trimmedName, sessionName, trimmedSchedule, timezone ?? null, trimmedMessage);
-            const nextRun = cronJobrow.enabled ? (() => {
-                try {
-                    const options = {};
-                    if (cronJobrow.timezone)
-                        options.timezone = cronJobrow.timezone;
-                    const cronJob = new CronerInstance(cronJobrow.schedule, options);
-                    const next = cronJob.nextRun();
-                    return next ? next.toISOString() : null;
-                }
-                catch {
-                    return null;
-                }
-            })() : null;
+            const request = await storage.createCronRequest(trimmedName, session.name, trimmedSchedule, timezone ?? null, trimmedMessage);
             res.status(201).json({
-                ...cronJobrow,
-                next_run: nextRun,
-                last_run: cronJobrow?.last_run?.toISOString() ?? null,
-                created_at: cronJobrow.created_at.toISOString(),
+                ...request,
+                requested_at: request.requested_at.toISOString(),
+                reviewed_at: request.reviewed_at?.toISOString() ?? null,
             });
         }
         catch (err) {
-            console.error("POST /worker/crons error:", err);
+            console.error("POST /worker/cron-requests error:", err);
             res.status(500).json({ error: "Internal server error" });
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-office",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "An office for your AI agents",
   "type": "module",
   "license": "MIT",