@rubytech/create-realagent 1.0.722 → 1.0.736

package/payload/server/public/index.html

@@ -5,7 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Real Agent</title>
   <link rel="icon" href="/favicon.ico">
-  <script type="module" crossorigin src="/assets/admin-GdSFnwBR.js"></script>
+  <script type="module" crossorigin src="/assets/admin-BKdSPr9G.js"></script>
   <link rel="modulepreload" crossorigin href="/assets/chunk-DD-I1_y5.js">
   <link rel="modulepreload" crossorigin href="/assets/jsx-runtime-BkCc5_JK.js">
   <link rel="modulepreload" crossorigin href="/assets/preload-helper-BEFjQwLd.js">

package/payload/server/server.js

@@ -1,35 +1,65 @@
 import {
-  GREETING_DIRECTIVE,
-  HAIKU_MODEL,
   Hono,
   LOG_DIR,
   MAXY_DIR,
   TELEGRAM_ADMIN_WEBHOOK_SECRET_FILE,
   TELEGRAM_WEBHOOK_SECRET_FILE,
   USERS_FILE,
-  __commonJS,
-  __toESM,
-  agentLogStream,
-  backfillNullUserIdConversations,
-  bindVisitorToGroup,
   buildX11Env,
   callOauthLlm,
   canAccessAdmin,
-  checkGroupMembership,
   checkRateLimit,
   clearRateLimit,
-  clearSessionHistory,
   clientIpMiddleware,
   compactSession,
-  completeGrantSetup,
   computeConstraints,
   createRemoteSession,
-  deleteConversation,
-  embed,
   ensureAuth,
   ensureCdp,
   ensureLogDir,
   ensureVnc,
+  hashPassword,
+  invokeAgent,
+  isActionActive,
+  isPasswordValid,
+  isRemoteAuthConfigured,
+  keyFilePath,
+  launchAction,
+  load,
+  logPath,
+  recordFailedAttempt,
+  render,
+  renderLoginPage,
+  requireAdminSession,
+  resolveBrowserTransport,
+  resolveClientIp,
+  safeJson,
+  sanitizeClientCorrId,
+  serve,
+  setRemotePassword,
+  sleep,
+  streamLogPathFor,
+  validateKey,
+  validatePasswordStrength,
+  verifyPassword,
+  verifyRemotePassword,
+  vncLog,
+  waitForExit,
+  writeChromiumWrapper
+} from "./chunk-ULVR2RRY.js";
+import {
+  GREETING_DIRECTIVE,
+  HAIKU_MODEL,
+  __commonJS,
+  __toESM,
+  agentLogStream,
+  backfillNullUserIdConversations,
+  bindVisitorToGroup,
+  checkGroupMembership,
+  clearSessionHistory,
+  completeGrantSetup,
+  deleteConversation,
+  embed,
   fetchBranding,
   findGroupBySlug,
   findRecentConversation,
@@ -49,56 +79,30 @@ import {
   getUserNameForSession,
   getUserTimezone,
   getVisitorIdForSession,
-  hashPassword,
-  invokeAgent,
-  isActionActive,
-  isPasswordValid,
-  isRemoteAuthConfigured,
-  keyFilePath,
-  launchAction,
+  interruptClient,
   listAdminSessions,
   listAdminSessionsInProgress,
-  load,
   loadOnboardingStep,
-  logPath,
   preConversationLogStream,
-  recordFailedAttempt,
+  preflushStreamLogKey,
   registerGrantSession,
   registerResumedSession,
   registerSession,
   renameConversation,
-  render,
-  renderLoginPage,
-  requireAdminSession,
   resolveAccount,
   resolveAgentConfig,
-  resolveBrowserTransport,
-  resolveClientIp,
   resolveDefaultAgentSlug,
   resolveUserAccounts,
-  safeJson,
-  sanitizeClientCorrId,
   seedSessionHistory,
-  serve,
   setConversationIdForSession,
   setGroupContextForSession,
-  setRemotePassword,
   sigtermFlushStreamLogs,
-  sleep,
-  streamLogPathFor,
   unregisterSession,
   validateAgentSlug,
-  validateKey,
-  validatePasswordStrength,
   validateSession,
   verifyAndGetConversationUpdatedAt,
-  verifyConversationOwnership,
-  verifyPassword,
-  verifyRemotePassword,
-  vncLog,
-  waitForExit,
-  writeChromiumWrapper
-} from "./chunk-FM5JMRED.js";
+  verifyConversationOwnership
+} from "./chunk-3KDVGWPQ.js";
 
 // ../lib/graph-trash/dist/index.js
 var require_dist = __commonJS({
@@ -7820,6 +7824,7 @@ var session_default2 = app10;
 
 // server/routes/admin/chat.ts
 import { resolve as resolve12 } from "path";
+import { appendFileSync as appendFileSync4 } from "fs";
 
 // app/lib/script-stream-tailer.ts
 import * as childProcess from "child_process";
@@ -8106,6 +8111,16 @@ function chatReject(status, error, sk) {
   });
 }
 var app11 = new Hono();
