npm - palmier - Versions diffs - 0.6.6 → 0.6.7 - Mend

palmier 0.6.6 → 0.6.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (52) hide show

package/README.md +1 -1
package/dist/agents/agent-instructions.md +28 -6
package/dist/commands/plan-generation.md +1 -0
package/dist/commands/run.js +3 -3
package/dist/location-device.d.ts +8 -0
package/dist/location-device.js +32 -0
package/dist/mcp-handler.d.ts +8 -0
package/dist/mcp-handler.js +110 -0
package/dist/mcp-tools.d.ts +22 -0
package/dist/mcp-tools.js +152 -0
package/dist/pwa/assets/{index-DhvJN8ie.css → index-DAI3J-jU.css} +1 -1
package/dist/pwa/assets/index-RrJvjqz9.js +118 -0
package/dist/pwa/assets/web-DQteXlI7.js +1 -0
package/dist/pwa/assets/web-EzNEHXEh.js +1 -0
package/dist/pwa/index.html +3 -3
package/dist/pwa/service-worker.js +2 -2
package/dist/rpc-handler.js +20 -7
package/dist/transports/http-transport.js +61 -129
package/package.json +1 -1
package/palmier-server/README.md +6 -1
package/palmier-server/package.json +7 -1
package/palmier-server/pnpm-lock.yaml +1025 -1
package/palmier-server/pwa/index.html +1 -1
package/palmier-server/pwa/package.json +3 -0
package/palmier-server/pwa/src/App.css +55 -0
package/palmier-server/pwa/src/api.ts +8 -2
package/palmier-server/pwa/src/components/HostMenu.tsx +102 -1
package/palmier-server/pwa/src/components/TaskListView.tsx +94 -78
package/palmier-server/pwa/src/contexts/HostConnectionContext.tsx +2 -1
package/palmier-server/pwa/src/hooks/usePushSubscription.ts +3 -0
package/palmier-server/pwa/src/pages/Dashboard.tsx +5 -2
package/palmier-server/pwa/src/pages/PairHost.tsx +10 -1
package/palmier-server/pwa/src/service-worker.ts +7 -7
package/palmier-server/server/.env.example +4 -0
package/palmier-server/server/package.json +1 -0
package/palmier-server/server/src/db.ts +10 -0
package/palmier-server/server/src/fcm.ts +74 -0
package/palmier-server/server/src/index.ts +101 -21
package/palmier-server/server/src/notify.ts +34 -0
package/palmier-server/server/src/push.ts +1 -1
package/palmier-server/server/src/routes/fcm.ts +64 -0
package/palmier-server/server/src/routes/push.ts +6 -5
package/palmier-server/spec.md +4 -2
package/src/agents/agent-instructions.md +28 -6
package/src/commands/plan-generation.md +1 -0
package/src/commands/run.ts +3 -3
package/src/location-device.ts +35 -0
package/src/mcp-handler.ts +133 -0
package/src/mcp-tools.ts +182 -0
package/src/rpc-handler.ts +21 -7
package/src/transports/http-transport.ts +58 -128
package/dist/pwa/assets/index-CXqKVvmk.js +0 -118

package/palmier-server/pwa/index.html CHANGED Viewed

@@ -7,7 +7,7 @@
     <link rel="icon" type="image/x-icon" href="/favicon.ico" />
     <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
     <title>Palmier</title>
-    <meta name="description" content="Control AI agents running on your machine from any device. Schedule tasks, monitor runs, and stay in control." />
+    <meta name="description" content="Remote control for AI agents running on your own machine. Schedule tasks, approve permissions, and get push notifications." />
   </head>
   <body>
     <div id="root"></div>

package/palmier-server/pwa/package.json CHANGED Viewed

@@ -9,6 +9,9 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@capacitor/app": "^8.1.0",
+    "@capacitor/core": "^8.3.0",
+    "@capacitor/preferences": "^8.0.1",
     "@fontsource-variable/plus-jakarta-sans": "^5.2.8",
     "nats.ws": "^1.30.0",
     "react": "^19.0.0",

package/palmier-server/pwa/src/App.css CHANGED Viewed

