lunel-cli 0.1.50 → 0.1.52

package/dist/ai/codex.d.ts

@@ -96,8 +96,12 @@ export declare class CodexProvider implements AIProvider {
     private extractIncomingItem;
     private describeToolPart;
     private normalizeStructuredType;
+    private isFileChangeStructuredItem;
     private extractStructuredOutput;
     private extractDiffLikePayload;
+    private renderFileChangeEntriesBody;
+    private renderUnifiedDiffBody;
+    private normalizedFileChangeStatus;
     private extractToolInput;
     private describeCompletedItemOutput;
 }

package/dist/ai/codex.js

@@ -504,7 +504,11 @@ export class CodexProvider {
         const item = this.extractIncomingItem(params);
         const normalizedType = this.normalizeStructuredType(this.readString(item.type) ?? method);
         const itemId = this.extractItemId(params) ?? this.readString(item.id) ?? normalizedType ?? "tool";
-        const partId = `${messageId}:tool:${itemId}`;
+        const fileChangeLike = this.isFileChangeStructuredItem(normalizedType, item, params);
+        const emittedPartType = normalizedType === "plan"
+            ? "reasoning"
+            : (fileChangeLike ? "file-change" : "tool");
+        const partId = `${messageId}:${emittedPartType}:${itemId}`;
         const nextText = this.extractStructuredOutput(params, item, normalizedType);
         const prevOutput = this.partTextById.get(partId) ?? "";
         const output = completed
@@ -521,8 +525,8 @@ export class CodexProvider {
             id: partId,
             sessionID: session.id,
             messageID: messageId,
-            type: normalizedType === "plan" ? "reasoning" : "tool",
-            ...(normalizedType === "plan"
+            type: emittedPartType,
+            ...(emittedPartType === "reasoning"
                 ? { text: outputValue ?? "Planning..." }
                 : { name, toolName: name, input, output: outputValue, state }),
         };
@@ -814,12 +818,15 @@ export class CodexProvider {
                     const output = this.decodeFileLikeItemText(itemObject);
                     if (!output)
                         continue;
+                    const emittedPartType = this.isFileChangeStructuredItem(type, itemObject)
+                        ? "file-change"
+                        : "tool";
                     messages.push({
                         id: itemId,
                         role: "assistant",
                         parts: [{
-                                id: `${itemId}:tool`,
-                                type: "tool",
+                                id: `${itemId}:${emittedPartType}`,
+                                type: emittedPartType,
                                 name: type,
                                 toolName: type,
                                 output,
@@ -874,11 +881,16 @@ export class CodexProvider {
         return `${this.normalizedCommandPhase(status)} ${this.shortCommand(command)}`;
     }
     decodeFileLikeItemText(itemObject) {
+        const status = this.normalizedFileChangeStatus(itemObject, true);
+        const changesBody = this.renderFileChangeEntriesBody(itemObject.changes);
+        if (changesBody) {
+            return `Status: ${status}\n\n${changesBody}`;
+        }
+        const diff = this.firstString(itemObject, ["diff", "unified_diff", "unifiedDiff", "patch"]);
+        if (diff?.trim()) {
+            return this.renderUnifiedDiffBody(diff, status);
+        }
         const direct = this.firstString(itemObject, [
-            "diff",
-            "unified_diff",
-            "unifiedDiff",
-            "patch",
             "text",
             "message",
             "summary",
@@ -887,20 +899,10 @@ export class CodexProvider {
             "output_text",
             "outputText",
         ]);
-        if (direct?.trim())
-            return direct.trim();
-        const changes = this.readArray(itemObject.changes);
-        if (changes.length === 0)
-            return undefined;
-        return changes
-            .map((change) => {
-            const obj = this.asRecord(change);
-            const path = this.readString(obj.path) ?? this.readString(obj.filePath) ?? this.readString(obj.file_path) ?? "file";
-            const kind = this.readString(obj.kind) ?? "change";
-            const diff = this.readString(obj.diff) ?? this.readString(obj.patch) ?? "";
-            return diff ? `${kind}: ${path}\n${diff}` : `${kind}: ${path}`;
-        })
-            .join("\n\n");
+        if (direct?.trim()) {
+            return `Status: ${status}\n\n${direct.trim()}`;
+        }
+        return undefined;
     }
     normalizedCommandPhase(rawStatus) {
         const normalized = rawStatus.trim().toLowerCase();
@@ -969,11 +971,20 @@ export class CodexProvider {
     extractItemId(payload) {
         return (this.readString(payload.itemId)
             ?? this.readString(payload.item_id)
+            ?? this.readString(payload.call_id)
+            ?? this.readString(payload.callId)
+            ?? this.readString(payload.id)
             ?? this.readString(payload.messageId)
             ?? this.readString(payload.message_id)
             ?? this.readString(this.asRecord(payload.item).id)
             ?? this.readString(this.asRecord(payload.item).itemId)
+            ?? this.readString(this.asRecord(payload.item).call_id)
+            ?? this.readString(this.asRecord(payload.item).callId)
             ?? this.readString(this.asRecord(payload.item).messageId)
+            ?? this.readString(this.asRecord(payload.event).itemId)
+            ?? this.readString(this.asRecord(payload.event).item_id)
+            ?? this.readString(this.asRecord(payload.event).call_id)
+            ?? this.readString(this.asRecord(payload.event).callId)
             ?? this.readString(this.asRecord(payload.event).id)
             ?? this.readString(this.asRecord(this.asRecord(payload.event).item).id));
     }
@@ -1095,44 +1106,102 @@ export class CodexProvider {
             return "commandexecution";
         return normalized;
     }
+    isFileChangeStructuredItem(normalizedType, item, params) {
+        if (normalizedType === "filechange" || normalizedType === "diff") {
+            return true;
+        }
+        if (normalizedType !== "toolcall") {
+            return false;
+        }
+        const event = this.asRecord(params?.event);
+        const nestedItem = this.asRecord(event.item);
+        const sources = [item, params ?? {}, event, nestedItem];
+        for (const source of sources) {
+            if (this.firstString(source, ["diff", "unified_diff", "unifiedDiff", "patch"])) {
+                return true;
+            }
+            if (this.readArray(source.changes).length > 0) {
+                return true;
+            }
+        }
+        const toolName = this.firstString(item, ["name", "toolName", "tool_name", "title"])?.toLowerCase() ?? "";
+        return toolName.includes("patch") || toolName.includes("edit") || toolName.includes("write");
+    }
     extractStructuredOutput(params, item, normalizedType) {
         if (normalizedType === "filechange" || normalizedType === "toolcall" || normalizedType === "diff") {
-            return this.extractDiffLikePayload(params, item) ?? this.extractTextPayload(params);
+            return this.extractDiffLikePayload(params, item, normalizedType) ?? this.extractTextPayload(params);
         }
         return this.extractTextPayload(params);
     }
-    extractDiffLikePayload(params, item) {
+    extractDiffLikePayload(params, item, normalizedType) {
         const event = this.asRecord(params.event);
         const nestedItem = this.asRecord(event.item);
         const sources = [params, item, event, nestedItem];
+        const status = this.normalizedFileChangeStatus(item, false);
+        const changesBody = this.renderFileChangeEntriesBody(item.changes ?? params.changes ?? event.changes ?? nestedItem.changes);
+        if (changesBody) {
+            return `Status: ${status}\n\n${changesBody}`;
+        }
+        for (const source of sources) {
+            const diff = this.firstString(source, ["diff", "unified_diff", "unifiedDiff", "patch"]);
+            if (diff) {
+                return this.renderUnifiedDiffBody(diff, status);
+            }
+        }
         for (const source of sources) {
-            const direct = this.firstString(source, [
-                "diff",
-                "unified_diff",
-                "unifiedDiff",
-                "patch",
-                "text",
-                "message",
-                "summary",
-                "output",
-                "output_text",
-                "outputText",
-            ]);
-            if (direct)
-                return direct;
+            const direct = this.firstString(source, ["text", "message", "summary", "output", "output_text", "outputText"]);
+            if (direct) {
+                if (normalizedType === "toolcall" && !this.isFileChangeStructuredItem("toolcall", item, params)) {
+                    return direct;
+                }
+                return `Status: ${status}\n\n${direct}`;
+            }
         }
-        const changes = this.readArray(item.changes ?? params.changes ?? event.changes ?? nestedItem.changes);
+        return undefined;
+    }
+    renderFileChangeEntriesBody(rawChanges) {
+        const changes = this.readArray(rawChanges);
         if (changes.length === 0)
             return undefined;
-        return changes
+        const rendered = changes
             .map((change) => {
             const obj = this.asRecord(change);
-            const path = this.readString(obj.path) ?? this.readString(obj.filePath) ?? this.readString(obj.file_path) ?? "file";
-            const kind = this.readString(obj.kind) ?? "change";
+            const path = this.firstString(obj, [
+                "path",
+                "file",
+                "file_path",
+                "filePath",
+                "relative_path",
+                "relativePath",
+                "new_path",
+                "newPath",
+                "to",
+                "target",
+                "name",
+                "old_path",
+                "oldPath",
+                "from",
+            ]) ?? "file";
+            const kind = this.firstString(obj, ["kind", "type", "action", "status"]) ?? "change";
             const diff = this.firstString(obj, ["diff", "unified_diff", "unifiedDiff", "patch"]) ?? "";
-            return diff ? `Path: ${path}\nKind: ${kind}\n\n\`\`\`diff\n${diff}\n\`\`\`` : `Path: ${path}\nKind: ${kind}`;
+            return diff
+                ? `Path: ${path}\nKind: ${kind}\n\n\`\`\`diff\n${diff}\n\`\`\``
+                : `Path: ${path}\nKind: ${kind}`;
         })
-            .join("\n\n---\n\n");
+            .filter(Boolean);
+        return rendered.length > 0 ? rendered.join("\n\n---\n\n") : undefined;
+    }
+    renderUnifiedDiffBody(diff, status) {
+        return `Status: ${status}\n\n\`\`\`diff\n${diff.trim()}\n\`\`\``;
+    }
+    normalizedFileChangeStatus(itemObject, isCompleted) {
+        const status = this.readString(itemObject.status)
+            ?? this.readString(this.asRecord(itemObject.status).type)
+            ?? this.readString(itemObject.state)
+            ?? this.readString(this.asRecord(itemObject.state).type);
+        if (status)
+            return status;
+        return isCompleted ? "completed" : "inProgress";
     }
     extractToolInput(item, params) {
         return item.input ?? item.command ?? item.path ?? item.args ?? params.command ?? params.path ?? undefined;
@@ -1145,7 +1214,7 @@ export class CodexProvider {
             return this.decodePlanItemText(item);
         }
         if (normalizedType === "filechange" || normalizedType === "toolcall" || normalizedType === "diff") {
-            return this.extractDiffLikePayload(params, item) ?? this.decodeFileLikeItemText(item);
+            return this.extractDiffLikePayload(params, item, normalizedType) ?? this.decodeFileLikeItemText(item);
         }
         if (normalizedType === "enteredreviewmode") {
             return `Reviewing ${this.readString(item.review) ?? "changes"}...`;

package/package.json

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