@lzdi/pty-remote-cli 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lzdi/pty-remote-cli",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "private": false,
   "type": "module",
   "repository": {
@@ -22,7 +22,7 @@
     "threads": "node bin/pty-remote-cli.js threads"
   },
   "dependencies": {
-    "@lzdi/pty-remote-protocol": "0.1.3",
+    "@lzdi/pty-remote-protocol": "0.1.4",
     "@xterm/headless": "^6.0.0",
     "node-pty": "^1.1.0",
     "socket.io-client": "^4.8.3",

package/src/providers/codex-jsonl.ts

@@ -1,5 +1,6 @@
 import type {
   ChatMessage,
+  ChatMessageMeta,
   ChatMessageBlock,
   TextChatMessageBlock,
   ToolResultChatMessageBlock,
@@ -36,12 +37,17 @@ interface CodexEventMsgPayload {
   message?: string;
   text?: string;
   phase?: string;
+  turn_id?: string;
+}
+
+interface CodexTurnContextPayload {
+  turn_id?: string;
 }
 
 interface CodexJsonlRecord {
   timestamp?: string;
   type?: string;
-  payload?: CodexResponseItemPayload | CodexEventMsgPayload;
+  payload?: CodexResponseItemPayload | CodexEventMsgPayload | CodexTurnContextPayload;
 }
 
 export type CodexJsonlRuntimePhase = 'idle' | 'running';
@@ -50,6 +56,7 @@ export interface CodexJsonlMessagesState {
   orderedIds: string[];
   messagesById: Map<string, ChatMessage>;
   runtimePhase: CodexJsonlRuntimePhase;
+  activeTurnId: string | null;
   activityRevision: number;
   messageSequence: number;
   seenAssistantTextKeys: Set<string>;
@@ -61,6 +68,7 @@ export function createCodexJsonlMessagesState(): CodexJsonlMessagesState {
     orderedIds: [],
     messagesById: new Map<string, ChatMessage>(),
     runtimePhase: 'idle',
+    activeTurnId: null,
     activityRevision: 0,
     messageSequence: 0,
     seenAssistantTextKeys: new Set<string>(),
@@ -166,6 +174,25 @@ function normalizeCreatedAt(timestamp: string | undefined, sequence: number): st
   return new Date(sequence * 1_000).toISOString();
 }
 
+function normalizeTurnId(turnId: string | undefined): string | null {
+  const normalized = turnId?.trim();
+  return normalized ? normalized : null;
+}
+
+function createMessageMeta(state: CodexJsonlMessagesState, phase?: string | null): ChatMessageMeta | undefined {
+  const normalizedPhase = phase?.trim() || null;
+  const turnId = state.activeTurnId;
+
+  if (!normalizedPhase && !turnId) {
+    return undefined;
+  }
+
+  return {
+    phase: normalizedPhase,
+    turnId
+  };
+}
+
 function hasVisibleBlocks(blocks: ChatMessageBlock[]): boolean {
   return blocks.some((block) => {
     switch (block.type) {
@@ -214,27 +241,42 @@ function createToolResultBlock(callId: string, content: string, isError: boolean
   };
 }
 
-function getWebSearchQuery(action: CodexResponseItemPayload['action']): string {
+function getWebSearchPreview(action: CodexResponseItemPayload['action']): string {
   if (!action || typeof action !== 'object') {
     return '';
   }
 
   const normalizedAction = action as {
+    pattern?: string;
     type?: string;
     query?: string;
     queries?: string[];
+    url?: string;
   };
-  if (normalizedAction.type !== 'search') {
+  if (normalizedAction.type === 'search') {
+    if (typeof normalizedAction.query === 'string' && normalizedAction.query.trim()) {
+      return normalizedAction.query.trim();
+    }
+
+    if (Array.isArray(normalizedAction.queries)) {
+      const firstQuery = normalizedAction.queries.find((query) => typeof query === 'string' && query.trim());
+      return firstQuery?.trim() ?? '';
+    }
+
     return '';
   }
 
-  if (typeof normalizedAction.query === 'string' && normalizedAction.query.trim()) {
-    return normalizedAction.query.trim();
+  if (normalizedAction.type === 'open_page') {
+    return normalizedAction.url?.trim() ?? '';
   }
 
-  if (Array.isArray(normalizedAction.queries)) {
-    const firstQuery = normalizedAction.queries.find((query) => typeof query === 'string' && query.trim());
-    return firstQuery?.trim() ?? '';
+  if (normalizedAction.type === 'find_in_page') {
+    const pattern = normalizedAction.pattern?.trim() ?? '';
+    const url = normalizedAction.url?.trim() ?? '';
+    if (pattern && url) {
+      return `${pattern} @ ${url}`;
+    }
+    return pattern || url;
   }
 
   return '';
@@ -282,6 +324,20 @@ function deriveMessageStatus(
   return 'complete';
 }
 
+function mergeMessageMeta(existing: ChatMessageMeta | undefined, next: ChatMessageMeta | undefined): ChatMessageMeta | undefined {
+  const phase = next?.phase ?? existing?.phase ?? null;
+  const turnId = next?.turnId ?? existing?.turnId ?? null;
+
+  if (!phase && !turnId) {
+    return undefined;
+  }
+
+  return {
+    phase,
+    turnId
+  };
+}
+
 export function refreshCodexJsonlMessageStatuses(state: CodexJsonlMessagesState): void {
   for (const [messageId, message] of state.messagesById.entries()) {
     const nextStatus = deriveMessageStatus(message.blocks, state.runtimePhase);
@@ -309,6 +365,7 @@ function upsertMessage(state: CodexJsonlMessagesState, nextMessage: ChatMessage)
     id: nextMessage.id,
     role: nextMessage.role,
     blocks,
+    meta: mergeMessageMeta(existing?.meta, nextMessage.meta),
     status: deriveMessageStatus(blocks, state.runtimePhase),
     createdAt: existing?.createdAt ?? nextMessage.createdAt
   };
@@ -369,6 +426,7 @@ function applyEventMsg(state: CodexJsonlMessagesState, payload: CodexEventMsgPay
       id: messageId,
       role: 'user',
       blocks: [textBlock],
+      meta: createMessageMeta(state),
       status: 'complete',
       createdAt: normalizeCreatedAt(timestamp, sequence)
     });
@@ -395,6 +453,7 @@ function applyEventMsg(state: CodexJsonlMessagesState, payload: CodexEventMsgPay
       id: messageId,
       role: 'assistant',
       blocks: [textBlock],
+      meta: createMessageMeta(state),
       status: 'complete',
       createdAt: normalizeCreatedAt(timestamp, sequence)
     });
@@ -421,6 +480,7 @@ function applyEventMsg(state: CodexJsonlMessagesState, payload: CodexEventMsgPay
       id: messageId,
       role: 'assistant',
       blocks: [textBlock],
+      meta: createMessageMeta(state, payload?.phase),
       status: 'complete',
       createdAt: normalizeCreatedAt(timestamp, sequence)
     });
@@ -428,11 +488,16 @@ function applyEventMsg(state: CodexJsonlMessagesState, payload: CodexEventMsgPay
   }
 
   let nextPhase: CodexJsonlRuntimePhase | null = null;
+  const payloadTurnId = normalizeTurnId(payload?.turn_id);
 
   if (payloadType === 'task_started') {
     nextPhase = 'running';
+    state.activeTurnId = payloadTurnId ?? state.activeTurnId;
   } else if (payloadType === 'task_complete' || payloadType === 'turn_aborted') {
     nextPhase = 'idle';
+    if (!payloadTurnId || payloadTurnId === state.activeTurnId) {
+      state.activeTurnId = null;
+    }
   }
 
   if (!nextPhase || nextPhase === state.runtimePhase) {
@@ -496,6 +561,7 @@ function applyResponseItem(
       id: stableMessageId,
       role,
       blocks: stableBlocks,
+      meta: createMessageMeta(state, payload.phase),
       status: 'complete',
       createdAt: normalizeCreatedAt(timestamp, sequence)
     });
@@ -513,6 +579,7 @@ function applyResponseItem(
       id: `tool:${callId}`,
       role: 'assistant',
       blocks: [createToolUseBlock(callId, payload.name ?? 'unknown', stringifyUnknown(rawInput))],
+      meta: createMessageMeta(state),
       status: 'streaming',
       createdAt: normalizeCreatedAt(timestamp, state.messageSequence++)
     });
@@ -520,8 +587,8 @@ function applyResponseItem(
   }
 
   if (payloadType === 'web_search_call') {
-    const query = getWebSearchQuery(payload.action);
-    if (!query) {
+    const preview = getWebSearchPreview(payload.action);
+    if (!preview) {
       return;
     }
 
@@ -530,7 +597,8 @@ function applyResponseItem(
     upsertMessage(state, {
       id: `tool:${callId}`,
       role: 'assistant',
-      blocks: [createToolUseBlock(callId, 'web_search', query)],
+      blocks: [createToolUseBlock(callId, 'web_search', preview)],
+      meta: createMessageMeta(state),
       status: 'complete',
       createdAt: normalizeCreatedAt(timestamp, sequence)
     });
@@ -549,6 +617,7 @@ function applyResponseItem(
       id: `tool:${callId}`,
       role: 'assistant',
       blocks: [createToolResultBlock(callId, stringifyUnknown(payload.output), isError)],
+      meta: createMessageMeta(state),
       status: isError ? 'error' : 'complete',
       createdAt: normalizeCreatedAt(timestamp, state.messageSequence++)
     });
@@ -578,6 +647,11 @@ export function applyCodexJsonlLine(state: CodexJsonlMessagesState, line: string
     return true;
   }
 
+  if (parsed.type === 'turn_context') {
+    state.activeTurnId = normalizeTurnId((parsed.payload as CodexTurnContextPayload | undefined)?.turn_id);
+    return true;
+  }
+
   return true;
 }
 

package/src/providers/codex-manager.ts

@@ -137,6 +137,7 @@ function messageEqual(left: ChatMessage | undefined, right: ChatMessage | undefi
     left.role === right.role &&
     left.status === right.status &&
     left.createdAt === right.createdAt &&
+    JSON.stringify(left.meta ?? null) === JSON.stringify(right.meta ?? null) &&
     JSON.stringify(left.blocks) === JSON.stringify(right.blocks)
   );
 }
@@ -158,6 +159,7 @@ function sleep(ms: number): Promise<void> {
 const AWAITING_JSONL_TURN_STALE_MS = 4000;
 const READY_TIMEOUT_MAX_RETRIES = 2;
 const TERMINAL_READY_BOTTOM_LINES = 8;
+const INTERRUPT_READY_CHECK_DELAY_MS = 250;
 
 function materializeTerminalFrameLinesText(lines: TerminalFrameLine[]): string {
   return lines
@@ -408,50 +410,9 @@ export class CodexManager {
       return;
     }
 
-    const previousMessages = handle.runtime.messages;
-    const previousHasOlderMessages = handle.runtime.hasOlderMessages;
-
     this.clearLastError(handle);
-    handle.awaitingJsonlTurn = false;
-    if (handle.jsonlMessagesState.runtimePhase !== 'idle') {
-      handle.jsonlMessagesState.runtimePhase = 'idle';
-      handle.jsonlMessagesState.activityRevision += 1;
-      refreshCodexJsonlMessageStatuses(handle.jsonlMessagesState);
-    }
-
-    const nextAllMessages = materializeCodexJsonlMessages(handle.jsonlMessagesState);
-    const nextMessages = this.selectRecentMessages(nextAllMessages);
-    const nextHasOlderMessages = nextAllMessages.length > nextMessages.length;
-    const allMessagesChanged = !messagesEqual(handle.runtime.allMessages, nextAllMessages);
-    const messagesChanged = !messagesEqual(handle.runtime.messages, nextMessages);
-    const hasOlderMessagesChanged = handle.runtime.hasOlderMessages !== nextHasOlderMessages;
-
-    if (allMessagesChanged) {
-      handle.runtime.allMessages = nextAllMessages;
-    }
-    if (messagesChanged) {
-      handle.runtime.messages = nextMessages;
-    }
-    if (allMessagesChanged || messagesChanged || hasOlderMessagesChanged) {
-      handle.runtime.hasOlderMessages = nextHasOlderMessages;
-    }
-
-    this.stopHandlePtyPreservingReplay(handle, 'stop-active-run');
-    this.setStatus(handle, 'idle', true);
-
-    if (this.isActiveHandle(handle) && (allMessagesChanged || messagesChanged || hasOlderMessagesChanged)) {
-      const upsertPayload = this.createMessagesUpsertPayload(
-        handle,
-        previousMessages,
-        nextMessages,
-        previousHasOlderMessages,
-        nextHasOlderMessages
-      );
-      if (upsertPayload) {
-        this.callbacks.emitMessagesUpsert(upsertPayload);
-      }
-    }
-
+    await this.sendInterruptSequence(handle);
+    await this.maybeMarkHandleReadyAfterInterrupt(handle);
     this.scheduleJsonlRefresh(0, 'stop-active-run');
   }
 
@@ -1543,6 +1504,80 @@ export class CodexManager {
     }
   }
 
+  private async sendInterruptSequence(handle: CodexHandle): Promise<void> {
+    if (!handle.pty) {
+      return;
+    }
+
+    this.log('info', 'sending codex interrupt sequence', {
+      ...this.handleContext(handle),
+      runtimeStatus: handle.runtime.status
+    });
+
+    handle.pty.pty.write('\x1b');
+  }
+
+  private async maybeMarkHandleReadyAfterInterrupt(handle: CodexHandle): Promise<void> {
+    await sleep(INTERRUPT_READY_CHECK_DELAY_MS);
+    if (!this.isActiveHandle(handle) || !handle.pty) {
+      return;
+    }
+
+    const previousMessages = handle.runtime.messages;
+    const previousHasOlderMessages = handle.runtime.hasOlderMessages;
+
+    try {
+      const { bottomText } = await this.getHandleTerminalView(handle);
+      if (!looksReadyForInput(bottomText)) {
+        return;
+      }
+
+      handle.awaitingJsonlTurn = false;
+      if (handle.jsonlMessagesState.runtimePhase !== 'idle') {
+        handle.jsonlMessagesState.runtimePhase = 'idle';
+        handle.jsonlMessagesState.activityRevision += 1;
+        refreshCodexJsonlMessageStatuses(handle.jsonlMessagesState);
+      }
+
+      const nextAllMessages = materializeCodexJsonlMessages(handle.jsonlMessagesState);
+      const nextMessages = this.selectRecentMessages(nextAllMessages);
+      const nextHasOlderMessages = nextAllMessages.length > nextMessages.length;
+      const allMessagesChanged = !messagesEqual(handle.runtime.allMessages, nextAllMessages);
+      const messagesChanged = !messagesEqual(handle.runtime.messages, nextMessages);
+      const hasOlderMessagesChanged = handle.runtime.hasOlderMessages !== nextHasOlderMessages;
+
+      if (allMessagesChanged) {
+        handle.runtime.allMessages = nextAllMessages;
+      }
+      if (messagesChanged) {
+        handle.runtime.messages = nextMessages;
+      }
+      if (allMessagesChanged || messagesChanged || hasOlderMessagesChanged) {
+        handle.runtime.hasOlderMessages = nextHasOlderMessages;
+      }
+
+      this.setStatus(handle, 'idle', true);
+
+      if (this.isActiveHandle(handle) && (allMessagesChanged || messagesChanged || hasOlderMessagesChanged)) {
+        const upsertPayload = this.createMessagesUpsertPayload(
+          handle,
+          previousMessages,
+          nextMessages,
+          previousHasOlderMessages,
+          nextHasOlderMessages
+        );
+        if (upsertPayload) {
+          this.callbacks.emitMessagesUpsert(upsertPayload);
+        }
+      }
+    } catch (error) {
+      this.log('warn', 'failed to confirm codex ready state after interrupt', {
+        ...this.handleContext(handle),
+        error: errorMessage(error, 'Failed to confirm ready state')
+      });
+    }
+  }
+
   private getLastActivityAt(handle: CodexHandle): number {
     return Math.max(
       handle.lastJsonlActivityAt ?? 0,