palmier 0.2.5 → 0.2.7

package/dist/commands/pair.js

@@ -1,12 +1,14 @@
+import * as fs from "fs";
+import * as path from "path";
 import * as http from "node:http";
 import { StringCodec } from "nats";
-import { loadConfig } from "../config.js";
+import { loadConfig, CONFIG_DIR } from "../config.js";
 import { connectNats } from "../nats-client.js";
-import { detectLanIp } from "../transports/http-transport.js";
 import { addSession } from "../session-store.js";
 const CODE_CHARS = "ABCDEFGHJKMNPQRSTUVWXYZ23456789"; // no O/0/I/1/L
 const CODE_LENGTH = 6;
 const EXPIRY_MS = 5 * 60 * 1000; // 5 minutes
+const LAN_LOCKFILE = path.join(CONFIG_DIR, "lan.json");
 function generateCode() {
     const bytes = new Uint8Array(CODE_LENGTH);
     crypto.getRandomValues(bytes);
@@ -14,15 +16,13 @@ function generateCode() {
 }
 function buildPairResponse(config, label) {
     const session = addSession(label);
-    const response = {
+    return {
         hostId: config.hostId,
         sessionToken: session.token,
     };
-    return response;
 }
 /**
- * POST to the running serve process and long-poll until paired or expired.
- * Returns true if paired, false if expired/failed.
+ * POST to the running LAN server and long-poll until paired or expired.
  */
 function lanPairRegister(port, code) {
     const body = JSON.stringify({ code, expiryMs: EXPIRY_MS });
@@ -33,7 +33,7 @@ function lanPairRegister(port, code) {
             path: "/internal/pair-register",
             method: "POST",
             headers: { "Content-Type": "application/json" },
-            timeout: EXPIRY_MS + 5000, // slightly longer than expiry
+            timeout: EXPIRY_MS + 5000,
         }, (res) => {
             const chunks = [];
             res.on("data", (chunk) => chunks.push(chunk));
@@ -47,26 +47,30 @@ function lanPairRegister(port, code) {
                 }
             });
         });
-        req.on("error", (err) => {
-            console.error(`Failed to reach palmier serve on port ${port}: ${err.message}`);
-            console.error("Make sure `palmier serve` is running first.");
-            resolve(false);
-        });
-        req.on("timeout", () => {
-            req.destroy();
-            resolve(false);
-        });
+        req.on("error", () => resolve(false));
+        req.on("timeout", () => { req.destroy(); resolve(false); });
         req.end(body);
     });
 }
