neagen 0.1.4 → 0.1.6

package/lib/approval-format.d.mts

@@ -0,0 +1,15 @@
+// Type surface for the plain-ESM formatter so root TS tests can import it.
+export type ApprovalInputRequest = {
+  requestId: string;
+  prompt: string;
+  action?: {
+    kind?: string;
+    callId?: string;
+    toolName?: string;
+    input?: Record<string, unknown>;
+  };
+  [key: string]: unknown;
+};
+
+export function decorateApprovalRequest<T extends ApprovalInputRequest>(request: T): T;
+export function decorateApprovalRequests<T>(requests: T): T;

package/lib/approval-format.mjs

@@ -0,0 +1,102 @@
+// Human-readable approval prompts for outbound agent-mail tools. Eve's default
+// approval prompt is "Approve tool call: <name>" plus raw input JSON; for the
+// tools that ship Owner content to another party we replace it with a card the
+// Owner can actually review (recipient, file identity, content preview).
+// Presentation only: the enforcement stays server-side (signed review, egress
+// gate, approval: always()).
+
+const PREVIEW_MAX_LINES = 12;
+const PREVIEW_MAX_LINE_CHARS = 100;
+const BODY_MAX_CHARS = 700;
+const RULE = "─".repeat(44);
+
+function formatBytes(size) {
+  if (!Number.isFinite(size)) return "unknown size";
+  if (size < 1024) return `${size} B`;
+  if (size < 1024 * 1024) return `${(size / 1024).toFixed(1)} KB`;
+  return `${(size / (1024 * 1024)).toFixed(1)} MB`;
+}
+
+function clampLine(line) {
+  return line.length > PREVIEW_MAX_LINE_CHARS
+    ? `${line.slice(0, PREVIEW_MAX_LINE_CHARS - 1)}…`
+    : line;
+}
+
+function previewBlock(text, { truncated = false } = {}) {
+  const lines = String(text).split("\n");
+  const shown = lines.slice(0, PREVIEW_MAX_LINES).map((line) => `  │ ${clampLine(line)}`);
+  const clipped = truncated || lines.length > PREVIEW_MAX_LINES;
+  return [
+    `  ${RULE}`,
+    ...shown,
+    clipped ? `  ${RULE} (preview truncated)` : `  ${RULE}`,
+  ];
+}
+
+function clampBody(body) {
+  const text = String(body);
+  return text.length > BODY_MAX_CHARS
+    ? { text: `${text.slice(0, BODY_MAX_CHARS)}…`, truncated: true }
+    : { text, truncated: false };
+}
+
+function formatSendFilePrompt(input) {
+  const review = input?.review;
+  if (!review || typeof review !== "object") return undefined;
+  const to = review.to ?? input?.to ?? "connection";
+  const header = [
+    `Send file to ${to}?`,
+    `  ${review.filename} · ${review.contentType} · ${formatBytes(review.size)}`,
+    `  sha256 ${String(review.sha256).slice(0, 16)}…`,
+  ];
+  return [
+    ...header,
+    ...previewBlock(review.preview ?? "", { truncated: review.previewTruncated === true }),
+    "Approve to deliver this exact file. Deny to cancel.",
+  ].join("\n");
+}
+
+function formatSendMessagePrompt(input) {
+  if (typeof input?.body !== "string") return undefined;
+  const { text, truncated } = clampBody(input.body);
+  return [
+    `Send message${input.to ? ` to ${input.to}` : ""}?`,
+    ...previewBlock(text, { truncated }),
+    "Approve to send. Deny to cancel.",
+  ].join("\n");
+}
+
+function formatApproveDraftPrompt(input) {
+  const lines = [`Approve and send draft${input?.draftId ? ` ${String(input.draftId).slice(0, 8)}…` : ""}?`];
+  if (typeof input?.body === "string") {
+    const { text, truncated } = clampBody(input.body);
+    lines.push(...previewBlock(text, { truncated }), "(revised body shown above)");
+  }
+  lines.push("Approve to send. Deny to cancel.");
+  return lines.join("\n");
+}
+
+const FORMATTERS = {
+  send_file: formatSendFilePrompt,
+  send_message: formatSendMessagePrompt,
+  approve_draft: formatApproveDraftPrompt,
+};
+
+/**
+ * Returns a copy of the input request with a human-readable prompt when the
+ * tool is one of the outbound agent-mail tools; otherwise returns it unchanged.
+ */
+export function decorateApprovalRequest(request) {
+  const toolName = request?.action?.toolName;
+  const format = toolName ? FORMATTERS[toolName] : undefined;
+  if (!format) return request;
+  const prompt = format(request.action?.input ?? {});
+  return prompt ? { ...request, prompt } : request;
+}
+
+/** Rewrites prompts on any request list carried by a stream event (in place-safe copy). */
+export function decorateApprovalRequests(requests) {
+  if (!Array.isArray(requests)) return requests;
+  return requests.map((request) => decorateApprovalRequest(request));
+}

