lunel-cli 0.1.46 → 0.1.47

package/dist/ai/codex.d.ts

@@ -6,6 +6,7 @@ export declare class CodexProvider implements AIProvider {
     private nextId;
     private pending;
     private sessions;
+    private sessionIdByThreadId;
     init(): Promise<void>;
     destroy(): Promise<void>;
     subscribe(emitter: AiEventEmitter): () => void;
@@ -43,4 +44,8 @@ export declare class CodexProvider implements AIProvider {
     private send;
     private call;
     private handleLine;
+    private ensureThread;
+    private ingestThreadMetadata;
+    private extractThreadId;
+    private readString;
 }

package/dist/ai/codex.js

@@ -28,6 +28,7 @@ export class CodexProvider {
     nextId = 1;
     pending = new Map();
     sessions = new Map();
+    sessionIdByThreadId = new Map();
     // -------------------------------------------------------------------------
     // Lifecycle
     // -------------------------------------------------------------------------
@@ -76,10 +77,7 @@ export class CodexProvider {
         this.sessions.set(id, session);
         // Start a new Codex thread for this session.
         try {
-            const result = await this.call("thread/start", { title });
-            if (result?.threadId) {
-                session.threadId = result.threadId;
-            }
+            await this.ensureThread(session);
         }
         catch (err) {
             console.warn("[codex] thread/start failed:", err.message);
@@ -102,6 +100,10 @@ export class CodexProvider {
         return { session: { id: s.id, title: s.title ?? "", created: s.createdAt } };
     }
     async deleteSession(id) {
+        const session = this.sessions.get(id);
+        if (session?.threadId) {
+            this.sessionIdByThreadId.delete(session.threadId);
+        }
         this.sessions.delete(id);
         return {};
     }
@@ -117,7 +119,6 @@ export class CodexProvider {
     // -------------------------------------------------------------------------
     async prompt(sessionId, text, model, agent) {
         const session = this.sessions.get(sessionId);
-        const threadId = session?.threadId;
         // Append the user message to local history immediately.
         if (session) {
             session.messages.push({
@@ -128,20 +129,33 @@ export class CodexProvider {
             });
         }
         // Fire-and-forget — the response streams back as JSON-RPC notifications.
-        this.call("turn/start", {
-            ...(threadId ? { threadId } : { sessionId }),
-            message: { role: "user", content: text },
-            ...(model ? { model: `${model.providerID}/${model.modelID}` } : {}),
-            ...(agent ? { agent } : {}),
-        }).catch((err) => {
-            console.error("[codex] turn/start error:", err.message);
-            this.emitter?.({ type: "prompt_error", properties: { sessionId, error: err.message } });
-        });
+        (async () => {
+            try {
+                if (!session) {
+                    throw new Error(`Session ${sessionId} not found`);
+                }
+                const threadId = await this.ensureThread(session);
+                await this.call("turn/start", {
+                    threadId,
+                    input: [{ type: "message", role: "user", content: [{ type: "input_text", text }] }],
+                    ...(model ? { model: `${model.providerID}/${model.modelID}` } : {}),
+                    ...(agent ? { agent } : {}),
+                });
+            }
+            catch (err) {
+                const message = err.message;
+                console.error("[codex] turn/start error:", message);
+                this.emitter?.({ type: "prompt_error", properties: { sessionId, error: message } });
+            }
+        })();
         return { ack: true };
     }
     async abort(sessionId) {
         const session = this.sessions.get(sessionId);
-        await this.call("turn/abort", { ...(session?.threadId ? { threadId: session.threadId } : { sessionId }) });
+        if (!session?.threadId) {
+            throw new Error(`Session ${sessionId} has no active Codex thread`);
+        }
+        await this.call("turn/abort", { threadId: session.threadId });
         return {};
     }
     // -------------------------------------------------------------------------
@@ -181,8 +195,11 @@ export class CodexProvider {
     // -------------------------------------------------------------------------
     async command(sessionId, command, args) {
         const session = this.sessions.get(sessionId);
+        if (!session?.threadId) {
+            throw new Error(`Session ${sessionId} has no active Codex thread`);
+        }
         const result = await this.call("session/command", {
-            ...(session?.threadId ? { threadId: session.threadId } : { sessionId }),
+            threadId: session.threadId,
             command,
             arguments: args,
         });
@@ -190,16 +207,22 @@ export class CodexProvider {
     }
     async revert(sessionId, messageId) {
         const session = this.sessions.get(sessionId);
+        if (!session?.threadId) {
+            throw new Error(`Session ${sessionId} has no active Codex thread`);
+        }
         await this.call("session/revert", {
-            ...(session?.threadId ? { threadId: session.threadId } : { sessionId }),
+            threadId: session.threadId,
             messageId,
         });
         return {};
     }
     async unrevert(sessionId) {
         const session = this.sessions.get(sessionId);
+        if (!session?.threadId) {
+            throw new Error(`Session ${sessionId} has no active Codex thread`);
+        }
         await this.call("session/unrevert", {
-            ...(session?.threadId ? { threadId: session.threadId } : { sessionId }),
+            threadId: session.threadId,
         });
         return {};
     }
@@ -209,8 +232,11 @@ export class CodexProvider {
     }
     async permissionReply(sessionId, permissionId, response) {
         const session = this.sessions.get(sessionId);
+        if (!session?.threadId) {
+            throw new Error(`Session ${sessionId} has no active Codex thread`);
+        }
         await this.call("session/permission", {
-            ...(session?.threadId ? { threadId: session.threadId } : { sessionId }),
+            threadId: session.threadId,
             permissionId,
             response,
         });
@@ -265,7 +291,62 @@ export class CodexProvider {
         const notif = msg;
         const params = (notif.params ?? {});
         const mappedType = NOTIFICATION_TYPE_MAP[notif.method] ?? notif.method;
+        this.ingestThreadMetadata(params);
         console.log("[codex]", notif.method);
         this.emitter?.({ type: mappedType, properties: params });
     }
+    async ensureThread(session) {
+        if (session.threadId)
+            return session.threadId;
+        const result = await this.call("thread/start", {
+            ...(session.title ? { title: session.title } : {}),
+        });
+        const threadId = this.extractThreadId(result);
+        if (!threadId) {
+            throw new Error("thread/start response missing threadId");
+        }
+        session.threadId = threadId;
+        this.sessionIdByThreadId.set(threadId, session.id);
+        return threadId;
+    }
+    ingestThreadMetadata(payload) {
+        const threadId = this.extractThreadId(payload);
+        if (!threadId)
+            return;
+        const sessionId = this.sessionIdByThreadId.get(threadId);
+        if (sessionId) {
+            const session = this.sessions.get(sessionId);
+            if (session) {
+                session.threadId = threadId;
+            }
+            return;
+        }
+        for (const session of this.sessions.values()) {
+            if (!session.threadId) {
+                session.threadId = threadId;
+                this.sessionIdByThreadId.set(threadId, session.id);
+                return;
+            }
+        }
+    }
+    extractThreadId(payload) {
+        if (!payload || typeof payload !== "object")
+            return undefined;
+        const obj = payload;
+        const direct = this.readString(obj.threadId) ??
+            this.readString(obj.thread_id);
+        if (direct)
+            return direct;
+        const thread = obj.thread;
+        if (thread && typeof thread === "object") {
+            const threadObj = thread;
+            return (this.readString(threadObj.id) ??
+                this.readString(threadObj.threadId) ??
+                this.readString(threadObj.thread_id));
+        }
+        return undefined;
+    }
+    readString(value) {
+        return typeof value === "string" && value.trim() ? value.trim() : undefined;
+    }
 }

package/package.json

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