+/**
+ * Read the LAN lockfile to check if `palmier lan` is running.
+ */
+function getLanPort() {
+    try {
+        const raw = fs.readFileSync(LAN_LOCKFILE, "utf-8");
+        return JSON.parse(raw).port;
+    }
+    catch {
+        return null;
+    }
+}
 /**
  * Generate an OTP code and wait for a PWA client to pair.
- * Listens on NATS (nats/auto modes) and/or HTTP (lan/auto modes).
+ * Listens on NATS always, and also on the LAN server if `palmier lan` is running.
  */
 export async function pairCommand() {
     const config = loadConfig();
     const code = generateCode();
-    const mode = config.mode ?? "nats";
     let paired = false;
     function onPaired() {
         paired = true;
@@ -79,48 +83,40 @@ export async function pairCommand() {
     console.log("");
     console.log(`  ${code}`);
     console.log("");
-    if (mode === "lan" || mode === "auto") {
-        const ip = detectLanIp();
-        const port = config.directPort ?? 7400;
-        console.log(`  LAN Address: ${ip}:${port}`);
-        console.log("");
-    }
     console.log("Code expires in 5 minutes.");
-    // NATS pairing (nats or auto mode)
-    if (mode === "nats" || mode === "auto") {
-        const nc = await connectNats(config);
-        const sc = StringCodec();
-        const subject = `pair.${code}`;
-        const sub = nc.subscribe(subject, { max: 1 });
-        cleanups.push(() => {
-            sub.unsubscribe();
-            nc.close();
-        });
-        (async () => {
-            for await (const msg of sub) {
-                if (paired)
-                    break;
-                let label;
-                try {
-                    if (msg.data && msg.data.length > 0) {
-                        const body = JSON.parse(sc.decode(msg.data));
-                        label = body.label;
-                    }
-                }
-                catch { /* empty body is fine */ }
-                const response = buildPairResponse(config, label);
-                if (msg.reply) {
-                    msg.respond(sc.encode(JSON.stringify(response)));
+    // NATS pairing (always active)
+    const nc = await connectNats(config);
+    const sc = StringCodec();
+    const subject = `pair.${code}`;
+    const sub = nc.subscribe(subject, { max: 1 });
+    cleanups.push(() => {
+        sub.unsubscribe();
+        nc.close();
+    });
+    (async () => {
+        for await (const msg of sub) {
+            if (paired)
+                break;
+            let label;
+            try {
+                if (msg.data && msg.data.length > 0) {
+                    const body = JSON.parse(sc.decode(msg.data));
+                    label = body.label;
                 }
-                onPaired();
             }
-        })();
-    }
-    // LAN pairing — long-poll the running serve process
-    if (mode === "lan" || mode === "auto") {
-        const port = config.directPort ?? 7400;
+            catch { /* empty body is fine */ }
+            const response = buildPairResponse(config, label);
+            if (msg.reply) {
+                msg.respond(sc.encode(JSON.stringify(response)));
+            }
+            onPaired();
+        }
+    })();
+    // LAN pairing — if `palmier lan` is running, also register with it
+    const lanPort = getLanPort();
+    if (lanPort) {
         (async () => {
-            const result = await lanPairRegister(port, code);
+            const result = await lanPairRegister(lanPort, code);
             if (result)
                 onPaired();
         })();

package/dist/commands/plan-generation.md

@@ -1,32 +1,24 @@
-You are a task planning assistant. Given a task description, produce a detailed Markdown execution plan that an agent can follow step by step. **Do not execute any part of the plan yourself.**
-
-Your output must begin with a raw YAML frontmatter block (delimited by `---`), followed by the plan body in Markdown. Do NOT wrap the frontmatter in code fences. The very first line of your output must be `---`.
-
-**Output format:**
-
----
-task_name: <short descriptive name, 3-6 words>
----
-
-<plan body in Markdown>
-
-**Frontmatter fields:**
-
-- `task_name`: A concise label for the task (e.g., "Clean up temp files", "Update system packages", "Backup database daily").
-
-**Plan body sections:**
-
-### 1. Goal
-State what the task accomplishes and the expected end state.
-
-### 2. Plan
-A numbered sequence of concrete, actionable steps. Use sub-steps for complex actions and include conditional branches where behavior may vary (e.g., "If file exists, do A; otherwise, do B"). Each step should be specific enough for the agent to execute without ambiguity.
-
-### 3. Output Format (if applicable)
-If the task produces a report, email, or other formatted output, specify the exact structure, sections, tone, and any templates the agent should follow.
-
-Use Markdown formatting throughout — headings, code blocks, and tables where appropriate.
-
-**Important:** Any relative times or dates in the task description (e.g., "yesterday", "last week") are relative to when the task is executed, not when this plan is generated. The agent must resolve them at execution time.
-
-**Task description:**
+You are a task planning assistant. Given a task description, produce a Markdown execution plan for an agent. **Do not execute any part of the plan yourself.**
+
+Output a raw YAML frontmatter block (delimited by `---`) followed by the plan body. Do NOT wrap frontmatter in code fences. The first line of output must be `---`.
+
+---
+task_name: <short name, 3-6 words>
+---
+
+**Frontmatter:** `task_name` — concise label (e.g., "Clean up temp files", "Backup database daily").
+
+**Plan body:**
+
+### 1. Goal
+What the task accomplishes and the expected end state.
+
+### 2. Plan
+Numbered sequence of concrete, actionable steps. Include conditional branches where behavior may vary. Each step must be unambiguous.
+
+### 3. Output Format (if applicable)
+If the task produces formatted output (report, email, etc.), specify structure, sections, tone, and templates.
+
+Relative times in the task description (e.g., "yesterday") are relative to execution time, not plan generation time.
+
+**Task description:**

package/dist/commands/restart.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Restart the palmier serve daemon.
+ */
+export declare function restartCommand(): Promise<void>;
+//# sourceMappingURL=restart.d.ts.map

package/dist/commands/restart.js

@@ -0,0 +1,9 @@
+import { getPlatform } from "../platform/index.js";
+/**
+ * Restart the palmier serve daemon.
+ */
+export async function restartCommand() {
+    const platform = getPlatform();
+    await platform.restartDaemon();
+}
+//# sourceMappingURL=restart.js.map