@abitat_reece/host-daemon 0.1.10 → 0.1.11

package/dist/local-control/codex-bridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-bridge.d.ts","sourceRoot":"","sources":["../../src/local-control/codex-bridge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex-bridge.d.ts","sourceRoot":"","sources":["../../src/local-control/codex-bridge.ts"],"names":[],"mappings":"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"}

package/dist/local-control/codex-bridge.js

@@ -1,6 +1,7 @@
 import { spawn } from "node:child_process";
 import { createHash } from "node:crypto";
-import { basename, normalize } from "node:path";
+import { readFile, stat } from "node:fs/promises";
+import { basename, extname, isAbsolute, join, normalize } from "node:path";
 import { setTimeout as delay } from "node:timers/promises";
 import WebSocket from "ws";
 import { attachmentDiagnostics, errorDiagnostics, logDiagnostics, promptDiagnostics } from "./diagnostics-log.js";
@@ -37,6 +38,7 @@ export function createLocalCodexBridge(options = {}) {
     const queuedTurnsByThread = new Map();
     const queueDrainTimers = new Map();
     const threadListCache = new Map();
+    const messageHistoryCache = new Map();
     async function listAllThreads(params = {}) {
         const cacheKey = threadListCacheKey(params);
         const cached = threadListCache.get(cacheKey);
@@ -115,11 +117,51 @@ export function createLocalCodexBridge(options = {}) {
         }));
     }
     function enqueueTurn(threadId, input, options = { front: false }) {
+        invalidateMessageHistoryCache(threadId);
         const existing = queuedTurnsByThread.get(threadId) ?? [];
         const next = options.front ? [input, ...existing] : [...existing, input];
         queuedTurnsByThread.set(threadId, next);
         scheduleQueueDrain(threadId);
     }