@@ -1308,6 +1308,12 @@ body {
   font-size: 1.125rem;
   font-weight: 700;
   letter-spacing: -0.02em;
+  margin-bottom: var(--space-xs);
+}
+.confirm-modal-subtitle {
+  font-size: 0.8rem;
+  color: var(--color-muted);
   margin-bottom: var(--space-sm);
 }
@@ -1681,6 +1687,55 @@ body {
   margin-bottom: var(--space-sm);
 }
+.drawer-toggle {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: var(--space-sm);
+}
+.drawer-toggle-label {
+  font-size: 0.85rem;
+  color: var(--color-text);
+}
+.toggle-switch {
+  position: relative;
+  width: 40px;
+  height: 22px;
+  border-radius: 11px;
+  border: none;
+  background: var(--color-border);
+  cursor: pointer;
+  padding: 0;
+  transition: background 0.2s;
+  flex-shrink: 0;
+}
+.toggle-switch-on {
+  background: var(--color-primary);
+}
+.toggle-switch-thumb {
+  position: absolute;
+  top: 2px;
+  left: 2px;
+  width: 18px;
+  height: 18px;
+  border-radius: 50%;
+  background: white;
+  transition: transform 0.2s;
+}
+.toggle-switch-on .toggle-switch-thumb {
+  transform: translateX(18px);
+}
+.toggle-switch:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
 .drawer-footer {
   margin-top: auto;
   padding: var(--space-md);

package/palmier-server/pwa/src/api.ts CHANGED Viewed

@@ -1,17 +1,23 @@
+import { Capacitor } from "@capacitor/core";
+/** On native platforms, API calls go to the production server. On web, they're relative (same-origin). */
+export const SERVER_URL = Capacitor.isNativePlatform() ? "https://app.palmier.me" : "";
 async function request<T>(
   method: string,
   path: string,
   body?: unknown,
   token?: string
 ): Promise<T> {
-  console.log(`[API] ${method} ${path}`);
+  const url = `${SERVER_URL}${path}`;
+  console.log(`[API] ${method} ${url}`);
   const headers: Record<string, string> = {
     "Content-Type": "application/json",
   };
   if (token) {
     headers["Authorization"] = `Bearer ${token}`;
   }
-  const res = await fetch(path, {
+  const res = await fetch(url, {
     method,
     headers,
     body: body != null ? JSON.stringify(body) : undefined,

package/palmier-server/pwa/src/components/HostMenu.tsx CHANGED Viewed

@@ -1,17 +1,39 @@
 import { useState, useEffect, useRef, useCallback } from "react";
 import { createPortal } from "react-dom";
 import { useNavigate } from "react-router-dom";
+import { Capacitor, registerPlugin } from "@capacitor/core";
+import { App as CapApp } from "@capacitor/app";
+import { Preferences } from "@capacitor/preferences";
+interface LocationPermissionResult {
+  fine: boolean;
+  background: boolean;
+}
+interface LocationPermissionPlugin {
+  request(): Promise<LocationPermissionResult>;
+  check(): Promise<LocationPermissionResult>;
+}
+const LocationPermission = Capacitor.isNativePlatform()
+  ? registerPlugin<LocationPermissionPlugin>("LocationPermission")
+  : null;
 import { useHostStore } from "../contexts/HostStoreContext";
 import { useMediaQuery } from "../hooks/useMediaQuery";
 /** LAN mode: PWA is served by palmier serve (marker injected into HTML). */
 const isLanMode = !!(window as any).__PALMIER_SERVE__;
+const isNative = Capacitor.isNativePlatform();
 interface HostMenuProps {
   daemonVersion?: string | null;
+  locationClientToken?: string | null;
+  activeClientToken?: string | null;
+  request?<T = unknown>(method: string, params?: unknown): Promise<T>;
+  onLocationClientTokenChange?(token: string | null): void;
 }
-export default function HostMenu({ daemonVersion }: HostMenuProps) {
+export default function HostMenu({ daemonVersion, locationClientToken, activeClientToken, request, onLocationClientTokenChange }: HostMenuProps) {
   const { pairedHosts, activeHostId, setActiveHostId, removePairedHost, renamePairedHost } = useHostStore();
   const navigate = useNavigate();
   const isDesktop = useMediaQuery("(min-width: 768px)");
@@ -21,6 +43,65 @@ export default function HostMenu({ daemonVersion }: HostMenuProps) {
   const [renamingId, setRenamingId] = useState<string | null>(null);
   const [renameValue, setRenameValue] = useState("");
   const [confirmingDeleteId, setConfirmingDeleteId] = useState<string | null>(null);
+  const [togglingLocation, setTogglingLocation] = useState(false);
+  const locationEnabled = !!(activeClientToken && locationClientToken === activeClientToken);
+  // Sync location toggle with permission state — on mount and when app resumes from background
+  useEffect(() => {
+    if (!isNative || !LocationPermission || !request) return;
+    function syncPermissionState() {
+      if (!locationEnabled) return;
+      LocationPermission!.check().then(({ fine }) => {
+        if (!fine) {
+          // Permission revoked — disable on host
+          request!("device.location.disable").then(() => {
+            onLocationClientTokenChange?.(null);
+          }).catch(() => {});
+        }
+      });
+    }
+    syncPermissionState();
+    const listener = CapApp.addListener("resume", () => {
+      syncPermissionState();
+    });
+    return () => { listener.then((h) => h.remove()); };
+  }, [locationEnabled, activeClientToken]);
+  async function handleLocationToggle() {
+    if (!request) return;
+    setTogglingLocation(true);
+    try {
+      if (locationEnabled) {
+        await request("device.location.disable");
+        onLocationClientTokenChange?.(null);
+      } else {
+        // Request location permissions before enabling
+        if (LocationPermission) {
+          const result = await LocationPermission.request();
+          if (!result.fine) {
+            return; // User denied permission
+          }
+        }
+        const { value: fcmToken } = await Preferences.get({ key: "fcmToken" });
+        if (!fcmToken) {
+          console.warn("No FCM token available");
+          return;
+        }
+        await request("device.location.enable", { fcmToken });
+        onLocationClientTokenChange?.(activeClientToken ?? null);
+      }
+    } catch (err) {
+      console.error("Failed to toggle location:", err);
+    } finally {
+      setTogglingLocation(false);
+    }
+  }
   const drawerRef = useRef<HTMLDivElement>(null);
   const renameInputRef = useRef<HTMLInputElement>(null);
@@ -197,6 +278,26 @@ export default function HostMenu({ daemonVersion }: HostMenuProps) {
         </div>
       </>)}
+      {isNative && (
+        <>
+          <div className="drawer-divider" />
+          <div className="drawer-section">
+            <label className="drawer-toggle">
+              <span className="drawer-toggle-label">Location Access</span>
+              <button
+                className={`toggle-switch ${locationEnabled ? "toggle-switch-on" : ""}`}
+                onClick={handleLocationToggle}
+                disabled={togglingLocation}
+                role="switch"
+                aria-checked={locationEnabled}
+              >
+                <span className="toggle-switch-thumb" />
+              </button>
+            </label>
+          </div>
+        </>
+      )}
       <div className="drawer-footer">
         {daemonVersion && (
           <div className="drawer-version">

package/palmier-server/pwa/src/components/TaskListView.tsx CHANGED Viewed

@@ -26,16 +26,17 @@ interface TaskListViewProps {
   onViewRun(taskId: string, runId?: string): void;
   onUpdateRequired?(required: boolean): void;
   onVersion?(version: string | null): void;
+  onLocationClientToken?(token: string | null): void;
 }
-export default function TaskListView({ connected, hostId, request, subscribeEvents, onViewRun, onUpdateRequired, onVersion }: TaskListViewProps) {
+export default function TaskListView({ connected, hostId, request, subscribeEvents, onViewRun, onUpdateRequired, onVersion, onLocationClientToken }: TaskListViewProps) {
   const [tasks, setTasks] = useState<Task[]>([]);
   const [loadingTasks, setLoadingTasks] = useState(false);
   const [taskError, setTaskError] = useState<string | null>(null);
   const [taskEvents, setTaskStatuss] = useState<Map<string, TaskStatus>>(new Map());
-  const [pendingConfirms, setPendingConfirms] = useState<Set<string>>(new Set());
+  const [pendingConfirms, setPendingConfirms] = useState<Map<string, { description: string; agentName?: string }>>(new Map());
   const [pendingPermissions, setPendingPermissions] = useState<Map<string, RequiredPermission[]>>(new Map());
-  const [pendingInputs, setPendingInputs] = useState<Map<string, string[]>>(new Map());
+  const [pendingInputs, setPendingInputs] = useState<Map<string, { questions: string[]; description?: string; agentName?: string }>>(new Map());
   const [inputValues, setInputValues] = useState<Map<string, string[]>>(new Map());
   const [showForm, setShowForm] = useState(false);
@@ -52,20 +53,20 @@ export default function TaskListView({ connected, hostId, request, subscribeEven
     setLoadingTasks(true);
     setTaskError(null);
     try {
-      const result = await request<{ tasks?: (Task & { status?: TaskStatus })[]; agents?: AgentInfo[]; version?: string | null; host_platform?: string }>("task.list");
+      const result = await request<{ tasks?: (Task & { status?: TaskStatus })[]; agents?: AgentInfo[]; version?: string | null; host_platform?: string; location_client_token?: string | null }>("task.list");
       const taskList = result.tasks ?? [];
       const initialEvents = new Map<string, TaskStatus>();
-      const initialConfirms = new Set<string>();
+      const initialConfirms = new Map<string, { description: string; agentName?: string }>();
       const initialPerms = new Map<string, RequiredPermission[]>();
-      const initialInputs = new Map<string, string[]>();
+      const initialInputs = new Map<string, { questions: string[]; description?: string; agentName?: string }>();
       const initialInputVals = new Map<string, string[]>();
       for (const t of taskList) {
         if (t.status) {
           initialEvents.set(t.id, t.status);
-          if (t.status.pending_confirmation) initialConfirms.add(t.id);
+          // pending_confirmation no longer comes from task.list (confirmation is sessionId-based now)
           if (t.status.pending_permission?.length) initialPerms.set(t.id, t.status.pending_permission);
           if (t.status.pending_input?.length) {
-            initialInputs.set(t.id, t.status.pending_input);
+            initialInputs.set(t.id, { questions: t.status.pending_input });
             initialInputVals.set(t.id, new Array(t.status.pending_input.length).fill(""));
           }
         }
@@ -81,6 +82,7 @@ export default function TaskListView({ connected, hostId, request, subscribeEven
       setAgentLabels(result.agents ?? []);
       const version = result.version ?? null;
       onVersion?.(version);
+      onLocationClientToken?.(result.location_client_token ?? null);
       onUpdateRequired?.(!!version && isOlderThan(version, MIN_HOST_VERSION));
     } catch (err) {
       const errMsg = err instanceof Error ? err.message : String(err);
@@ -109,43 +111,81 @@ export default function TaskListView({ connected, hostId, request, subscribeEven
       if (tokens.length < 3) return;
       const taskId = tokens.slice(2).join(".");
-      let eventType: string | undefined;
+      let parsed: Record<string, unknown> = {};
       try {
-        const parsed = JSON.parse(sc.decode(msg.data)) as { event_type?: string };
-        eventType = parsed.event_type;
+        parsed = JSON.parse(sc.decode(msg.data)) as Record<string, unknown>;
       } catch { return; }
+      const eventType = parsed.event_type as string | undefined;
+      const sessionId = parsed.session_id as string | undefined;
-      // Handle confirm-resolved: close pending confirmation dialog
-      if (eventType === "confirm-resolved") {
-        setPendingConfirms((prev) => {
-          if (!prev.has(taskId)) return prev;
-          const next = new Set(prev);
-          next.delete(taskId);
-          return next;
-        });
+      // Handle input-request: show standalone input dialog (keyed by sessionId)
+      if (eventType === "input-request" && sessionId) {
+        const questions = parsed.input_questions as string[];
+        const agentName = parsed.agent_name as string | undefined;
+        const description = parsed.description as string | undefined;
+        if (questions?.length) {
+          setPendingInputs((prev) => {
+            if (prev.has(sessionId)) return prev;
+            const next = new Map(prev);
+            next.set(sessionId, { questions, description, agentName });
+            return next;
+          });
+          setInputValues((prev) => {
+            if (prev.has(sessionId)) return prev;
+            const next = new Map(prev);
+            next.set(sessionId, new Array(questions.length).fill(""));
+            return next;
+          });
+        }
         return;
       }
-      // Handle permission-resolved: close pending permission dialog
-      if (eventType === "permission-resolved") {
-        setPendingPermissions((prev) => {
-          if (!prev.has(taskId)) return prev;
+      // Handle input-resolved: close pending input dialog
+      if (eventType === "input-resolved" && sessionId) {
+        setPendingInputs((prev) => {
+          if (!prev.has(sessionId)) return prev;
           const next = new Map(prev);
-          next.delete(taskId);
+          next.delete(sessionId);
+          return next;
+        });
+        setInputValues((prev) => {
+          const next = new Map(prev);
+          next.delete(sessionId);
           return next;
         });
         return;
       }
-      // Handle input-resolved: close pending input dialog
-      if (eventType === "input-resolved") {
-        setPendingInputs((prev) => {
-          if (!prev.has(taskId)) return prev;
+      // Handle confirm-request: show standalone confirmation dialog (keyed by sessionId)
+      if (eventType === "confirm-request" && sessionId) {
+        const description = parsed.description as string;
+        const agentName = parsed.agent_name as string | undefined;
+        if (description) {
+          setPendingConfirms((prev) => {
+            if (prev.has(sessionId)) return prev;
+            const next = new Map(prev);
+            next.set(sessionId, { description, agentName });
+            return next;
+          });
+        }
+        return;
+      }
+      // Handle confirm-resolved: close pending confirmation dialog
+      if (eventType === "confirm-resolved" && sessionId) {
+        setPendingConfirms((prev) => {
+          if (!prev.has(sessionId)) return prev;
           const next = new Map(prev);
-          next.delete(taskId);
+          next.delete(sessionId);
           return next;
         });
-        setInputValues((prev) => {
+        return;
+      }
+      // Handle permission-resolved: close pending permission dialog
+      if (eventType === "permission-resolved") {
+        setPendingPermissions((prev) => {
+          if (!prev.has(taskId)) return prev;
           const next = new Map(prev);
           next.delete(taskId);
           return next;
@@ -157,14 +197,6 @@ export default function TaskListView({ connected, hostId, request, subscribeEven
         const status = await request<TaskStatus & { error?: string }>("task.status", { id: taskId }, { timeout: 5000 });
         if (status.error) return;
         setTaskStatuss((prev) => { const next = new Map(prev); next.set(taskId, status); return next; });
-        if (status.pending_confirmation) {
-          setPendingConfirms((prev) => {
-            if (prev.has(taskId)) return prev;
-            const next = new Set(prev);
-            next.add(taskId);
-            return next;
-          });
-        }
         if (status.pending_permission?.length) {
           setPendingPermissions((prev) => {
             if (prev.has(taskId)) return prev;
@@ -173,28 +205,14 @@ export default function TaskListView({ connected, hostId, request, subscribeEven
             return next;
           });
         }
-        if (status.pending_input?.length) {
-          setPendingInputs((prev) => {
-            if (prev.has(taskId)) return prev;
-            const next = new Map(prev);
-            next.set(taskId, status.pending_input!);
-            return next;
-          });
-          setInputValues((prev) => {
-            if (prev.has(taskId)) return prev;
-            const next = new Map(prev);
-            next.set(taskId, new Array(status.pending_input!.length).fill(""));
-            return next;
-          });
-        }
       } catch { /* skip */ }
     });
     return unsubscribe;
   }, [connected, hostId, subscribeEvents, request]);
-  async function respondToConfirm(taskId: string, response: "confirmed" | "aborted") {
+  async function respondToConfirm(sessionId: string, response: "confirmed" | "aborted") {
     try {
-      await request("task.user_input", { id: taskId, value: [response] });
+      await request("task.user_input", { id: sessionId, value: [response] });
     } catch (err) {
       console.error("[TaskListView] Failed to respond to confirmation:", err);
     }
@@ -208,9 +226,9 @@ export default function TaskListView({ connected, hostId, request, subscribeEven
     }
   }
-  async function respondToInput(taskId: string, values: string[]) {
+  async function respondToInput(sessionId: string, values: string[]) {
     try {
-      await request("task.user_input", { id: taskId, value: values });
+      await request("task.user_input", { id: sessionId, value: values });
     } catch (err) {
       console.error("[TaskListView] Failed to respond to input request:", err);
     }
@@ -300,20 +318,19 @@ export default function TaskListView({ connected, hostId, request, subscribeEven
       )}
       {createPortal(<>
-      {[...pendingConfirms].map((taskId) => {
-        const task = tasks.find((t) => t.id === taskId);
+      {[...pendingConfirms.entries()].map(([sessionId, { description, agentName }]) => {
+        const subtitle = agentName || tasks.find((t) => t.id === sessionId)?.name;
         return (
-          <div key={taskId} className="confirm-modal-overlay">
+          <div key={sessionId} className="confirm-modal-overlay">
             <div className="confirm-modal">
-              <h2 className="confirm-modal-title">Task Confirmation</h2>
-              <p className="confirm-modal-message">
-                Run task "<strong>{task?.name || task?.user_prompt || taskId}</strong>"?
-              </p>
+              <h2 className="confirm-modal-title">Confirmation Required</h2>
+              {subtitle && <p className="confirm-modal-subtitle">{subtitle}</p>}
+              <p className="confirm-modal-message">{description}</p>
               <div className="confirm-modal-actions">
-                <button className="btn btn-primary" onClick={() => respondToConfirm(taskId, "confirmed")}>
+                <button className="btn btn-primary" onClick={() => respondToConfirm(sessionId, "confirmed")}>
                   Confirm
                 </button>
-                <button className="btn btn-secondary" onClick={() => respondToConfirm(taskId, "aborted")}>
+                <button className="btn btn-secondary" onClick={() => respondToConfirm(sessionId, "aborted")}>
                   Abort
                 </button>
               </div>
@@ -358,18 +375,17 @@ export default function TaskListView({ connected, hostId, request, subscribeEven
         );
       })}
-      {[...pendingInputs.entries()].map(([taskId, descriptions]) => {
-        const task = tasks.find((t) => t.id === taskId);
-        const values = inputValues.get(taskId) ?? new Array(descriptions.length).fill("");
+      {[...pendingInputs.entries()].map(([sessionId, { questions, description, agentName }]) => {
+        const values = inputValues.get(sessionId) ?? new Array(questions.length).fill("");
+        const subtitle = agentName || tasks.find((t) => t.id === sessionId)?.name;
         return (
-          <div key={taskId} className="confirm-modal-overlay">
+          <div key={sessionId} className="confirm-modal-overlay">
             <div className="confirm-modal input-modal">
               <h2 className="confirm-modal-title">Input Required</h2>
-              <p className="confirm-modal-message">
-                <strong>{task?.name || task?.user_prompt || taskId}</strong>
-              </p>
+              {subtitle && <p className="confirm-modal-subtitle">{subtitle}</p>}
+              {description && <p className="confirm-modal-message">{description}</p>}
               <div className="input-list">
-                {descriptions.map((desc, i) => (
+                {questions.map((desc: string, i: number) => (
                   <div key={i} className="input-item">
                     <label className="input-label">{desc}</label>
                     <input
@@ -379,9 +395,9 @@ export default function TaskListView({ connected, hostId, request, subscribeEven
                       onChange={(e) => {
                         setInputValues((prev) => {
                           const next = new Map(prev);
-                          const arr = [...(next.get(taskId) ?? [])];
+                          const arr = [...(next.get(sessionId) ?? [])];
                           arr[i] = e.target.value;
-                          next.set(taskId, arr);
+                          next.set(sessionId, arr);
                           return next;
                         });
                       }}
@@ -394,16 +410,16 @@ export default function TaskListView({ connected, hostId, request, subscribeEven
                 <button
                   className="btn btn-primary"
                   disabled={values.some((v) => !v.trim())}
-                  onClick={() => respondToInput(taskId, values)}
+                  onClick={() => respondToInput(sessionId, values)}
                 >
                   Submit
                 </button>
               </div>
               <button
                 className="permission-abort-link"
-                onClick={() => respondToInput(taskId, ["aborted"])}
+                onClick={() => respondToInput(sessionId, ["aborted"])}
               >
-                Cancel & Abort Task
+                Cancel
               </button>
             </div>
           </div>

package/palmier-server/pwa/src/contexts/HostConnectionContext.tsx CHANGED Viewed

@@ -8,6 +8,7 @@ import {
   type ReactNode,
 } from "react";
 import { connect, StringCodec, type NatsConnection, type Subscription } from "nats.ws";
+import { SERVER_URL } from "../api";
 import { useHostStore } from "./HostStoreContext";
 import type { PairedHost } from "../types";
@@ -89,7 +90,7 @@ export function HostConnectionProvider({ children }: { children: ReactNode }) {
     async function init() {
       try {
-        const res = await fetch("/api/config");
+        const res = await fetch(`${SERVER_URL}/api/config`);
         if (!res.ok) {
           console.error("[NATS] Failed to fetch config");
           return;

package/palmier-server/pwa/src/hooks/usePushSubscription.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import { useEffect, useRef } from "react";
+import { Capacitor } from "@capacitor/core";
 import { useHostStore } from "../contexts/HostStoreContext";
 import { apiPost, apiGet } from "../api";
@@ -8,6 +9,8 @@ export function usePushSubscription() {
   const subscribedRef = useRef<string | null>(null);
   useEffect(() => {
+    // Native app uses FCM for notifications, not Web Push
+    if (Capacitor.isNativePlatform()) return;
     // Skip push subscription for direct-only (LAN) hosts — no cloud server to relay through
     if (!activeHost || activeHost.directUrl || subscribedRef.current === activeHost.hostId) return;

package/palmier-server/pwa/src/pages/Dashboard.tsx CHANGED Viewed

@@ -47,6 +47,7 @@ export default function Dashboard() {
   const [updating, setUpdating] = useState(false);
   const [updateError, setUpdateError] = useState<string | null>(null);
   const [daemonVersion, setDaemonVersion] = useState<string | null>(null);
+  const [locationClientToken, setLocationClientToken] = useState<string | null>(null);
   // Register push subscription for the active host
   usePushSubscription();
@@ -83,14 +84,15 @@ export default function Dashboard() {
   const hasHosts = pairedHosts.length > 0;
   const showTaskContent = hasHosts && connected && activeHostId && !unauthorized;
+  const activeClientToken = pairedHosts.find((h) => h.hostId === activeHostId)?.clientToken ?? null;
   return (
     <div className="dashboard">
-      {isDesktop && <HostMenu daemonVersion={daemonVersion} />}
+      {isDesktop && <HostMenu daemonVersion={daemonVersion} locationClientToken={locationClientToken} activeClientToken={activeClientToken} request={request} onLocationClientTokenChange={setLocationClientToken} />}
       <div className="dashboard-content">
         <div className="tab-bar">
-          {!isDesktop && <HostMenu daemonVersion={daemonVersion} />}
+          {!isDesktop && <HostMenu daemonVersion={daemonVersion} locationClientToken={locationClientToken} activeClientToken={activeClientToken} request={request} onLocationClientTokenChange={setLocationClientToken} />}
           <TabBar />
         </div>
@@ -139,6 +141,7 @@ export default function Dashboard() {
                 onViewRun={handleViewRun}
                 onUpdateRequired={setUpdateRequired}
                 onVersion={setDaemonVersion}
+                onLocationClientToken={setLocationClientToken}
               />
             </div>
             {isRunDetail ? (

package/palmier-server/pwa/src/pages/PairHost.tsx CHANGED Viewed

@@ -1,7 +1,10 @@
 import { useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { connect, StringCodec } from "nats.ws";
+import { Capacitor } from "@capacitor/core";
+import { Preferences } from "@capacitor/preferences";
 import { useHostStore } from "../contexts/HostStoreContext";
+import { SERVER_URL } from "../api";
 import type { PairedHost } from "../types";
 interface PairResponse {
@@ -49,7 +52,7 @@ export default function PairHost() {
         response = await res.json() as PairResponse;
       } else {
         // Server mode — pair via NATS
-        const configRes = await fetch("/api/config");
+        const configRes = await fetch(`${SERVER_URL}/api/config`);
         if (!configRes.ok) throw new Error("Failed to fetch server config");
         const config = await configRes.json() as { natsWsUrl: string; natsToken: string };
         if (!config.natsWsUrl) throw new Error("Server has no NATS WebSocket URL configured");
@@ -78,6 +81,12 @@ export default function PairHost() {
       };
       addPairedHost(host);
+      // Write hostId to native SharedPreferences for FCM token registration
+      if (Capacitor.isNativePlatform()) {
+        await Preferences.set({ key: "hostId", value: response.hostId });
+      }
       navigate("/");
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);