omp-mobile 0.5.1 → 0.6.0

package/package.json

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

package/src/attention.mjs

@@ -31,6 +31,8 @@ import { hostname } from "node:os";
 export const HEARTBEAT_MS = 25_000;
 /** OMP's tool approval is a `select` whose title starts with this. */
 export const TOOL_APPROVAL_PREFIX = "Allow tool:";
+/** The labels OMP starts approval details with (`Command: `, `Path: `), from its `tools/approval.ts` and each tool. */
+const DETAIL_LABEL = /^(?:Command|Path|Paths|Pattern|Language|Code|Content|URL|Reason|Origin):\s*/;
 const ASKING = new Set(["select", "confirm", "input", "editor"]);
 const TEXT_MAX = 280;
 
@@ -127,7 +129,10 @@ export class AttentionTracker {
         const approval = isToolApproval(request);
         const title = typeof request.title === "string" ? request.title : "";
         // OMP's tool approval title is `Allow tool: bash\nCommand: echo hi`: the tool, then its details.
-        const lines = (approval ? title.slice(TOOL_APPROVAL_PREFIX.length) : title).split("\n").map((line) => line.trim());
+        // A notification reads in the phone's language, so OMP's English labels (`Command:`) are left out.
+        const lines = (approval ? title.slice(TOOL_APPROVAL_PREFIX.length) : title)
+          .split("\n")
+          .map((line, index) => (approval && index > 0 ? line.replace(DETAIL_LABEL, "") : line).trim());
         const text = [...lines, request.message].filter(Boolean).join(" · ");
         state.open.set(request.id, emit(approval ? "approval" : "question", request.id, text));
         break;

package/src/rpc-session.mjs

@@ -400,11 +400,14 @@ export class RpcSession extends EventEmitter {
   }
 
   /**
+   * Send a prompt. While a turn runs it is queued as a steer, as Enter in the
+   * terminal does: OMP delivers it at the next step boundary (the queue chips
+   * show it meanwhile). Idle, it starts a turn as before.
    * @param {string} text
    * @param {{type: "image", data: string, mimeType: string}[]} [images] OMP `ImageContent` parts sent with the text.
    */
   async prompt(text, images = []) {
-    return this.request("prompt", images.length > 0 ? { message: text, images } : { message: text });
+    return this.request("prompt", { message: text, ...(images.length > 0 ? { images } : {}), streamingBehavior: "steer" });
   }
 
   async abort() {

package/src/server.mjs

@@ -119,7 +119,8 @@ const OPEN_FAILED_CLOSE_CODE = 4000;
 const BLOB_NAME = /^[0-9a-f]{64}$/;
 
 /** @typedef {{pid: number, busy: boolean, terminal: boolean}} SessionOwner */
-/** @typedef {{id: string, title: string, cwd: string, status: string, model?: string, createdAt: number, updatedAt: number, sessionFile?: string, origin: "daemon" | "omp", openElsewhere?: boolean, owner?: SessionOwner, waiting?: number}} SessionSummary */
+/** @typedef {{id: string, method: string, title: string, message?: string, options?: string[]}} PendingRequest */
+/** @typedef {{id: string, title: string, cwd: string, status: string, model?: string, createdAt: number, updatedAt: number, sessionFile?: string, origin: "daemon" | "omp", openElsewhere?: boolean, owner?: SessionOwner, waiting?: number, request?: PendingRequest}} SessionSummary */
 
 /** An error with the HTTP status it answers, and any detail its JSON answer carries. */
 function httpError(status, message, detail = {}) {
@@ -132,6 +133,29 @@ function errorBody(error) {
   return { error: error instanceof Error ? error.message : String(error), ...detail };
 }
 
+/**
+ * The part of an open extension request a session list shows: enough to answer
+ * a tool approval or a short choice from the home, nothing for a text prompt.
+ * @param {any} request
+ * @returns {PendingRequest | undefined}
+ */
+function pendingOf(request) {
+  if (request === null || typeof request !== "object" || typeof request.id !== "string") return undefined;
+  const pending = { id: request.id, method: String(request.method), title: typeof request.title === "string" ? request.title : "" };
+  if (typeof request.message === "string") pending.message = request.message;
+  if (Array.isArray(request.options)) pending.options = request.options.filter((option) => typeof option === "string");
+  return pending;
+}
+
+/** The answer fields a phone sends, over the session socket or `POST /sessions/:id/answer`. */
+function answerOf(message) {
+  const answer = {};
+  if (typeof message.value === "string") answer.value = message.value;
+  if (typeof message.confirmed === "boolean") answer.confirmed = message.confirmed;
+  if (message.cancelled === true) answer.cancelled = true;
+  return answer;
+}
+
 function parseArgs(argv) {
   const options = {
     host: "127.0.0.1",
@@ -631,6 +655,8 @@ class SessionEntry {
       origin: "daemon",
       // OMP questions and tool approvals still waiting for an answer: the session needs the user.
       waiting: this.openRequests().length,
+      // The oldest of them, so a list can answer it without opening the session.
+      request: pendingOf(this.openRequests()[0]),
     };
   }
 
@@ -683,6 +709,8 @@ class SessionEntry {
       if (STATE_EVENTS.has(event.type)) void this.refreshState();
       // A `todo` tool call rewrites the list before any reminder fires.
       if (event.type === "tool_execution_end" && event.toolName === "todo") void this.refreshState();
+      // A run starting is what makes a session "running" in the list; OMP's state read would lag behind.
+      if (event.type === "agent_start" && this.state !== null && typeof this.state === "object") this.state = { ...this.state, isStreaming: true };
       if (event.type === "turn_end" || event.type === "agent_end") void this.refreshState();
       this.broadcast({ type: "event", event });
     });
@@ -922,6 +950,18 @@ class Daemon {
         sendJson(res, 200, this.transcript(decodeURIComponent(transcript[1]), deltaQuery(url.searchParams)));
         return;
       }
+      const answer = /^\/sessions\/([^/]+)\/answer$/.exec(url.pathname);
+      if (answer !== null && req.method === "POST") {
+        const body = await readBody(req);
+        const live = this.sessions.get(decodeURIComponent(answer[1]));
+        if (live === undefined) throw httpError(404, "session is not running");
+        if (typeof body.id !== "string" || !live.openRequests().some((request) => request.id === body.id)) {
+          throw httpError(409, "that question was already answered");
+        }
+        live.rpc.respondExtension(body.id, answerOf(body));
+        sendJson(res, 200, { ok: true });
+        return;
+      }
       const match = /^\/sessions\/([^/]+)$/.exec(url.pathname);
       if (match !== null) {
         const id = decodeURIComponent(match[1]);
@@ -1318,11 +1358,7 @@ class Daemon {
           return;
         case "approval": {
           if (typeof message.id !== "string") throw new Error("missing approval id");
-          const answer = {};
-          if (typeof message.value === "string") answer.value = message.value;
-          if (typeof message.confirmed === "boolean") answer.confirmed = message.confirmed;
-          if (message.cancelled === true) answer.cancelled = true;
-          entry.rpc.respondExtension(message.id, answer);
+          entry.rpc.respondExtension(message.id, answerOf(message));
           ws.send(JSON.stringify({ type: "accepted", command: "approval" }));
           return;
         }

package/src/transcripts.mjs

@@ -136,7 +136,7 @@ export class TranscriptStore {
       base: Number.isSafeInteger(base) && base > 0 ? base : 0,
       messages,
       state: state !== null && typeof state === "object" ? { ...state, isStreaming: false } : state,
-      session: { ...session, status: "idle", waiting: 0 },
+      session: { ...session, status: "idle", waiting: 0, request: undefined },
     };
     try {
       mkdirSync(this.dir, { recursive: true, mode: 0o700 });