+app11.post("/cancel", requireAdminSession, async (c) => {
+  const session_key = c.var.sessionKey;
+  try {
+    const { interruptClient: interruptClient2 } = await import("./client-pool-I5TCP7WI.js");
+    await interruptClient2(session_key);
+    return c.json({ ok: true });
+  } catch (err) {
+    return c.json({ ok: false, error: err instanceof Error ? err.message : String(err) }, 500);
+  }
+});
 app11.post("/", requireAdminSession, async (c) => {
   const session_key = c.var.sessionKey;
   const contentType = c.req.header("content-type") ?? "";
@@ -8254,13 +8269,107 @@ app11.post("/", requireAdminSession, async (c) => {
   }
   const encoder = new TextEncoder();
   const sseConvId = getConversationIdForSession(session_key);
-  const sseLog = sseConvId ? agentLogStream("sse-events", account.accountDir, sseConvId) : preConversationLogStream("sse-events", account.accountDir);
+  const sseLogStream = sseConvId ? agentLogStream("sse-events", account.accountDir, sseConvId) : preConversationLogStream("sse-events", account.accountDir);
   const sk = sseConvId?.slice(0, 8) ?? session_key.slice(0, 8);
+  const teeStreamLogKey = sseConvId ?? preflushStreamLogKey(session_key);
+  const teeStreamLogPath = resolve12(account.accountDir, "logs", `claude-agent-stream-${teeStreamLogKey}.log`);
+  try {
+    appendFileSync4(teeStreamLogPath, `[${(/* @__PURE__ */ new Date()).toISOString()}] [chat-route-version=task606-incoming-close] sessionKey=${session_key.slice(0, 12)}\u2026
+`);
+  } catch {
+  }
+  const incoming = c.env?.incoming;
+  if (incoming && typeof incoming.on === "function") {
+    incoming.on("close", () => {
+      const tsClose = (/* @__PURE__ */ new Date()).toISOString();
+      try {
+        appendFileSync4(teeStreamLogPath, `[${tsClose}] [incoming-close] sessionKey=${session_key.slice(0, 12)}\u2026 complete=${incoming.complete}
+`);
+      } catch {
+      }
+      if (incoming.complete === false) {
+        console.error(`[${tsClose}] [incoming-close] DISCONNECT sessionKey=${session_key.slice(0, 12)}\u2026`);
+        interruptClient(session_key).catch((err) => {
+          try {
+            appendFileSync4(teeStreamLogPath, `[${(/* @__PURE__ */ new Date()).toISOString()}] [incoming-close] interrupt-failed: ${err instanceof Error ? err.message : String(err)}
+`);
+          } catch {
+          }
+        });
+      }
+    });
+  } else {
+    try {
+      appendFileSync4(teeStreamLogPath, `[${(/* @__PURE__ */ new Date()).toISOString()}] [incoming-close] UNAVAILABLE \u2014 c.env.incoming is not an EventEmitter
+`);
+    } catch {
+    }
+  }
+  const sseLog = {
+    write(line) {
+      try {
+        sseLogStream.write(line);
+      } catch {
+      }
+      try {
+        appendFileSync4(teeStreamLogPath, line);
+      } catch {
+      }
+      return true;
+    },
+    end() {
+      try {
+        sseLogStream.end();
+      } catch {
+      }
+    }
+  };
   let tailer = null;
   const readable = new ReadableStream({
+    // Task 606 — fires when the consumer (Hono's response writer / Node
+    // adapter) cancels the stream because the client disconnected. This is
+    // the only signal that arrives WHILE start()'s for-await is blocked
+    // awaiting the SDK's next message — c.req.raw.signal didn't propagate
+    // under @hono/node-server, and controller.enqueue throwing only
+    // surfaces on the next yielded event (which never comes if the model
+    // is mid-response when Cancel is pressed). cancel() is the load-bearing
+    // hook for operator abort.
+    //
+    // Synchronous trace writes go to BOTH the per-conv stream log (where
+    // operators read) AND console.error (server.log backstop). This lets
+    // us prove definitively whether this callback is even being invoked
+    // by @hono/node-server on disconnect.
+    cancel(reason) {
+      const ts = (/* @__PURE__ */ new Date()).toISOString().slice(11, 23);
+      const reasonStr = typeof reason === "string" ? reason : reason instanceof Error ? reason.message : "consumer-cancelled";
+      sseLog.write(`[${ts}] [${sk}] admin: CANCEL [stream-cancel] reason=${reasonStr}
+`);
+      console.error(`[${(/* @__PURE__ */ new Date()).toISOString()}] [stream-cancel-callback] sessionKey=${session_key.slice(0, 12)}\u2026 reason=${JSON.stringify(reasonStr)}`);
+      interruptClient(session_key).catch((err) => {
+        sseLog.write(`[${ts}] [${sk}] admin: ABORT [interrupt-failed] ${err instanceof Error ? err.message : String(err)}
+`);
+      });
+    },
     async start(controller) {
       let controllerOpen = true;
       const sseEntry = { controller, conversationId: sseConvId ?? null, sessionKey: session_key };
+      try {
+        const reqSignal = c.req.raw?.signal;
+        if (reqSignal) {
+          reqSignal.addEventListener("abort", () => {
+            const abortLogKey = sseConvId ?? preflushStreamLogKey(session_key);
+            const abortStreamLog = agentLogStream("claude-agent-stream", account.accountDir, abortLogKey);
+            const ts = (/* @__PURE__ */ new Date()).toISOString().slice(11, 23);
+            sseLog.write(`[${ts}] [${sk}] admin: ABORT [operator-cancel] interrupting pool client
+`);
+            interruptClient(session_key, abortStreamLog).catch((err) => {
+              sseLog.write(`[${ts}] [${sk}] admin: ABORT [interrupt-failed] ${err instanceof Error ? err.message : String(err)}
+`);
+            });
+          }, { once: true });
+        }
+      } catch {
+      }
       try {
         registerAdminSSE(sseEntry);
         if (sseConvId) {
@@ -8308,6 +8417,10 @@ app11.post("/", requireAdminSession, async (c) => {
         if (controllerClosed) {
           sseLog.write(`[${ts}] [${sk}] admin: DISCONNECT [client_disconnect] ${rawMessage}
 `);
+          interruptClient(session_key).catch((interruptErr) => {
+            sseLog.write(`[${ts}] [${sk}] admin: ABORT [interrupt-failed] ${interruptErr instanceof Error ? interruptErr.message : String(interruptErr)}
+`);
+          });
         } else {
           const category = classifyAgentError(err);
           const errEvent = JSON.stringify({ type: "text", content: friendlyAgentError(err) });