palmier 0.6.6 → 0.6.8

package/palmier-server/server/src/index.ts

@@ -5,12 +5,13 @@ import express from "express";
 import helmet from "helmet";
 import { pool, initDb } from "./db.js";
 import { connectNats, getNatsConnection } from "./nats.js";
-import { sendPushToHost } from "./push.js";
-
 import { StringCodec } from "nats";
 
 import hostsRoutes from "./routes/hosts.js";
 import pushRoutes from "./routes/push.js";
+import fcmRoutes from "./routes/fcm.js";
+import { notifyClients } from "./notify.js";
+import { sendFcmToClients, sendFcmToDevice } from "./fcm.js";
 
 const PORT = parseInt(process.env.PORT || "3000", 10);
 
@@ -42,28 +43,34 @@ async function main(): Promise<void> {
             running_state?: string;
             name?: string;
             run_id?: string;
+            session_id?: string;
+            description?: string;
+            agent_name?: string;
             required_permissions?: Array<{ name: string; description: string }>;
-            input_descriptions?: string[];
+            input_questions?: string[];
             result_file?: string;
           };
 
           if (data.event_type === "confirm-request") {
-            await sendPushToHost(hostId, {
+            await notifyClients(hostId, {
               type: "confirm",
-              task_id: taskId,
+              title: "Confirmation Required",
+              body: data.description || "A task requires confirmation to run.",
               host_id: hostId,
+              session_id: data.session_id,
+              agent_name: data.agent_name,
             });
           } else if (data.event_type === "confirm-resolved") {
-            await sendPushToHost(hostId, {
+            await notifyClients(hostId, {
               type: "confirm-dismiss",
-              task_id: taskId,
               host_id: hostId,
+              session_id: data.session_id,
             });
           } else if (data.event_type === "permission-request") {
             const taskLabel = data.name
               ? data.name.length > 60 ? data.name.slice(0, 60) + "…" : data.name
               : "A task";
-            await sendPushToHost(hostId, {
+            await notifyClients(hostId, {
               type: "permission",
               title: "Permission Required",
               body: `${taskLabel} needs additional permissions to continue.`,
@@ -71,27 +78,25 @@ async function main(): Promise<void> {
               host_id: hostId,
             });
           } else if (data.event_type === "permission-resolved") {
-            await sendPushToHost(hostId, {
+            await notifyClients(hostId, {
               type: "permission-dismiss",
               task_id: taskId,
               host_id: hostId,
             });
           } else if (data.event_type === "input-request") {
-            const taskLabel = data.name
-              ? data.name.length > 60 ? data.name.slice(0, 60) + "…" : data.name
-              : "A task";
-            await sendPushToHost(hostId, {
+            await notifyClients(hostId, {
               type: "input",
               title: "Input Required",
-              body: `${taskLabel} needs your input to continue.`,
-              task_id: taskId,
+              body: "A task needs your input to continue.",
               host_id: hostId,
+              session_id: data.session_id,
+              agent_name: data.agent_name,
             });
           } else if (data.event_type === "input-resolved") {
-            await sendPushToHost(hostId, {
+            await notifyClients(hostId, {
               type: "input-dismiss",
-              task_id: taskId,
               host_id: hostId,
+              session_id: data.session_id,
             });
           } else if (data.event_type === "report-generated" || (data.event_type === "running-state" && data.running_state === "failed")) {
             const label = data.name;
@@ -100,7 +105,7 @@ async function main(): Promise<void> {
               : "Task";
             const isFailure = data.running_state === "failed";
             const body = isFailure ? `${taskLabel} — failed` : `${taskLabel} — report ready`;
-            await sendPushToHost(hostId, {
+            await notifyClients(hostId, {
               type: isFailure ? "fail" : "complete",
               title: "Palmier",
               body,
@@ -132,7 +137,8 @@ async function main(): Promise<void> {
             hostId: string;
             title: string;
             body: string;
-            task_id?: string;
+            session_id?: string;
+            agent_name?: string;
           };
 
           // Validate hostId in subject matches payload
@@ -144,12 +150,17 @@ async function main(): Promise<void> {
             continue;
           }
 
+          // If no agent_name, session_id is a taskId — include as task_id for deep-linking
+          const isTask = data.session_id && !data.agent_name;
+
           console.log(`[Push] Sending notification for host ${data.hostId}`);
-          await sendPushToHost(data.hostId, {
+          await notifyClients(data.hostId, {
             type: "notification",
+            host_id: data.hostId,
             title: data.title,
             body: data.body,
-            ...(data.task_id ? { task_id: data.task_id } : {}),
+            ...(isTask ? { task_id: data.session_id } : {}),
+            agent_name: data.agent_name,
           });
 
           if (msg.reply) {
@@ -167,19 +178,88 @@ async function main(): Promise<void> {
     }
   })();
 
+  // Subscribe to FCM geolocation requests from hosts
+  (async () => {
+    try {
+      const conn = await getNatsConnection();
+      const sub = conn.subscribe("host.*.fcm.geolocation");
+      console.log("Listening for FCM geolocation requests");
+
+      for await (const msg of sub) {
+        try {
+          const data = JSON.parse(sc.decode(msg.data)) as {
+            hostId: string;
+            requestId: string;
+            fcmToken?: string;
+          };
+
+          const subjectHostId = msg.subject.split(".")[1];
+          if (data.hostId !== subjectHostId) {
+            if (msg.reply) {
+              msg.respond(sc.encode(JSON.stringify({ error: "hostId mismatch" })));
+            }
+            continue;
+          }
+
+          const fcmPayload = {
+            type: "geolocation-request",
+            requestId: data.requestId,
+            hostId: data.hostId,
+          };
+
+          console.log(`[FCM] Sending geolocation request for host ${data.hostId}`);
+          if (data.fcmToken) {
+            await sendFcmToDevice(data.fcmToken, fcmPayload);
+          } else {
+            await sendFcmToClients(data.hostId, fcmPayload);
+          }
+
+          if (msg.reply) {
+            msg.respond(sc.encode(JSON.stringify({ ok: true })));
+          }
+        } catch (err) {
+          console.error("[FCM] Error handling geolocation request:", err);
+          if (msg.reply) {
+            msg.respond(sc.encode(JSON.stringify({ error: String(err) })));
+          }
+        }
+      }
+    } catch (err) {
+      console.error("Failed to subscribe to FCM geolocation requests:", err);
+    }
+  })();
+
   // Create Express app
   const app = express();
 
   app.use(
     helmet({
       contentSecurityPolicy: false,
+      crossOriginResourcePolicy: false,
     })
   );
+
+  // CORS for Capacitor Android app (requests from capacitor://localhost)
+  app.use((req, res, next) => {
+    const origin = req.headers.origin;
+    if (origin && (origin.startsWith("capacitor://") || origin === "https://localhost" || origin.startsWith("http://localhost"))) {
+      res.setHeader("Access-Control-Allow-Origin", origin);
+      res.setHeader("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, OPTIONS");
+      res.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+    }
+    if (req.method === "OPTIONS") {
+      res.sendStatus(204);
+      return;
+    }
+    next();
+  });
+
   app.use(express.json());
 
   // Mount routes
   app.use("/api/hosts", hostsRoutes);
   app.use("/api/push", pushRoutes);
+  app.use("/api/fcm", fcmRoutes);
 
   // Public NATS config endpoint (used by PWA for pairing)
   app.get("/api/config", (_req, res) => {

package/palmier-server/server/src/notify.ts

@@ -0,0 +1,34 @@
+import { sendPushToClients } from "./push.js";
+import { sendFcmToClients } from "./fcm.js";
+
+export interface NotificationPayload {
+  type: string;
+  host_id: string;
+  title?: string;
+  body?: string;
+  task_id?: string;
+  session_id?: string;
+  run_id?: string;
+  result_file?: string;
+  agent_name?: string;
+}
+
+function stringifyPayload(payload: NotificationPayload): Record<string, string> {
+  const result: Record<string, string> = {};
+  for (const [key, value] of Object.entries(payload)) {
+    if (value !== undefined && value !== null) {
+      result[key] = String(value);
+    }
+  }
+  return result;
+}
+
+export async function notifyClients(
+  hostId: string,
+  payload: NotificationPayload
+): Promise<void> {
+  await Promise.allSettled([
+    sendPushToClients(hostId, payload),
+    sendFcmToClients(hostId, stringifyPayload(payload)),
+  ]);
+}

package/palmier-server/server/src/push.ts

@@ -19,7 +19,7 @@ function ensureConfigured(): void {
   configured = true;
 }
 
-export async function sendPushToHost(
+export async function sendPushToClients(
   hostId: string,
   payload: object | string
 ): Promise<void> {

package/palmier-server/server/src/routes/fcm.ts

@@ -0,0 +1,64 @@
+import { Router, Request, Response } from "express";
+import type { Router as RouterType } from "express";
+import { pool } from "../db.js";
+import { getNatsConnection } from "../nats.js";
+import { StringCodec } from "nats";
+
+const router: RouterType = Router();
+
+// POST /api/fcm/register - Register or refresh an FCM token for a host
+router.post("/register", async (req: Request, res: Response) => {
+  try {
+    const { hostId, fcmToken, deviceLabel } = req.body;
+
+    if (!hostId || !fcmToken) {
+      res.status(400).json({ error: "hostId and fcmToken are required" });
+      return;
+    }
+
+    await pool.query(
+      `INSERT INTO fcm_tokens (host_id, fcm_token, device_label, updated_at)
+       VALUES ($1, $2, $3, NOW())
+       ON CONFLICT (host_id, fcm_token)
+       DO UPDATE SET device_label = EXCLUDED.device_label, updated_at = NOW()`,
+      [hostId, fcmToken, deviceLabel || null]
+    );
+
+    res.status(201).json({ message: "FCM token registered" });
+  } catch (err) {
+    console.error("FCM register error:", err);
+    res.status(500).json({ error: "Internal server error" });
+  }
+});
+
+// POST /api/fcm/geolocation-response - Receive location from Android device, forward via NATS
+router.post("/geolocation-response", async (req: Request, res: Response) => {
+  try {
+    const { requestId, hostId, latitude, longitude, accuracy, timestamp, error } = req.body;
+
+    if (!requestId || !hostId) {
+      res.status(400).json({ error: "requestId and hostId are required" });
+      return;
+    }
+
+    const conn = await getNatsConnection();
+    const sc = StringCodec();
+    const subject = `host.${hostId}.geolocation.${requestId}`;
+
+    if (error) {
+      conn.publish(subject, sc.encode(JSON.stringify({ error })));
+    } else {
+      conn.publish(
+        subject,
+        sc.encode(JSON.stringify({ latitude, longitude, accuracy, timestamp }))
+      );
+    }
+
+    res.json({ message: "Location forwarded" });
+  } catch (err) {
+    console.error("FCM geolocation-response error:", err);
+    res.status(500).json({ error: "Internal server error" });
+  }
+});
+
+export default router;

package/palmier-server/server/src/routes/push.ts

@@ -66,14 +66,15 @@ router.get("/vapid-key", (_req, res: Response) => {
   res.json({ publicKey });
 });
 
-// POST /api/push/respond - Respond to a pending confirmation via NATS request-reply
+// POST /api/push/respond - Respond to a pending request via NATS request-reply
 router.post("/respond", async (req: Request, res: Response) => {
   try {
-    const { task_id, host_id, response } = req.body;
+    const { task_id, session_id, host_id, response } = req.body;
+    const id = session_id || task_id;
 
-    if (!task_id || !host_id || !response) {
+    if (!id || !host_id || !response) {
       res.status(400).json({
-        error: "task_id, host_id, and response are required",
+        error: "host_id, response, and session_id (or task_id for permissions) are required",
       });
       return;
     }
@@ -81,7 +82,7 @@ router.post("/respond", async (req: Request, res: Response) => {
     const conn = await getNatsConnection();
     const sc = StringCodec();
     const subject = `host.${host_id}.rpc.task.user_input`;
-    const payload = sc.encode(JSON.stringify({ id: task_id, value: [response] }));
+    const payload = sc.encode(JSON.stringify({ id, value: [response] }));
 
     const reply = await conn.request(subject, payload, { timeout: 5000 });
     const result = JSON.parse(sc.decode(reply.data));

package/palmier-server/spec.md

@@ -12,9 +12,11 @@ The host supports **Linux** (systemd) and **Windows** (Task Scheduler for both d
 
 ### 1.2 Components
 
-* **Host Binary (Node.js):** Runs persistently on the user's host machine as a NATS + HTTP RPC handler. Manages file system operations (task CRUD), OS-level scheduling (systemd), and task generation. Provides a CLI with commands: `palmier init` (provisioning), `palmier pair` (generate pairing code for device pairing), `palmier clients` (manage client tokens), `palmier run <task-id>` (executes a task via the configured agent tool), `palmier uninstall` (stop daemon and remove all scheduled tasks), and `palmier serve` (persistent RPC handler, default command). The `serve` process always starts a local HTTP server (bound to `127.0.0.1` by default, or `0.0.0.0` if LAN mode is enabled) alongside the NATS transport. Localhost-only HTTP endpoints (`/notify`, `/request-input`, `/request-confirmation`, `/request-permission`) are used by agents and the `palmier run` process for interactive flows via held HTTP connections. `palmier run` is a short-lived process invoked by systemd. Task execution is abstracted through an `AgentTool` interface (`src/agents/agent.ts`) so different AI CLI tools can be supported — each agent implements `getPlanGenerationCommandLine()`, `getTaskRunCommandLine()`, and `init()`. The task's `agent` field (e.g., `"claude"`) selects which agent is used.
+* **Host Binary (Node.js):** Runs persistently on the user's host machine as a NATS + HTTP RPC handler. Manages file system operations (task CRUD), OS-level scheduling (systemd), and task generation. Provides a CLI with commands: `palmier init` (provisioning), `palmier pair` (generate pairing code for device pairing), `palmier clients` (manage client tokens), `palmier run <task-id>` (executes a task via the configured agent tool), `palmier uninstall` (stop daemon and remove all scheduled tasks), and `palmier serve` (persistent RPC handler, default command). The `serve` process always starts a local HTTP server (bound to `127.0.0.1` by default, or `0.0.0.0` if LAN mode is enabled) alongside the NATS transport. Exposes a localhost-only MCP server at `/mcp` (streamable HTTP transport) with tools: `notify`, `request-input`, `request-confirmation`, `device-geolocation`. The same tools are auto-generated as REST endpoints (`/notify`, `/request-input`, etc.) from a shared tool registry — zero duplication. REST endpoints require `taskId` in the body for session identification. `/request-permission` remains a separate endpoint (not part of the MCP tool registry). MCP sessions track agent names from `initialize` clientInfo for logging and UI display. `palmier run` is a short-lived process invoked by systemd. Task execution is abstracted through an `AgentTool` interface (`src/agents/agent.ts`) so different AI CLI tools can be supported — each agent implements `getPlanGenerationCommandLine()`, `getTaskRunCommandLine()`, and `init()`. The task's `agent` field (e.g., `"claude"`) selects which agent is used.
 
-* **Web Server (Node.js):** Serves the PWA assets (React) via `app.palmier.me` (Cloudflare proxied), manages Web Push VAPID keys, and provides host registration. Uses **PostgreSQL** for persistent storage (host registrations, push subscriptions). Connects to NATS via TCP to subscribe to `host-event.>` for sending push notifications (confirmations, dismissals, completion/failure). For `POST /api/push/respond` (confirmation responses via push notification action buttons), the Web Server forwards the response to the host via the `task.user_input` NATS RPC. Subscribes to `host.*.push.send` NATS subjects to relay push notification requests from the host CLI. Co-located with the NATS server on the same machine.
+* **Web Server (Node.js):** Serves the PWA assets (React) via `app.palmier.me` (Cloudflare proxied), manages Web Push VAPID keys, and provides host registration. Uses **PostgreSQL** for persistent storage (host registrations, push subscriptions, FCM tokens). Connects to NATS via TCP to subscribe to `host-event.>` for sending push notifications (confirmations, dismissals, completion/failure). For `POST /api/push/respond` (confirmation responses via push notification action buttons), the Web Server forwards the response to the host via the `task.user_input` NATS RPC. Subscribes to `host.*.push.send` NATS subjects to relay push notification requests from the host CLI. Subscribes to `host.*.fcm.geolocation` to relay device geolocation requests via FCM. Co-located with the NATS server on the same machine.
+
+* **Android App (Capacitor):** Native Android wrapper for the PWA. Provides FCM push messaging for receiving data messages in the background and `FusedLocationProviderClient` for GPS access. When a geolocation request arrives via FCM, a foreground service briefly starts to fetch the GPS fix and POST the result back to the Web Server. See the `palmier-android` repo.
 
 * **PWA (React):** The user-facing frontend, primarily targeting mobile devices. Connects to the NATS server via **WebSockets** at `nats.palmier.me` (DNS only, not Cloudflare proxied, to avoid interference with persistent connections). No user accounts — paired hosts are stored in localStorage.
 

package/src/agents/agent-instructions.md

@@ -1,4 +1,4 @@
-You are an AI agent executing a task on behalf of the user via the Palmier platform. Follow these instructions carefully.
+You are an AI agent executing a task on behalf of the user. Follow these instructions carefully.
 
 ## Reporting Output
 
@@ -13,24 +13,16 @@ When you are done, output exactly one of these markers as the very last line (no
 
 ## Permissions
 
-If the task fails because a tool was denied or you lack the required permissions, print each required permission on its own line using this exact format:
+Whenever a tool you are trying to use is denied or you lack the required permissions, print each required permission on its own line using this exact format:
 [PALMIER_PERMISSION] <tool_name> | <description>
 
 ## HTTP Endpoints
 
-The following HTTP endpoints are available at http://localhost:{{PORT}} during task execution. Use curl to call them.
+{{ENDPOINT_DOCS}}
 
-**Requesting user input** — When you need information from the user (credentials, answers to questions, preferences, clarifications, etc.), do not guess, fail, or prompt via stdout, even in a non-interactive environment. Instead, POST to `/request-input` with:
-```json
-{"taskId":"{{TASK_ID}}","descriptions":["question 1","question 2"]}
-```
-The request blocks until the user responds. Response: `{"values":["answer1","answer2"]}` on success, or `{"aborted":true}` if the user declines.
-
-**Sending push notifications** — To notify the user, POST to `/notify` with:
-```json
-{"taskId":"{{TASK_ID}}","title":"...","body":"..."}
-```
+The task to execute follows below:
 
 ---
 
-The task to execute follows below.
+{{TASK_DESCRIPTION}}
+

package/src/agents/aider.ts

@@ -15,7 +15,7 @@ export class Aider implements AgentTool {
 
   getTaskRunCommandLine(task: ParsedTask, followupPrompt?: string, extraPermissions?: RequiredPermission[] | "yolo"): CommandLine {
     const yolo = extraPermissions === "yolo";
-    const prompt = followupPrompt ?? (getAgentInstructions(task.frontmatter.id, yolo || !this.supportsPermissions) + "\n\n" + (task.body || task.frontmatter.user_prompt));
+    const prompt = followupPrompt ?? getAgentInstructions(task, yolo || !this.supportsPermissions);
     const args = [];
 
     if (yolo) {

package/src/agents/claude.ts

@@ -15,7 +15,7 @@ export class ClaudeAgent implements AgentTool {
 
   getTaskRunCommandLine(task: ParsedTask, followupPrompt?: string, extraPermissions?: RequiredPermission[] | "yolo"): CommandLine {
     const yolo = extraPermissions === "yolo";
-    const prompt = followupPrompt ?? (getAgentInstructions(task.frontmatter.id, yolo || !this.supportsPermissions) + "\n\n" + (task.body || task.frontmatter.user_prompt));
+    const prompt = followupPrompt ?? getAgentInstructions(task, yolo || !this.supportsPermissions);
     const args = ["--permission-mode", yolo ? "bypassPermissions" : "acceptEdits", "-p"];
 
     if (!yolo) {

package/src/agents/cline.ts

@@ -15,7 +15,7 @@ export class Cline implements AgentTool {
 
   getTaskRunCommandLine(task: ParsedTask, followupPrompt?: string, extraPermissions?: RequiredPermission[] | "yolo"): CommandLine {
     const yolo = extraPermissions === "yolo";
-    const prompt = followupPrompt ?? (getAgentInstructions(task.frontmatter.id, yolo || !this.supportsPermissions) + "\n\n" + (task.body || task.frontmatter.user_prompt));
+    const prompt = followupPrompt ?? getAgentInstructions(task, yolo || !this.supportsPermissions);
     const args = [];
 
     if (yolo) {

package/src/agents/codex.ts

@@ -15,7 +15,7 @@ export class CodexAgent implements AgentTool {
 
   getTaskRunCommandLine(task: ParsedTask, followupPrompt?: string, extraPermissions?: RequiredPermission[] | "yolo"): CommandLine {
     const yolo = extraPermissions === "yolo";
-    const prompt = followupPrompt ?? (getAgentInstructions(task.frontmatter.id, yolo || !this.supportsPermissions) + "\n\n" + (task.body || task.frontmatter.user_prompt));
+    const prompt = followupPrompt ?? getAgentInstructions(task, yolo || !this.supportsPermissions);
     const args = ["exec", "--skip-git-repo-check", "--sandbox", yolo ? "danger-full-access" : "workspace-write"];
 
     if (!yolo) {

package/src/agents/copilot.ts

@@ -15,7 +15,7 @@ export class CopilotAgent implements AgentTool {
 
   getTaskRunCommandLine(task: ParsedTask, followupPrompt?: string, extraPermissions?: RequiredPermission[] | "yolo"): CommandLine {
     const yolo = extraPermissions === "yolo";
-    const prompt = followupPrompt ?? (getAgentInstructions(task.frontmatter.id, yolo || !this.supportsPermissions) + "\n\n" + (task.body || task.frontmatter.user_prompt));
+    const prompt = followupPrompt ?? getAgentInstructions(task, yolo || !this.supportsPermissions);
     const args = ["-p", prompt];
 
     if (yolo) {

package/src/agents/cursor.ts

@@ -15,7 +15,7 @@ export class Cursor implements AgentTool {
 
   getTaskRunCommandLine(task: ParsedTask, followupPrompt?: string, extraPermissions?: RequiredPermission[] | "yolo"): CommandLine {
     const yolo = extraPermissions === "yolo";
-    const prompt = followupPrompt ?? (getAgentInstructions(task.frontmatter.id, yolo || !this.supportsPermissions) + "\n\n" + (task.body || task.frontmatter.user_prompt));
+    const prompt = followupPrompt ?? getAgentInstructions(task, yolo || !this.supportsPermissions);
     const args = [];
 
     if (yolo) {

package/src/agents/deepagents.ts

@@ -15,7 +15,7 @@ export class DeepAgents implements AgentTool {
 
   getTaskRunCommandLine(task: ParsedTask, followupPrompt?: string, extraPermissions?: RequiredPermission[] | "yolo"): CommandLine {
     const yolo = extraPermissions === "yolo";
-    const prompt = followupPrompt ?? (getAgentInstructions(task.frontmatter.id, yolo || !this.supportsPermissions) + "\n\n" + (task.body || task.frontmatter.user_prompt));
+    const prompt = followupPrompt ?? getAgentInstructions(task, yolo || !this.supportsPermissions);
     const args = [];
 
     if (yolo) {

package/src/agents/droid.ts

@@ -15,7 +15,7 @@ export class DroidAgent implements AgentTool {
 
   getTaskRunCommandLine(task: ParsedTask, followupPrompt?: string, extraPermissions?: RequiredPermission[] | "yolo"): CommandLine {
     const yolo = extraPermissions === "yolo";
-    const prompt = followupPrompt ?? (getAgentInstructions(task.frontmatter.id, yolo || !this.supportsPermissions) + "\n\n" + (task.body || task.frontmatter.user_prompt));
+    const prompt = followupPrompt ?? getAgentInstructions(task, yolo || !this.supportsPermissions);
     const args = ["exec", "--session-id", task.frontmatter.id];
 
     if (yolo) {

package/src/agents/gemini.ts

@@ -15,7 +15,7 @@ export class GeminiAgent implements AgentTool {
 
   getTaskRunCommandLine(task: ParsedTask, followupPrompt?: string, extraPermissions?: RequiredPermission[] | "yolo"): CommandLine {
     const yolo = extraPermissions === "yolo";
-    const prompt = followupPrompt ?? (getAgentInstructions(task.frontmatter.id, yolo || !this.supportsPermissions) + "\n\n" + (task.body || task.frontmatter.user_prompt));
+    const prompt = followupPrompt ?? getAgentInstructions(task, yolo || !this.supportsPermissions);
     const args = ["--approval-mode", yolo ? "yolo" : "auto_edit"];
 
     if (!yolo) {

package/src/agents/goose.ts

@@ -15,7 +15,7 @@ export class GooseAgent implements AgentTool {
 
   getTaskRunCommandLine(task: ParsedTask, followupPrompt?: string, extraPermissions?: RequiredPermission[] | "yolo"): CommandLine {
     const yolo = extraPermissions === "yolo";
-    const prompt = followupPrompt ?? (getAgentInstructions(task.frontmatter.id, yolo || !this.supportsPermissions) + "\n\n" + (task.body || task.frontmatter.user_prompt));
+    const prompt = followupPrompt ?? getAgentInstructions(task, yolo || !this.supportsPermissions);
     const args = ["run"];
 
     if (followupPrompt) {args.push("--resume");} // continue mode for followups

package/src/agents/hermes.ts

@@ -15,7 +15,7 @@ export class Hermes implements AgentTool {
 
   getTaskRunCommandLine(task: ParsedTask, followupPrompt?: string, extraPermissions?: RequiredPermission[] | "yolo"): CommandLine {
     const yolo = extraPermissions === "yolo";
-    const prompt = followupPrompt ?? (getAgentInstructions(task.frontmatter.id, yolo || !this.supportsPermissions) + "\n\n" + (task.body || task.frontmatter.user_prompt));
+    const prompt = followupPrompt ?? getAgentInstructions(task, yolo || !this.supportsPermissions);
     const args = ["chat"];
 
     if (yolo) {

package/src/agents/kimi.ts

@@ -15,7 +15,7 @@ export class KimiAgent implements AgentTool {
 
   getTaskRunCommandLine(task: ParsedTask, followupPrompt?: string, extraPermissions?: RequiredPermission[] | "yolo"): CommandLine {
     const yolo = extraPermissions === "yolo";
-    const prompt = followupPrompt ?? (getAgentInstructions(task.frontmatter.id, yolo || !this.supportsPermissions) + "\n\n" + (task.body || task.frontmatter.user_prompt));
+    const prompt = followupPrompt ?? getAgentInstructions(task, yolo || !this.supportsPermissions);
     const args = [];
 
     if (yolo) {

package/src/agents/kiro.ts

@@ -15,7 +15,7 @@ export class Kiro implements AgentTool {
 
   getTaskRunCommandLine(task: ParsedTask, followupPrompt?: string, extraPermissions?: RequiredPermission[] | "yolo"): CommandLine {
     const yolo = extraPermissions === "yolo";
-    const prompt = followupPrompt ?? (getAgentInstructions(task.frontmatter.id, yolo || !this.supportsPermissions) + "\n\n" + (task.body || task.frontmatter.user_prompt));
+    const prompt = followupPrompt ?? getAgentInstructions(task, yolo || !this.supportsPermissions);
     const args = [];
 
     if (yolo) {

package/src/agents/openclaw.ts

@@ -14,7 +14,7 @@ export class OpenClawAgent implements AgentTool {
 
   getTaskRunCommandLine(task: ParsedTask, followupPrompt?: string, extraPermissions?: RequiredPermission[] | "yolo"): CommandLine {
     const yolo = extraPermissions === "yolo";
-    const prompt = followupPrompt ?? (getAgentInstructions(task.frontmatter.id, yolo || !this.supportsPermissions) + "\n\n" + (task.body || task.frontmatter.user_prompt));
+    const prompt = followupPrompt ?? getAgentInstructions(task, yolo || !this.supportsPermissions);
     // OpenClaw does not support stdin as prompt.
     const args = ["agent", "--local", "--session-id", task.frontmatter.id, "--message", prompt];
 

package/src/agents/opencode.ts

@@ -15,7 +15,7 @@ export class OpenCodeAgent implements AgentTool {
 
   getTaskRunCommandLine(task: ParsedTask, followupPrompt?: string, extraPermissions?: RequiredPermission[] | "yolo"): CommandLine {
     const yolo = extraPermissions === "yolo";
-    const prompt = followupPrompt ?? (getAgentInstructions(task.frontmatter.id, yolo || !this.supportsPermissions) + "\n\n" + (task.body || task.frontmatter.user_prompt));
+    const prompt = followupPrompt ?? getAgentInstructions(task, yolo || !this.supportsPermissions);
     const args = ["run"];
 
     if (yolo) {

package/src/agents/qoder.ts

@@ -15,7 +15,7 @@ export class Qoder implements AgentTool {
 
   getTaskRunCommandLine(task: ParsedTask, followupPrompt?: string, extraPermissions?: RequiredPermission[] | "yolo"): CommandLine {
     const yolo = extraPermissions === "yolo";
-    const prompt = followupPrompt ?? (getAgentInstructions(task.frontmatter.id, yolo || !this.supportsPermissions) + "\n\n" + (task.body || task.frontmatter.user_prompt));
+    const prompt = followupPrompt ?? getAgentInstructions(task, yolo || !this.supportsPermissions);
     const args = [];
 
     if (yolo) {

package/src/agents/qwen.ts

@@ -15,7 +15,7 @@ export class QwenAgent implements AgentTool {
 
   getTaskRunCommandLine(task: ParsedTask, followupPrompt?: string, extraPermissions?: RequiredPermission[] | "yolo"): CommandLine {
     const yolo = extraPermissions === "yolo";
-    const prompt = followupPrompt ?? (getAgentInstructions(task.frontmatter.id, yolo || !this.supportsPermissions) + "\n\n" + (task.body || task.frontmatter.user_prompt));
+    const prompt = followupPrompt ?? getAgentInstructions(task, yolo || !this.supportsPermissions);
     const args = ["--approval-mode", yolo ? "yolo" : "auto-edit"];
 
     if (followupPrompt) { args.push("-c"); }

package/src/agents/shared-prompt.ts

@@ -2,6 +2,8 @@ import * as fs from "fs";
 import * as path from "path";
 import { fileURLToPath } from "url";
 import { loadConfig } from "../config.js";
+import { generateEndpointDocs } from "../mcp-tools.js";
+import type { ParsedTask } from "../types.js";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -11,13 +13,14 @@ const AGENT_INSTRUCTIONS_TEMPLATE = fs.readFileSync(
 );
 
 /**
- * Agent instructions with the serve daemon's HTTP port and task ID baked in.
+ * Build the full agent prompt: instructions + endpoint docs + task description.
  */
-export function getAgentInstructions(taskId: string, skipPermissions?: boolean): string {
+export function getAgentInstructions(task: ParsedTask, skipPermissions?: boolean): string {
   const port = loadConfig().httpPort ?? 9966;
+  const taskDescription = task.body || task.frontmatter.user_prompt;
   let instructions = AGENT_INSTRUCTIONS_TEMPLATE
-    .replace(/\{\{PORT\}\}/g, String(port))
-    .replace(/\{\{TASK_ID\}\}/g, taskId);
+    .replace(/\{\{ENDPOINT_DOCS\}\}/g, generateEndpointDocs(port, task.frontmatter.id))
+    .replace(/\{\{TASK_DESCRIPTION\}\}/g, taskDescription);
   if (skipPermissions) {
     instructions = instructions.replace(/## Permissions\r?\n[\s\S]*?(?=## |\r?\n---)/m, "");
   }

package/src/commands/plan-generation.md

@@ -16,6 +16,7 @@ task_name: <concise label, 3-6 words>
 - If the task produces formatted output (report, email, summary, etc.), specify the structure, sections, and tone.
 - When a step requires user input, simply state what information is needed from the user. Do **not** specify how to obtain it — the agent has its own tool for requesting user input.
 - Preserve relative time expressions (e.g., "today", "yesterday", "last week") exactly as written — do **not** resolve them to specific dates. The plan may be executed on a different day than it was generated.
+- If the task involves opening a web browser or application, include a final step to close it before finishing.
 
 ## Task Description