+    function deleteQueuedTurn(threadId, clientMessageId) {
+        const existing = queuedTurnsByThread.get(threadId);
+        if (!existing?.length) {
+            return false;
+        }
+        const next = existing.filter((turn) => turn.clientMessageId !== clientMessageId);
+        if (next.length === existing.length) {
+            return false;
+        }
+        invalidateMessageHistoryCache(threadId);
+        if (next.length > 0) {
+            queuedTurnsByThread.set(threadId, next);
+        }
+        else {
+            queuedTurnsByThread.delete(threadId);
+            const timer = queueDrainTimers.get(threadId);
+            if (timer) {
+                clearTimeout(timer);
+                queueDrainTimers.delete(threadId);
+            }
+        }
+        return true;
+    }
+    function updateQueuedTurn(threadId, clientMessageId, prompt) {
+        const existing = queuedTurnsByThread.get(threadId);
+        if (!existing?.length) {
+            return false;
+        }
+        const index = existing.findIndex((turn) => turn.clientMessageId === clientMessageId);
+        if (index < 0) {
+            return false;
+        }
+        invalidateMessageHistoryCache(threadId);
+        queuedTurnsByThread.set(threadId, existing.map((turn, turnIndex) => (turnIndex === index ? { ...turn, prompt } : turn)));
+        return true;
+    }
+    function invalidateMessageHistoryCache(threadId) {
+        messageHistoryCache.delete(threadId);
+    }
     function scheduleQueueDrain(threadId, delayMs = QUEUED_TURN_POLL_INTERVAL_MS) {
         if (queueDrainTimers.has(threadId)) {
             return;
@@ -163,6 +205,7 @@ export function createLocalCodexBridge(options = {}) {
         }
     }
     async function startConversationTurn(threadId, thread, input) {
+        invalidateMessageHistoryCache(threadId);
         let activeThread = thread;
         if (threadStatusType(activeThread.status) !== "active") {
             activeThread = (await client.resumeThread({ excludeTurns: false, threadId })).thread;
@@ -196,7 +239,17 @@ export function createLocalCodexBridge(options = {}) {
             const delivery = input.delivery ?? "queue";
             if (isCodexThreadBusy(thread)) {
                 if (delivery === "steer") {
-                    await client.injectItems(threadId, steerItems(input.prompt, input.attachments));
+                    const activeTurn = latestActiveTurn(thread);
+                    if (!activeTurn) {
+                        throw Object.assign(new Error("No active Codex turn is available to steer"), {
+                            statusCode: 409
+                        });
+                    }
+                    invalidateMessageHistoryCache(threadId);
+                    await client.steerTurn(threadId, userInput(input.prompt, input.attachments), activeTurn.id);
+                    if (input.clientMessageId) {
+                        deleteQueuedTurn(threadId, input.clientMessageId);
+                    }
                     return {
                         conversationId: externalCodexConversationId(threadId),
                         status: "running"
@@ -221,40 +274,67 @@ export function createLocalCodexBridge(options = {}) {
                 status: "running"
             };
         },
+        async deleteQueuedTurn(conversationId, input) {
+            const threadId = toCodexThreadId(conversationId);
+            const removed = deleteQueuedTurn(threadId, input.clientMessageId);
+            return {
+                conversationId: externalCodexConversationId(threadId),
+                removed,
+                status: (queuedTurnsByThread.get(threadId)?.length ?? 0) > 0 ? "queued" : "running"
+            };
+        },
+        async updateQueuedTurn(conversationId, input) {
+            const threadId = toCodexThreadId(conversationId);
+            const updated = updateQueuedTurn(threadId, input.clientMessageId, input.prompt);
+            return {
+                conversationId: externalCodexConversationId(threadId),
+                status: (queuedTurnsByThread.get(threadId)?.length ?? 0) > 0 ? "queued" : "running",
+                updated
+            };
+        },
         async listCompletionStates() {
             const threads = await readThreadsWithTurns(await loadAllThreads());
+            const states = threads.map((thread) => codexThreadToCompletionState(thread, workspaceId));
             logDiagnostics(diagnostics, "info", "completion.states.result", {
-                stateCount: threads.length
+                activeCount: states.filter((state) => isActiveMobileConversationStatus(state.status))
+                    .length,
+                stateCount: states.length
             });
-            return threads
-                .sort((left, right) => right.updatedAt - left.updatedAt)
-                .map((thread) => codexThreadToCompletionState(thread, workspaceId));
+            return states.sort((left, right) => Date.parse(right.updatedAt) - Date.parse(left.updatedAt));
         },
         async listMessages(conversationId, messageOptions = {}) {
             const threadId = toCodexThreadId(conversationId);
-            const messages = flattenThreadMessages(await client.readThread(threadId, true), externalCodexConversationId(threadId), diagnostics);
-            const filtered = messageOptions.includeRuntime
-                ? messages
-                : messages.filter((message) => message.role !== "runtime");
-            const returned = typeof messageOptions.afterSequence === "number"
-                ? messageOptions.afterSequence >
-                    filtered.reduce((max, message) => Math.max(max, message.sequence), 0)
-                    ? filtered
-                    : filtered.filter((message) => message.sequence > messageOptions.afterSequence)
-                : filtered;
+            const messages = await readCachedThreadMessages(threadId, {
+                afterSequence: messageOptions.afterSequence,
+                forceRefresh: messageOptions.forceRefresh === true
+            });
+            const returned = filterThreadMessages(messages, messageOptions);
             logDiagnostics(diagnostics, "info", "messages.list.bridge_result", {
                 ...messageCounts(messages),
                 afterSequence: messageOptions.afterSequence,
                 conversationId: externalCodexConversationId(threadId),
+                forceRefresh: messageOptions.forceRefresh === true,
                 includeRuntime: messageOptions.includeRuntime === true,
                 returned: returned.length,
                 total: messages.length
             });
-            if (typeof messageOptions.afterSequence !== "number") {
-                return returned;
-            }
             return returned;
         },
+        async listGeneratedFiles(conversationId) {
+            return generatedFilesForThread(await client.readThread(toCodexThreadId(conversationId), true));
+        },
+        async downloadGeneratedFile(conversationId, fileId) {
+            const files = await generatedFilesForThread(await client.readThread(toCodexThreadId(conversationId), true));
+            const file = files.find((candidate) => candidate.id === fileId);
+            if (!file) {
+                throw Object.assign(new Error("Generated file not found"), { statusCode: 404 });
+            }
+            const data = await readFile(file.path);
+            return {
+                ...file,
+                dataBase64: data.toString("base64")
+            };
+        },
         listModelOptions() {
             return client.listModels();
         },
@@ -274,6 +354,7 @@ export function createLocalCodexBridge(options = {}) {
                 experimentalRawEvents: false,
                 persistExtendedHistory: true
             });
+            invalidateMessageHistoryCache(thread.id);
             await client.startTurn(thread.id, userInput(input.prompt, input.attachments), {
                 ...PHONE_FULL_ACCESS_TURN_OPTIONS,
                 cwd,
@@ -300,6 +381,33 @@ export function createLocalCodexBridge(options = {}) {
             return mergeCodexThreadSnapshots(readThread, thread);
         }));
     }
+    async function readCachedThreadMessages(threadId, options) {
+        const cached = messageHistoryCache.get(threadId);
+        if (!options.forceRefresh && typeof options.afterSequence === "number" && cached) {
+            const summary = await client.readThread(threadId, false).catch(() => null);
+            if (summary && canUseCachedMessageHistory(cached, summary)) {
+                return cached.messages;
+            }
+        }
+        const thread = await client.readThread(threadId, true);
+        const messages = flattenThreadMessages(thread, externalCodexConversationId(threadId), diagnostics);
+        if (isCodexThreadMessageHistoryStable(thread)) {
+            messageHistoryCache.set(threadId, {
+                messages,
+                statusType: threadStatusType(thread.status),
+                updatedAt: safeSeconds(thread.updatedAt, thread.createdAt)
+            });
+        }
+        else {
+            invalidateMessageHistoryCache(threadId);
+        }
+        return messages;
+    }
+    function canUseCachedMessageHistory(cached, summary) {
+        return (!isCodexThreadBusy(summary) &&
+            cached.statusType === threadStatusType(summary.status) &&
+            cached.updatedAt === safeSeconds(summary.updatedAt, summary.createdAt));
+    }
 }
 function createCodexAppClient(options) {
     const serverUrl = options.serverUrl ?? process.env.CODEX_APP_SERVER_URL ?? DEFAULT_SERVER_URL;
@@ -320,10 +428,6 @@ function createCodexAppClient(options) {
             } while (cursor);
             return models;
         },
-        injectItems: (threadId, items) => callCodexApp(serverUrl, codexBinaryPath, "thread/inject_items", {
-            items,
-            threadId
-        }),
         async listLoadedThreads() {
             const threadIds = [];
             let cursor = null;
@@ -373,7 +477,8 @@ function createCodexAppClient(options) {
             persistExtendedHistory: true,
             ...params
         }, diagnostics),
-        startTurn: (threadId, input, turnOptions) => startTurnWithKeepAlive(serverUrl, codexBinaryPath, threadId, input, turnOptions, diagnostics)
+        startTurn: (threadId, input, turnOptions) => startTurnWithKeepAlive(serverUrl, codexBinaryPath, threadId, input, turnOptions, diagnostics),
+        steerTurn: (threadId, input, expectedTurnId) => steerTurnWithKeepAlive(serverUrl, codexBinaryPath, threadId, input, expectedTurnId, diagnostics)
     };
 }
 async function callCodexApp(serverUrl, codexBinaryPath, method, params, diagnostics) {
@@ -478,6 +583,75 @@ async function startTurnWithKeepAliveOnce(serverUrl, threadId, input, options) {
         }
     }
 }