package/lib/device-login.mjs

@@ -85,7 +85,7 @@ export async function runDeviceGrantLogin({ host, profile, renderer }) {
 
     ui.renderLine(`Your code:  ${code.user_code}`, "info");
     ui.renderLine(code.verification_uri_complete, "info");
-    ui.renderLine("Opening your browser — create or sign in, then approve…", "info");
+    ui.renderLine("Opening your browser. Create or sign in, then approve…", "info");
     // Mirror to stderr so login is never silent if the panel hasn't painted yet.
     console.error(
       `\n  Your code:   ${code.user_code}\n  Approve at:  ${code.verification_uri_complete}\n\n` +
@@ -97,8 +97,18 @@ export async function runDeviceGrantLogin({ host, profile, renderer }) {
     const intervalMs = (code.interval ?? 5) * 1000;
     const deadline = Date.now() + (code.expires_in ?? 600) * 1000;
 
+    let lastReminderAt = Date.now();
     while (Date.now() < deadline) {
-      ui.setStatus("Waiting for passkey approval…");
+      // Keep the code and remaining time visible so a failed browser-open never
+      // strands the user scrolling back for the URL.
+      const minutesLeft = Math.max(1, Math.ceil((deadline - Date.now()) / 60_000));
+      ui.setStatus(
+        `Waiting for passkey approval… code ${code.user_code}, ~${minutesLeft} min left`,
+      );
+      if (Date.now() - lastReminderAt >= 60_000) {
+        lastReminderAt = Date.now();
+        ui.renderLine(`Still waiting. Approve at: ${code.verification_uri_complete}`, "info");
+      }
       await new Promise((r) => setTimeout(r, intervalMs));
 
       const tokRes = await fetch(`${host}/api/auth/device/token`, {
@@ -129,7 +139,7 @@ export async function runDeviceGrantLogin({ host, profile, renderer }) {
       throw new Error(err.error_description ?? err.error ?? "device/token failed");
     }
 
-    ui.renderLine("The code expired before approval. Run neagen again.", "error");
+    ui.renderLine("The code expired before approval. Run `neagen login` for a fresh one.", "error");
     throw new Error("device code expired");
   } finally {
     ui.setStatus(undefined);

package/lib/eve-product-tui.mjs

@@ -14,6 +14,7 @@ import {
   selectModel,
 } from "./api.mjs";
 import { runDeviceGrantLogin } from "./device-login.mjs";
+import { decorateApprovalRequests } from "./approval-format.mjs";
 import { parseSseChunk } from "./turn-stream.mjs";
 import { subscribeInboxWakeAuto } from "./wake.mjs";
 
@@ -98,6 +99,18 @@ function isBoundaryEvent(event) {
     event?.type === "session.failed";
 }
 
+// Swap Eve's raw "Approve tool call: <name>" prompt for a reviewable card on
+// the events that carry approval requests. Presentation only; see approval-format.mjs.
+function decorateEventData(event, data) {
+  if (event === "input.requested" && Array.isArray(data?.requests)) {
+    return { ...data, requests: decorateApprovalRequests(data.requests) };
+  }
+  if (event === "session.waiting" && Array.isArray(data?.inputRequests)) {
+    return { ...data, inputRequests: decorateApprovalRequests(data.inputRequests) };
+  }
+  return data;
+}
+
 async function* readProductTurnEvents(response, onProductEvent) {
   if (!response.ok) {
     let message = `HTTP ${response.status}`;
@@ -143,7 +156,7 @@ async function* readProductTurnEvents(response, onProductEvent) {
       return;
     }
 
-    const eveEvent = { type: event, data };
+    const eveEvent = { type: event, data: decorateEventData(event, data) };
     if (isBoundaryEvent(eveEvent)) {
       heldBoundary = eveEvent;
       return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neagen",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Your personal networking agent, in the terminal. Chat, agent-mail, and files against your Neagen — passkey login, no passwords.",
   "type": "module",
   "bin": {