stikfix 1.6.0 → 1.6.2

package/dist/host/src/bootstrap/register.js

@@ -297,11 +297,19 @@ export function createLauncherFiles(opts) {
         const vbsHostExe = vq(hostExe);
         const vbsRoot = vq(rootArg);
         const vbsPortArg = opts.port !== undefined ? ` --port ${opts.port}` : '';
-        // The hidden-launch line: exe mode runs `"<exe>" serve --root ...`, node
-        // mode runs `node "<hostEntry>" --root ...`. Both go through `cmd /c` so a
-        // relative `node` on PATH resolves and the window stays hidden (style 0).
+        // The hidden-launch line (window style 0).
+        //
+        // exe mode runs the ABSOLUTE exe path DIRECTLY via sh.Run — NOT through
+        // `cmd /c`. Reason: `cmd /c "<quoted exe>" ... "<quoted root>"` starts and
+        // ends with a quote, so cmd.exe strips the outer pair (documented in
+        // `cmd /?`) and mangles the spaced "C:\Program Files\..." path → the host
+        // never starts. WScript.Shell.Run parses the quoted exe path correctly, so
+        // no cmd wrapper (and no PATH lookup) is needed for an absolute exe.
+        //
+        // node mode keeps `cmd /c` so a relative `node` on PATH resolves; that line
+        // begins with `node` (not a quote), so cmd's outer-quote strip never fires.
         const vbsRunLine = useExe
-            ? `sh.Run "cmd /c """ & hostExe & """ serve --root """ & root & """${vbsPortArg}", 0, False`
+            ? `sh.Run """" & hostExe & """ serve --root """ & root & """${vbsPortArg}", 0, False`
             : `sh.Run "cmd /c node """ & hostEntry & """ --root """ & root & """${vbsPortArg}", 0, False`;
         const vbsContent = [
             'Option Explicit',

package/dist/host/src/native-host.js

@@ -76,19 +76,42 @@ export function handleStartHost(cfg, root, spawnFn = spawn, out) {
         emit({ type: 'ERROR', error: `START_HOST root does not exist: ${resolvedRoot}` });
         return false;
     }
+    const started = spawnDetachedHost(cfg, resolvedRoot, spawnFn);
+    if (!started.ok) {
+        emit({ type: 'ERROR', error: `Failed to start host: ${started.error}` });
+        return false;
+    }
+    emit({ type: 'HOST_STARTING', root: resolvedRoot });
+    return true;
+}
+/**
+ * Spawn the HTTP host as a DETACHED process for `resolvedRoot`, WITHOUT writing
+ * any native-messaging frame — the caller owns the single wire response for this
+ * one-shot process. Returns {ok:true} on a successful spawn, {ok:false,error} on
+ * spawn failure.
+ *
+ * Shared by handleStartHost (which then emits HOST_STARTING) and the GET_TOKEN
+ * auto-start fallback (which then polls for the freshly-written token and emits
+ * TOKEN). Reuses the exact command resolution as before:
+ *   - standalone exe install → `<hostExe> serve --root <root>`
+ *   - npx/node install       → `node <hostEntry> --root <root>`
+ *
+ * CRITICAL (T-09-07): the native host MUST NOT bind/listen itself — it only
+ * spawns a SEPARATE, detached process. NEVER writes to stdout (native-frame
+ * integrity, Pitfall 2). Detached + stdio:'ignore' + unref() so the child
+ * outlives this one-shot native process.
+ */
+function spawnDetachedHost(cfg, resolvedRoot, spawnFn = spawn) {
     const nodePath = typeof cfg.nodePath === 'string' && cfg.nodePath.length > 0 ? cfg.nodePath : process.execPath;
-    const hostEntry = resolveHostEntry(cfg);
-    // Standalone-exe install path: when config points at a single-executable host,
-    // spawn `<exe> serve --root <root>` (the exe self-detects the subcommand).
-    // Otherwise keep the exact prior behavior: `node <hostEntry> --root <root>`.
     const hostExe = typeof cfg.hostExe === 'string' && cfg.hostExe.length > 0 ? cfg.hostExe : undefined;
     const spawnCmd = hostExe ?? nodePath;
+    // resolveHostEntry() is only evaluated when actually needed (non-exe/node
+    // install path) — calling it unconditionally in exe-mode would hit the
+    // __dirname fallback for no reason (and __dirname is undefined in the
+    // tsc/ESM test build; production's esbuild CJS bundle is unaffected).
     const spawnArgs = hostExe
         ? ['serve', '--root', resolvedRoot]
-        : [hostEntry, '--root', resolvedRoot];
-    // CRITICAL (T-09-07): the native host MUST NOT bind/listen itself. It only
-    // spawns a SEPARATE, detached process that is the HTTP host. Detached +
-    // stdio:'ignore' + unref() so the child outlives this one-shot native process.
+        : [resolveHostEntry(cfg), '--root', resolvedRoot];
     try {
         const child = spawnFn(spawnCmd, spawnArgs, {
             detached: true,
@@ -96,13 +119,77 @@ export function handleStartHost(cfg, root, spawnFn = spawn, out) {
             windowsHide: true,
         });
         child.unref();
+        return { ok: true };
     }
     catch (err) {
-        emit({ type: 'ERROR', error: `Failed to start host: ${String(err.message)}` });
-        return false;
+        return { ok: false, error: String(err.message) };
     }
-    emit({ type: 'HOST_STARTING', root: resolvedRoot });
-    return true;
+}
+/**
+ * Read the optional `.stikfix-port` for `tokenRoot`, then send the final TOKEN
+ * frame and exit(0). One-shot terminal step for a successful GET_TOKEN — the
+ * only stdout write on this path.
+ */
+function sendTokenFrame(tokenRoot, token, name, notesDir) {
+    // Port is optional — read if present; SW falls back to port scan (A5 fallback).
+    let port;
+    try {
+        const raw = readFileSync(join(tokenRoot, '.stikfix-port'), 'utf8').trim();
+        const parsed = parseInt(raw, 10);
+        if (!isNaN(parsed)) {
+            port = parsed;
+        }
+    }
+    catch {
+        // .stikfix-port absent is OK — SW re-probes (A5)
+    }
+    sendNativeMessage({ type: 'TOKEN', token, port, name, notesDir });
+    process.exit(0);
+}
+/**
+ * GET_TOKEN self-heal: the `.stikfix-token` is missing because the HTTP host has
+ * never started (fresh install) or was stopped. Rather than fail the pairing and
+ * make the user hunt for a "start the host" step, auto-start the host (detached)
+ * and poll briefly for the token file it writes, then return TOKEN. This makes
+ * auto-pair work on the very first popup open with no manual step — the core
+ * reliability promise (a dropped note is a regression).
+ *
+ * NEVER writes to stdout until the single terminal frame (TOKEN or ERROR).
+ */
+function autoStartAndReturnToken(cfg, tokenRoot, name, notesDir) {
+    const tokenPath = join(tokenRoot, '.stikfix-token');
+    const started = spawnDetachedHost(cfg, tokenRoot);
+    if (!started.ok) {
+        sendNativeMessage({
+            type: 'ERROR',
+            error: 'No .stikfix-token in ' + tokenRoot + ' and the host could not be started: ' + started.error,
+        });
+        process.exit(1);
+    }
+    // Poll ~5s (25 × 200ms) for the freshly-started host to bind + write the token.
+    const deadline = Date.now() + 5000;
+    const tick = () => {
+        let tok = '';
+        try {
+            tok = readFileSync(tokenPath, 'utf8').trim();
+        }
+        catch {
+            tok = '';
+        }
+        if (tok.length > 0) {
+            sendTokenFrame(tokenRoot, tok, name, notesDir);
+            return;
+        }
+        if (Date.now() >= deadline) {
+            sendNativeMessage({
+                type: 'ERROR',
+                error: 'Started the Stikfix host but it did not become ready in time (' + tokenRoot + ').',
+            });
+            process.exit(1);
+        }
+        setTimeout(tick, 200);
+    };
+    setTimeout(tick, 200);
 }
 // ---------------------------------------------------------------------------
 // PICK_FOLDER handler — open the OS dialog, validate, respond, exit (Pitfall 8)
@@ -196,38 +283,23 @@ export function main() {
                 notesDir = join(resolvedRoot, 'notes');
             }
             // Token is required ONLY for GET_TOKEN — read it lazily here.
-            let token;
+            let token = '';
             try {
                 token = readFileSync(join(tokenRoot, '.stikfix-token'), 'utf8').trim();
             }
             catch {
-                sendNativeMessage({
-                    type: 'ERROR',
-                    error: 'No .stikfix-token in ' + tokenRoot + '. Start the host first.',
-                });
-                process.exit(1);
-            }
-            // Port is optional — read if present; SW falls back to port scan (A5 fallback)
-            let port;
-            try {
-                const raw = readFileSync(join(tokenRoot, '.stikfix-port'), 'utf8').trim();
-                const parsed = parseInt(raw, 10);
-                if (!isNaN(parsed)) {
-                    port = parsed;
-                }
+                token = '';
             }
-            catch {
-                // .stikfix-port absent is OK — SW re-probes (A5)
+            if (token.length > 0) {
+                // Happy path: host already running, token on disk → send it and exit.
+                sendTokenFrame(tokenRoot, token, name, notesDir);
+                return;
             }
-            // Send token + port (if known) + host identity, then exit (one-shot)
-            sendNativeMessage({
-                type: 'TOKEN',
-                token,
-                port,
-                name,
-                notesDir,
-            });
-            process.exit(0);
+            // Token missing → the host isn't running yet (fresh install / stopped).
+            // Self-heal: start the host and poll for the token, then send TOKEN. This
+            // keeps the terminal-frame contract (one TOKEN or one ERROR) intact.
+            autoStartAndReturnToken(cfg, tokenRoot, name, notesDir);
+            return;
         }
         if (m.type === 'START_HOST') {
             // Spawn a DETACHED HTTP host for the requested root, then exit (one-shot).

package/dist/host/src/tray.js

@@ -20,7 +20,7 @@
  */
 import { spawn } from 'node:child_process';
 import { writeFileSync, mkdirSync } from 'node:fs';
-import { join } from 'node:path';
+import { dirname, join } from 'node:path';
 import { homedir } from 'node:os';
 /**
  * Directory + path where the embedded tray script is written on each start.
@@ -48,6 +48,7 @@ export function trayScriptPath() {
  */
 export const TRAY_PS1 = String.raw `param(
   [int]$Port,
+  [string]$IconPath,
   [string]$Root,
   [string]$Name,
   [string]$NotesDir,
@@ -67,6 +68,7 @@ try {
 # --- Resolve a custom app icon, else fall back to a stock icon -------------
 function Get-BaseIcon {
   $candidates = @(
+    $IconPath,
     (Join-Path $PSScriptRoot 'stikfix.ico'),
     (Join-Path $Root '.output\chrome-mv3\icon\stikfix.ico'),
     (Join-Path $Root 'public\icon\stikfix.ico')
@@ -193,6 +195,8 @@ export function startTray(opts) {
         const ps1Path = trayScriptPath();
         mkdirSync(join(homedir(), '.local', 'share', 'stikfix'), { recursive: true });
         writeFileSync(ps1Path, TRAY_PS1, { encoding: 'utf8' });
+        // Installed host ships stikfix.ico next to the exe ({app}\stikfix.ico). For npx/dev this points at node's dir and simply won't resolve — Get-BaseIcon falls back to a stock icon.
+        const iconPath = join(dirname(process.execPath), 'stikfix.ico');
         const child = spawn('powershell.exe', [
             '-NoProfile',
             '-ExecutionPolicy',
@@ -203,6 +207,8 @@ export function startTray(opts) {
             ps1Path,
             '-Port',
             String(opts.port),
+            '-IconPath',
+            iconPath,
             '-Root',
             opts.root,
             '-Name',

package/dist/host/stikfix-init.cjs

@@ -199,7 +199,7 @@ function createLauncherFiles(opts) {
     const vbsHostExe = vq(hostExe);
     const vbsRoot = vq(rootArg);
     const vbsPortArg = opts.port !== void 0 ? ` --port ${opts.port}` : "";
-    const vbsRunLine = useExe ? `sh.Run "cmd /c """ & hostExe & """ serve --root """ & root & """${vbsPortArg}", 0, False` : `sh.Run "cmd /c node """ & hostEntry & """ --root """ & root & """${vbsPortArg}", 0, False`;
+    const vbsRunLine = useExe ? `sh.Run """" & hostExe & """ serve --root """ & root & """${vbsPortArg}", 0, False` : `sh.Run "cmd /c node """ & hostEntry & """ --root """ & root & """${vbsPortArg}", 0, False`;
     const vbsContent = [
       "Option Explicit",
       "Dim sh, fso, hostEntry, hostExe, root, portFile, msg, port, f",

package/dist/host/stikfix-native.cjs

@@ -211,11 +211,19 @@ function handleStartHost(cfg, root, spawnFn = import_node_child_process2.spawn,
     emit({ type: "ERROR", error: `START_HOST root does not exist: ${resolvedRoot}` });
     return false;
   }
+  const started = spawnDetachedHost(cfg, resolvedRoot, spawnFn);
+  if (!started.ok) {
+    emit({ type: "ERROR", error: `Failed to start host: ${started.error}` });
+    return false;
+  }
+  emit({ type: "HOST_STARTING", root: resolvedRoot });
+  return true;
+}
+function spawnDetachedHost(cfg, resolvedRoot, spawnFn = import_node_child_process2.spawn) {
   const nodePath = typeof cfg.nodePath === "string" && cfg.nodePath.length > 0 ? cfg.nodePath : process.execPath;
-  const hostEntry = resolveHostEntry(cfg);
   const hostExe = typeof cfg.hostExe === "string" && cfg.hostExe.length > 0 ? cfg.hostExe : void 0;
   const spawnCmd = hostExe ?? nodePath;
-  const spawnArgs = hostExe ? ["serve", "--root", resolvedRoot] : [hostEntry, "--root", resolvedRoot];
+  const spawnArgs = hostExe ? ["serve", "--root", resolvedRoot] : [resolveHostEntry(cfg), "--root", resolvedRoot];
   try {
     const child = spawnFn(spawnCmd, spawnArgs, {
       detached: true,
@@ -223,12 +231,56 @@ function handleStartHost(cfg, root, spawnFn = import_node_child_process2.spawn,
       windowsHide: true
     });
     child.unref();
+    return { ok: true };
   } catch (err) {
-    emit({ type: "ERROR", error: `Failed to start host: ${String(err.message)}` });
-    return false;
+    return { ok: false, error: String(err.message) };
   }
-  emit({ type: "HOST_STARTING", root: resolvedRoot });
-  return true;
+}
+function sendTokenFrame(tokenRoot, token, name, notesDir) {
+  let port;
+  try {
+    const raw = (0, import_node_fs2.readFileSync)((0, import_node_path2.join)(tokenRoot, ".stikfix-port"), "utf8").trim();
+    const parsed = parseInt(raw, 10);
+    if (!isNaN(parsed)) {
+      port = parsed;
+    }
+  } catch {
+  }
+  sendNativeMessage({ type: "TOKEN", token, port, name, notesDir });
+  process.exit(0);
+}
+function autoStartAndReturnToken(cfg, tokenRoot, name, notesDir) {
+  const tokenPath = (0, import_node_path2.join)(tokenRoot, ".stikfix-token");
+  const started = spawnDetachedHost(cfg, tokenRoot);
+  if (!started.ok) {
+    sendNativeMessage({
+      type: "ERROR",
+      error: "No .stikfix-token in " + tokenRoot + " and the host could not be started: " + started.error
+    });
+    process.exit(1);
+  }
+  const deadline = Date.now() + 5e3;
+  const tick = () => {
+    let tok = "";
+    try {
+      tok = (0, import_node_fs2.readFileSync)(tokenPath, "utf8").trim();
+    } catch {
+      tok = "";
+    }
+    if (tok.length > 0) {
+      sendTokenFrame(tokenRoot, tok, name, notesDir);
+      return;
+    }
+    if (Date.now() >= deadline) {
+      sendNativeMessage({
+        type: "ERROR",
+        error: "Started the Stikfix host but it did not become ready in time (" + tokenRoot + ")."
+      });
+      process.exit(1);
+    }
+    setTimeout(tick, 200);
+  };
+  setTimeout(tick, 200);
 }
 async function handlePickFolder(origin, pickFn = pickFolder, plat = process.platform, out) {
   let chosen;
@@ -277,33 +329,18 @@ function main() {
         name = (0, import_node_path2.basename)(resolvedRoot);
         notesDir = (0, import_node_path2.join)(resolvedRoot, "notes");
       }
-      let token;
+      let token = "";
       try {
         token = (0, import_node_fs2.readFileSync)((0, import_node_path2.join)(tokenRoot, ".stikfix-token"), "utf8").trim();
       } catch {
-        sendNativeMessage({
-          type: "ERROR",
-          error: "No .stikfix-token in " + tokenRoot + ". Start the host first."
-        });
-        process.exit(1);
+        token = "";
       }
-      let port;
-      try {
-        const raw = (0, import_node_fs2.readFileSync)((0, import_node_path2.join)(tokenRoot, ".stikfix-port"), "utf8").trim();
-        const parsed = parseInt(raw, 10);
-        if (!isNaN(parsed)) {
-          port = parsed;
-        }
-      } catch {
+      if (token.length > 0) {
+        sendTokenFrame(tokenRoot, token, name, notesDir);
+        return;
       }
-      sendNativeMessage({
-        type: "TOKEN",
-        token,
-        port,
-        name,
-        notesDir
-      });
-      process.exit(0);
+      autoStartAndReturnToken(cfg, tokenRoot, name, notesDir);
+      return;
     }
     if (m.type === "START_HOST") {
       const ok = handleStartHost(cfg, m.root);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stikfix",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "Pin sticky notes on any page — your AI reads them.",
   "license": "MIT",
   "author": "Omer Nesher <omernesher@gmail.com>",