shennian 0.2.70 → 0.2.72

package/dist/src/native-fusion/parsers.js

@@ -60,11 +60,12 @@ function parseCodexTextElements(value) {
 function stripCodexUserMessageWrapper(text) {
     const normalized = normalizeText(text);
     if (!normalized)
-        return '';
+        return { text: '', strippedWrapper: false };
     const requestMatch = normalized.match(/My request for Codex:\s*([\s\S]*)$/i);
-    if (requestMatch && requestMatch[1])
-        return stripCodexImagePlaceholders(requestMatch[1]);
-    return normalized;
+    if (requestMatch && requestMatch[1]) {
+        return { text: stripCodexImagePlaceholders(requestMatch[1]), strippedWrapper: true };
+    }
+    return { text: normalized, strippedWrapper: false };
 }
 function stripCodexImagePlaceholders(text) {
     return normalizeText(text.replace(/<image>\s*<\/image>/gi, ''));
@@ -74,10 +75,12 @@ function parseCodexUserMessage(payload) {
     const textFromInput = Array.isArray(payload.input)
         ? parseCodexTextElements(payload.input)
         : '';
-    const textFromMessage = typeof payload.message === 'string'
+    const strippedMessage = typeof payload.message === 'string'
         ? stripCodexUserMessageWrapper(payload.message)
-        : '';
+        : { text: '', strippedWrapper: false };
+    const textFromMessage = strippedMessage.text;
     const text = textFromElements || textFromInput || textFromMessage;
+    const repairHint = strippedMessage.strippedWrapper ? 'codex_app_context_wrapper' : undefined;
     const attachments = Array.isArray(payload.local_images)
         ? payload.local_images
             .map(parseCodexLocalImageAttachment)
@@ -91,9 +94,10 @@ function parseCodexUserMessage(payload) {
         return {
             payload: buildUserMessagePayload(text, attachments),
             titleText: text,
+            repairHint,
         };
     }
-    return { payload: text, titleText: text };
+    return { payload: text, titleText: text, repairHint };
 }
 function isCodexTerminalEventType(eventType) {
     return eventType === 'turn_completed' || eventType === 'turn_complete' || eventType === 'task_complete';
@@ -174,7 +178,8 @@ function parseCodexResponseMessage(payload) {
             return null;
         return text ? { role, payload: text, titleText: text } : null;
     }
-    const text = stripCodexUserMessageWrapper(codexMessageContentText(payload.content, 'input_text'));
+    const stripped = stripCodexUserMessageWrapper(codexMessageContentText(payload.content, 'input_text'));
+    const text = stripped.text;
     const attachments = codexMessageInputImageAttachments(payload.content);
     if (!text && attachments.length === 0)
         return null;
@@ -184,6 +189,7 @@ function parseCodexResponseMessage(payload) {
         role,
         payload: attachments.length > 0 ? buildUserMessagePayload(text, attachments) : text,
         titleText: text,
+        repairHint: stripped.strippedWrapper ? 'codex_app_context_wrapper' : undefined,
     };
 }
 function codexDedupeText(payload) {
@@ -225,7 +231,7 @@ function findDuplicateCodexChatEventIndex(events, role, payload, ts) {
     }
     return -1;
 }
-function pushCodexEvent(events, filePath, lineOffset, kind, sourceSessionKey, ts, payload, title, modelId, workDir, role = 'agent', terminal = false) {
+function pushCodexEvent(events, filePath, lineOffset, kind, sourceSessionKey, ts, payload, title, modelId, workDir, role = 'agent', terminal = false, repairHint) {
     if (!payload)
         return;
     events.push({
@@ -241,6 +247,7 @@ function pushCodexEvent(events, filePath, lineOffset, kind, sourceSessionKey, ts
         modelId,
         workDir,
         terminal,
+        repairHint,
     });
 }
 function pushCodexToolEvent(events, filePath, lineOffset, kind, sourceSessionKey, ts, toolName, title, modelId, workDir, args, result) {
@@ -257,7 +264,7 @@ function parseCodexResponseItem(events, filePath, lineOffset, payload, sourceSes
         const duplicateIndex = findDuplicateCodexChatEventIndex(events, parsedMessage.role, parsedMessage.payload, ts);
         if (duplicateIndex >= 0)
             return;
-        pushCodexEvent(events, filePath, lineOffset, `${itemType}:${parsedMessage.role}`, sourceSessionKey, ts, parsedMessage.payload, title, modelId, workDir, parsedMessage.role);
+        pushCodexEvent(events, filePath, lineOffset, `${itemType}:${parsedMessage.role}`, sourceSessionKey, ts, parsedMessage.payload, title, modelId, workDir, parsedMessage.role, false, parsedMessage.repairHint);
         return;
     }
     if (itemType === 'function_call') {
@@ -297,7 +304,7 @@ function parseCodexEventMessage(events, filePath, lineOffset, payload, sourceSes
         const parsedUser = parseCodexUserMessage(payload);
         if (!parsedUser)
             return;
-        pushCodexEvent(events, filePath, lineOffset, eventType, sourceSessionKey, ts, parsedUser.payload, title, modelId, workDir, 'user');
+        pushCodexEvent(events, filePath, lineOffset, eventType, sourceSessionKey, ts, parsedUser.payload, title, modelId, workDir, 'user', false, parsedUser.repairHint);
         return;
     }
     if (eventType === 'agent_message') {

package/dist/src/native-fusion/service.js

@@ -17,6 +17,9 @@ function isCodexRolloutPath(filePath) {
 function shouldBackfillWindowsCodex(state) {
     return process.platform === 'win32' && state.codexWindowsPathParserFixed !== true;
 }
+function shouldBackfillCodexAppContextWrapper(state) {
+    return state.codexAppContextWrapperFixed !== true;
+}
 export class NativeSessionFusionService {
     client;
     timer = null;
@@ -97,6 +100,7 @@ export class NativeSessionFusionService {
         const state = loadNativeScannerState();
         const nextFilesState = { ...state.files };
         const backfillWindowsCodex = shouldBackfillWindowsCodex(state);
+        const backfillCodexAppContextWrapper = shouldBackfillCodexAppContextWrapper(state);
         const batches = [];
         const files = [...listCodexRolloutFiles(), ...listClaudeTranscriptFiles(), ...listOpenCodeSessionFiles()];
         for (const filePath of files) {
@@ -104,9 +108,10 @@ export class NativeSessionFusionService {
             const current = state.files[filePath];
             const isCodex = isCodexRolloutPath(filePath);
             const isOpenCode = filePath.endsWith('.opencode-session.json');
+            const isCodexRepairBackfillFile = backfillCodexAppContextWrapper && isCodex && current != null;
             const startOffset = isOpenCode && current?.mtimeMs !== stat.mtimeMs
                 ? 0
-                : backfillWindowsCodex && isCodex
+                : (backfillWindowsCodex || isCodexRepairBackfillFile) && isCodex
                     ? 0
                     : current?.offset ?? 0;
             const parsed = isOpenCode
@@ -118,7 +123,10 @@ export class NativeSessionFusionService {
                 offset: parsed.nextOffset,
                 mtimeMs: stat.mtimeMs,
             };
-            for (const event of parsed.events) {
+            const parsedEvents = isCodexRepairBackfillFile && startOffset === 0
+                ? parsed.events.filter((event) => event.repairHint === 'codex_app_context_wrapper')
+                : parsed.events;
+            for (const event of parsedEvents) {
                 const claimed = this.tryClaimManagedEcho(event);
                 if (claimed) {
                     batches.push(claimed);
@@ -133,17 +141,21 @@ export class NativeSessionFusionService {
             const chunk = batches.slice(index, index + MAX_BATCH_SIZE);
             if (chunk.length === 0)
                 continue;
+            const wireEvents = chunk.map(({ repairHint: _repairHint, ...event }) => event);
             await this.client.sendBufferedEvent({
                 type: 'event',
                 event: 'native.session.events',
                 id: `native-fusion-${randomUUID()}`,
-                payload: { events: chunk },
+                payload: { events: wireEvents },
             }, 60_000);
         }
         state.files = nextFilesState;
         if (backfillWindowsCodex) {
             state.codexWindowsPathParserFixed = true;
         }
+        if (backfillCodexAppContextWrapper) {
+            state.codexAppContextWrapperFixed = true;
+        }
         saveNativeScannerState(state);
     }
     tryClaimManagedEcho(event) {

package/dist/src/native-fusion/types.d.ts

@@ -1,12 +1,16 @@
 import type { NativeSessionEventPayload } from '@shennian/wire';
+export type NativeRepairHint = 'codex_app_context_wrapper';
 export type NativeScannerState = {
     files: Record<string, {
         offset: number;
         mtimeMs: number;
     }>;
     codexWindowsPathParserFixed?: boolean;
+    codexAppContextWrapperFixed?: boolean;
+};
+export type ParsedNativeEvent = NativeSessionEventPayload & {
+    repairHint?: NativeRepairHint;
 };
-export type ParsedNativeEvent = NativeSessionEventPayload;
 export type PendingManagedClaim = {
     sessionId: string;
     agentType: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shennian",
-  "version": "0.2.70",
+  "version": "0.2.72",
   "description": "Shennian — AI Agent Control Plane CLI",
   "type": "module",
   "bin": {