omp-mobile 0.4.3 → 0.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omp-mobile",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "The computer side of OMP Mobile: runs oh-my-pi sessions and serves them to the phone app over Tailscale.",
   "keywords": [
     "mobile",

package/src/omp-extension.mjs

@@ -21,7 +21,7 @@ import { homedir } from "node:os";
 import { delimiter, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { renderQr } from "./qr.mjs";
-import { requestPath } from "./takeover.mjs";
+import { requestPath, shellWord } from "./takeover.mjs";
 
 const HOME = join(homedir(), ".omp-mobile");
 const STATE_FILE = join(HOME, "daemon.json");
@@ -229,7 +229,7 @@ export default function ompMobile(pi) {
       rmSync(requestPath(file), { force: true });
       // OMP closes once the session is idle; the daemon signals it if that does not come soon,
       // and tells the terminal where the session went once omp is gone.
-      ctx.ui.notify(`OMP Mobile: this session continues on ${request.device}. Closing omp here…`, "warning");
+      ctx.ui.notify(`OMP Mobile: this session continues on ${request.device}. Closing omp here; resume it later with: omp --resume ${shellWord(file)}`, "warning");
       if (!ctx.isIdle()) {
         ctx.abort();
         const deadline = Date.now() + TAKEOVER_IDLE_WAIT_MS;

package/src/server.mjs

@@ -58,8 +58,6 @@ const IDLE_SESSION_MS = 30 * 60_000;
 const REAP_INTERVAL_MS = 60_000;
 /** Messages a live session keeps in memory; older ones leave its front (its `base` counts them). */
 const MAX_LIVE_MESSAGES = 5_000;
-/** Events that are a session being used: a turn and what it streams. State and setting echoes are not. */
-const ACTIVITY_EVENT = /^(agent_|turn_|message_|tool_execution_|auto_compaction_|auto_retry_)/;
 /**
  * The fields of a tool result's `details` the app reads: an edit's diff, a
  * read's line count, a command's run time, a screenshot's file. The rest
@@ -638,8 +636,10 @@ class SessionEntry {
 
   bind() {
     this.rpc.on("event", (event) => {
-      if (typeof event?.type === "string" && ACTIVITY_EVENT.test(event.type)) this.updatedAt = Date.now();
       if (event.type === "message_end" && event.message) {
+        // A new message is what makes a session the most recent one; opening it,
+        // a lifecycle event from a resumed omp, or a state echo are not.
+        this.updatedAt = Date.now();
         this.messages.push(phoneMessage(event.message, this.blobDir));
         if (this.messages.length > MAX_LIVE_MESSAGES) {
           // Indices stay the transcript's: a phone's `since` still lines up after the front is dropped.
@@ -1125,7 +1125,7 @@ class Daemon {
       const deadline = Date.now() + 3_000;
       while ((await this.owners())?.get(id) === pid && Date.now() < deadline) await new Promise((wait) => setTimeout(wait, 100));
       // Whoever looks at the terminal sees why omp closed.
-      if (info?.tty !== undefined) tellTerminal(info.tty, takeoverFarewell(device));
+      if (info?.tty !== undefined) tellTerminal(info.tty, takeoverFarewell({ device, sessionFile: stored.sessionFile }));
       const forks = forksOf(dirname(stored.sessionFile), id, since);
       if (forks.length > 0) this.log(new Error(`taking over ${id} from pid ${pid} left forked session files: ${forks.join(", ")}`));
       outcome = { pid, via: left.via, waitedMs: left.waitedMs, busy, forks };
@@ -1253,6 +1253,8 @@ class Daemon {
           const text = typeof message.text === "string" ? message.text : "";
           if (text.trim() === "" && images.length === 0) throw new Error("empty prompt");
           await entry.rpc.prompt(text, images);
+          entry.updatedAt = Date.now();
+          entry.onChange?.(entry);
           ws.send(JSON.stringify({ type: "accepted", command: "prompt" }));
           return;
         }
@@ -1284,7 +1286,6 @@ class Daemon {
           }
           const state = await entry.rpc.setModel(message.provider, message.modelId);
           entry.state = state;
-          entry.updatedAt = Date.now();
           entry.onChange?.(entry);
           entry.broadcast({ type: "state", state });
           ws.send(JSON.stringify({ type: "accepted", command: "set_model" }));
@@ -1301,7 +1302,6 @@ class Daemon {
           if (typeof message.level !== "string" || message.level === "") throw new Error("set_thinking_level needs a level");
           const state = await entry.rpc.setThinkingLevel(message.level);
           entry.state = state;
-          entry.updatedAt = Date.now();
           entry.broadcast({ type: "state", state });
           ws.send(JSON.stringify({ type: "accepted", command: "set_thinking_level" }));
           return;

package/src/takeover.mjs

@@ -175,9 +175,21 @@ export function tellTerminal(tty, text) {
   }
 }
 
-/** What the terminal is told once omp left it. */
-export function takeoverFarewell(device) {
-  return `omp-mobile: this session continues on ${device}. omp closed here so the phone could take it over.`;
+/** A path as a shell word: quoted only when it has to be. */
+export function shellWord(value) {
+  return /^[A-Za-z0-9_@%+=:,./-]+$/.test(value) ? value : `'${String(value).replace(/'/g, `'\\''`)}'`;
+}
+
+/**
+ * What the terminal is told once omp left it: where the session went, and the
+ * command that brings it back -- the hint leaving omp by hand also leaves.
+ * @param {{device: string, sessionFile: string}} leaving
+ */
+export function takeoverFarewell({ device, sessionFile }) {
+  const lines = [`This session continues on the phone (${device}).`, "omp closed here so the phone could take it over."];
+  const file = typeof sessionFile === "string" && sessionFile !== "" ? shellWord(sessionFile) : "";
+  if (file !== "") lines.push("", "Resume it in this terminal with:", `  omp --resume ${file}`);
+  return lines.join("\n");
 }
 
 const sleep = (ms) => new Promise((resolveSleep) => setTimeout(resolveSleep, ms));