+async function steerTurnWithKeepAlive(serverUrl, codexBinaryPath, threadId, input, expectedTurnId, diagnostics) {
+    logDiagnostics(diagnostics, "info", "codex.turn_steer.call", {
+        ...turnInputDiagnostics(input),
+        expectedTurnId,
+        threadId
+    });
+    try {
+        const response = await steerTurnWithKeepAliveOnce(serverUrl, threadId, input, expectedTurnId);
+        logDiagnostics(diagnostics, "info", "codex.turn_steer.result", {
+            expectedTurnId,
+            threadId,
+            turnId: response.turnId
+        });
+        return response;
+    }
+    catch (error) {
+        if (!isConnectionFailure(error) || !canStartLocalServer(serverUrl)) {
+            logDiagnostics(diagnostics, "error", "codex.turn_steer.failure", {
+                error: errorDiagnostics(error),
+                expectedTurnId,
+                threadId
+            });
+            throw error;
+        }
+        logDiagnostics(diagnostics, "warn", "codex.app_server.connect_failure", {
+            error: errorDiagnostics(error),
+            method: "turn/steer",
+            serverUrl
+        });
+        await ensureLocalAppServer(serverUrl, codexBinaryPath, diagnostics);
+        try {
+            const response = await steerTurnWithKeepAliveOnce(serverUrl, threadId, input, expectedTurnId);
+            logDiagnostics(diagnostics, "info", "codex.turn_steer.result", {
+                expectedTurnId,
+                threadId,
+                turnId: response.turnId
+            });
+            return response;
+        }
+        catch (retryError) {
+            logDiagnostics(diagnostics, "error", "codex.turn_steer.failure", {
+                error: errorDiagnostics(retryError),
+                expectedTurnId,
+                threadId
+            });
+            throw retryError;
+        }
+    }
+}
+async function steerTurnWithKeepAliveOnce(serverUrl, threadId, input, expectedTurnId) {
+    const connection = await JsonRpcConnection.connect(serverUrl);
+    let keepAliveStarted = false;
+    try {
+        await initializeConnection(connection);
+        const response = await connection.call("turn/steer", {
+            expectedTurnId,
+            input,
+            threadId
+        });
+        keepAliveStarted = true;
+        keepTurnConnectionAlive(connection, threadId, response.turnId);
+        return response;
+    }
+    finally {
+        if (!keepAliveStarted) {
+            connection.close();
+        }
+    }
+}
 async function initializeConnection(connection) {
     await connection.call("initialize", {
         capabilities: {
@@ -733,7 +907,7 @@ function mergeCodexThreadSnapshots(baseThread, nextThread) {
             threadListActivityAt: abitatThreadListActivityAt
         })
             ? { activeFlags: [], type: "active" }
-            : preferredThreadStatus(baseThread.status, nextThread.status),
+            : preferredMergedThreadStatus(baseThread, nextThread),
         turns: nextThread.turns.length > 0 ? nextThread.turns : baseThread.turns,
         updatedAt: Math.max(safeSeconds(baseThread.updatedAt, baseThread.createdAt), safeSeconds(nextThread.updatedAt, nextThread.createdAt))
     };
@@ -744,6 +918,14 @@ function preferredThreadStatus(baseStatus, nextStatus) {
     }
     return threadStatusRank(nextStatus) > threadStatusRank(baseStatus) ? nextStatus : baseStatus;
 }
+function preferredMergedThreadStatus(baseThread, nextThread) {
+    const baseLatestTurn = baseThread.turns.at(-1) ?? null;
+    const nextIsActiveSummary = threadStatusType(nextThread.status) === "active" && nextThread.turns.length === 0;
+    if (nextIsActiveSummary && baseLatestTurn && isTurnTerminal(baseLatestTurn)) {
+        return baseThread.status;
+    }
+    return preferredThreadStatus(baseThread.status, nextThread.status);
+}
 function threadStatusRank(status) {
     switch (threadStatusType(status)) {
         case "active":
@@ -790,10 +972,14 @@ function isThreadListActivitySummaryStatus(status) {
     return statusType === "idle" || statusType === "notLoaded";
 }
 function needsConversationStatusHydration(thread) {
-    return thread.turns.length === 0 && isThreadListActivitySummaryStatus(thread.status);
+    return (thread.turns.length === 0 &&
+        (isThreadListActivitySummaryStatus(thread.status) ||
+            threadStatusType(thread.status) === "active"));
 }
 function threadListActivitySeconds(thread) {
-    const currentActivity = thread.turns.length === 0 && isThreadListActivitySummaryStatus(thread.status)
+    const currentActivity = thread.turns.length === 0 &&
+        (isThreadListActivitySummaryStatus(thread.status) ||
+            threadStatusType(thread.status) === "active")
         ? safeSeconds(thread.updatedAt, thread.createdAt)
         : null;
     return maxOptionalSeconds(thread.abitatThreadListActivityAt ?? null, currentActivity);
@@ -916,6 +1102,91 @@ export function flattenThreadMessages(thread, conversationId = externalCodexConv
     });
     return messages;
 }
+async function generatedFilesForThread(thread) {
+    const paths = new Set();
+    for (const turn of thread.turns) {
+        for (const item of turn.items) {
+            if (item.type !== "fileChange") {
+                continue;
+            }
+            const fileChange = item;
+            for (const change of fileChange.changes ?? []) {
+                const path = generatedFilePath(thread.cwd, change);
+                if (path) {
+                    paths.add(path);
+                }
+            }
+        }
+    }
+    const files = await Promise.all(Array.from(paths)
+        .sort()
+        .map(async (path) => {
+        const stats = await stat(path).catch(() => null);
+        if (!stats?.isFile()) {
+            return null;
+        }
+        return {
+            id: generatedFileId(thread.id, path),
+            mimeType: mimeTypeForPath(path),
+            name: basename(path),
+            path,
+            size: stats.size
+        };
+    }));
+    return files.filter((file) => Boolean(file));
+}
+function generatedFilePath(cwd, change) {
+    if (!change || typeof change !== "object") {
+        return null;
+    }
+    const candidate = change;
+    const value = stringField(candidate, "path") ??
+        stringField(candidate, "filePath") ??
+        stringField(candidate, "absolutePath") ??
+        stringField(candidate, "relativePath");
+    if (!value) {
+        return null;
+    }
+    return isAbsolute(value) ? normalize(value) : normalize(join(cwd, value));
+}
+function generatedFileId(threadId, path) {
+    return `file_${createHash("sha256")
+        .update(`${threadId}\0${normalize(path)}`)
+        .digest("hex")
+        .slice(0, 24)}`;
+}
+function stringField(value, key) {
+    const field = value[key];
+    return typeof field === "string" && field.trim() ? field.trim() : null;
+}
+function mimeTypeForPath(path) {
+    switch (extname(path).toLowerCase()) {
+        case ".html":
+            return "text/html";
+        case ".md":
+        case ".markdown":
+            return "text/markdown";
+        case ".mp4":
+            return "video/mp4";
+        case ".mov":
+            return "video/quicktime";
+        case ".png":
+            return "image/png";
+        case ".jpg":
+        case ".jpeg":
+            return "image/jpeg";
+        case ".gif":
+            return "image/gif";
+        case ".pdf":
+            return "application/pdf";
+        case ".json":
+            return "application/json";
+        case ".txt":
+            return "text/plain";
+        default:
+            return "application/octet-stream";
+    }
+}
 function codexThreadToConversationStatus(thread) {
     const latestTurn = thread.turns.at(-1) ?? null;
     if (threadStatusType(thread.status) === "active") {
@@ -936,7 +1207,19 @@ function codexThreadToConversationStatus(thread) {
     return "approved";
 }
 function isCodexThreadBusy(thread) {
-    return threadStatusType(thread.status) === "active";
+    return threadStatusType(thread.status) === "active" || thread.turns.some(isTurnInProgress);
+}
+function isCodexThreadMessageHistoryStable(thread) {
+    return !isCodexThreadBusy(thread) && !thread.turns.some(isTurnInProgress);
+}
+function latestActiveTurn(thread) {
+    for (let index = thread.turns.length - 1; index >= 0; index -= 1) {
+        const turn = thread.turns[index];
+        if (turn && isTurnInProgress(turn)) {
+            return turn;
+        }
+    }
+    return null;
 }
 function isActiveMobileConversationStatus(status) {
     return status === "running" || status === "awaiting_approval";
@@ -991,6 +1274,14 @@ function isKnownCodexItemType(type) {
         type === "fileChange" ||
         HIDDEN_CODEX_ITEM_TYPES.has(type));
 }
+function filterThreadMessages(messages, options) {
+    const filtered = options.includeRuntime
+        ? messages
+        : messages.filter((message) => message.role !== "runtime");
+    return typeof options.afterSequence === "number"
+        ? filtered.filter((message) => message.sequence > options.afterSequence)
+        : filtered;
+}
 function messageCounts(messages) {
     const counts = {
         assistant: 0,
@@ -1049,16 +1340,6 @@ function userInputToText(input) {
             return `[Mention: ${input.name}]`;
     }
 }
-function steerItems(prompt, attachments = []) {
-    const text = userInput(prompt, attachments).map(userInputToText).filter(Boolean).join("\n");
-    return [
-        {
-            content: [{ text, type: "input_text" }],
-            role: "user",
-            type: "message"
-        }
-    ];
-}
 function turnModelSettings(modelSettings) {
     return modelSettings ? { effort: modelSettings.effort, model: modelSettings.model } : {};
 }