lunel-cli 0.1.96 → 0.1.98

package/dist/ai/codex.js

@@ -7,6 +7,21 @@ import { spawn } from "child_process";
 import { createInterface } from "readline";
 const THREAD_LIST_SOURCE_KINDS = ["cli", "vscode", "appServer", "exec", "unknown"];
 const DEBUG_MODE = process.env.LUNEL_DEBUG === "1" || process.env.LUNEL_DEBUG_AI === "1";
+function joinStreamingText(previousText, nextChunk) {
+    if (!previousText) {
+        return nextChunk;
+    }
+    if (/[\s]$/.test(previousText) || /^[\s]/.test(nextChunk)) {
+        return `${previousText}${nextChunk}`;
+    }
+    if (/^[.,!?;:)\]%}"'`]/.test(nextChunk)) {
+        return `${previousText}${nextChunk}`;
+    }
+    if (/[(\[{/"'`]$/.test(previousText)) {
+        return `${previousText}${nextChunk}`;
+    }
+    return `${previousText} ${nextChunk}`;
+}
 export class CodexProvider {
     proc = null;
     shuttingDown = false;
@@ -557,7 +572,10 @@ export class CodexProvider {
         const nextChunk = this.extractTextPayload(params);
         if (!nextChunk)
             return;
-        const nextText = preferWholeText ? nextChunk : `${this.partTextById.get(partKey) ?? ""}${nextChunk}`;
+        const previousText = this.partTextById.get(partKey) ?? "";
+        const nextText = preferWholeText
+            ? nextChunk
+            : joinStreamingText(previousText, nextChunk);
         this.partTextById.set(partKey, nextText);
         session.updatedAt = Date.now();
         this.upsertLocalMessagePart(session, messageId, {

package/dist/index.js

@@ -2754,6 +2754,7 @@ async function processMessage(message) {
         };
     }
 }
+let currentReattachGeneration = null;
 function normalizeGatewayUrl(input) {
     const raw = input.trim();
     if (!raw) {
@@ -2853,6 +2854,47 @@ async function getAssignedProxyUrl(password) {
     }
     return normalizeGatewayUrl(payload.proxyUrl);
 }
+async function claimReattach(password) {
+    const response = await fetch(new URL("/v2/reattach/claim", MANAGER_URL), {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+            password,
+            role: "cli",
+        }),
+    });
+    if (!response.ok) {
+        let message = `Failed to claim reattach from manager: ${response.status}`;
+        try {
+            const payload = await response.json();
+            if (payload.error) {
+                message = payload.error;
+            }
+            else if (payload.reason) {
+                message = payload.reason;
+            }
+        }
+        catch {
+            // ignore parse failures and use the fallback message
+        }
+        throw new Error(message);
+    }
+    const payload = await response.json();
+    if (typeof payload.proxyUrl !== "string" || !payload.proxyUrl) {
+        throw new Error("Manager returned invalid reattach proxy assignment");
+    }
+    if (typeof payload.generation !== "number" || !Number.isFinite(payload.generation) || payload.generation < 1) {
+        throw new Error("Manager returned invalid reattach generation");
+    }
+    if (typeof payload.expiresAt !== "number" || !Number.isFinite(payload.expiresAt)) {
+        throw new Error("Manager returned invalid reattach expiry");
+    }
+    return {
+        proxyUrl: normalizeGatewayUrl(payload.proxyUrl),
+        generation: payload.generation,
+        expiresAt: payload.expiresAt,
+    };
+}
 async function revokePassword(password, reason = "revoked by cli --new") {
     const response = await fetch(new URL("/v2/revoke", MANAGER_URL), {
         method: "POST",
@@ -2924,6 +2966,7 @@ async function connectWebSocketV2() {
         gatewayUrl,
         password: currentSessionPassword,
         sessionSecret: currentSessionPassword,
+        generation: currentReattachGeneration,
         role: "cli",
         debugLog: DEBUG_MODE ? debugLog : undefined,
         handlers: {
@@ -2998,7 +3041,9 @@ async function handleConnectionDrop(reason) {
         const base = Math.min(250 * 2 ** (attempt - 1), 30_000);
         const delayMs = Math.round(base * (0.8 + Math.random() * 0.4));
         try {
-            currentPrimaryGateway = await getAssignedProxyUrl(currentSessionPassword);
+            const reattach = await claimReattach(currentSessionPassword);
+            currentPrimaryGateway = reattach.proxyUrl;
+            currentReattachGeneration = reattach.generation;
             await connectWebSocketV2();
             debugLog(`[reconnect] connected via ${activeGatewayUrl}`);
             return;
@@ -3069,7 +3114,15 @@ async function main() {
         }
         currentSessionCode = sessionCodeToUse;
         currentSessionPassword = sessionPasswordToUse;
-        currentPrimaryGateway = await getAssignedProxyUrl(sessionPasswordToUse);
+        if (usedSavedSession) {
+            const reattach = await claimReattach(sessionPasswordToUse);
+            currentPrimaryGateway = reattach.proxyUrl;
+            currentReattachGeneration = reattach.generation;
+        }
+        else {
+            currentPrimaryGateway = await getAssignedProxyUrl(sessionPasswordToUse);
+            currentReattachGeneration = null;
+        }
         activeGatewayUrl = currentPrimaryGateway;
         await connectWebSocketV2();
     }

package/dist/transport/protocol.d.ts

@@ -74,4 +74,4 @@ export declare function decodeV2BinaryFrame(data: Uint8Array): {
     type: number;
     payload: Uint8Array;
 } | null;
-export declare function buildSessionV2WsUrl(gatewayUrl: string, role: "cli" | "app", password: string): string;
+export declare function buildSessionV2WsUrl(gatewayUrl: string, role: "cli" | "app", password: string, generation?: number | null): string;

package/dist/transport/protocol.js

@@ -66,11 +66,14 @@ export function decodeV2BinaryFrame(data) {
         payload: data.subarray(3),
     };
 }
-export function buildSessionV2WsUrl(gatewayUrl, role, password) {
+export function buildSessionV2WsUrl(gatewayUrl, role, password, generation) {
     const wsBase = gatewayUrl.replace(/^https:/, "wss:");
     if (!wsBase.startsWith("wss://")) {
         throw new Error("Gateway URL must use https://");
     }
     const query = new URLSearchParams({ password });
+    if (typeof generation === "number" && Number.isFinite(generation) && generation > 0) {
+        query.set("generation", String(generation));
+    }
     return `${wsBase}/v2/ws/${role}?${query.toString()}`;
 }

package/dist/transport/v2.d.ts

@@ -10,6 +10,7 @@ export interface V2TransportOptions {
     gatewayUrl: string;
     password: string;
     sessionSecret: string;
+    generation?: number | null;
     role: "cli" | "app";
     handlers: V2TransportHandlers;
     debugLog?: (message: string, ...args: unknown[]) => void;

package/dist/transport/v2.js

@@ -44,7 +44,7 @@ export class V2SessionTransport {
             this.secureReadyResolve = resolve;
             this.secureReadyReject = reject;
         });
-        const wsUrl = buildSessionV2WsUrl(this.options.gatewayUrl, this.options.role, this.options.password);
+        const wsUrl = buildSessionV2WsUrl(this.options.gatewayUrl, this.options.role, this.options.password, this.options.generation);
         await new Promise((resolve, reject) => {
             const ws = new WebSocket(wsUrl);
             let opened = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lunel-cli",
-  "version": "0.1.96",
+  "version": "0.1.98",
   "author": [
     {
       "name": "Soham Bharambe",