chatccc 0.2.286 → 0.2.288

package/dist/src/session.js

@@ -29,7 +29,7 @@ function compressWechatDisplayText(text) {
 }
 import { readStreamState, writeStreamState, createEmptyStreamState, isFinalReplySentForTurn, markFinalReplySent, } from "./stream-state.js";
 import { addCardToTurn, finalizeTurnCards, markCardDone } from "./turn-cards.js";
-import { bindChatToSession, unbindChatFromSession, getChatsForSession, activePrompts, displayCards, unifiedDisplayLoopHandle, setUnifiedDisplayLoopHandle, rebuildSessionChatsFromRegistry, recordLastActiveChat, getLastActiveChat, pickDisplayChat, dequeueMessage, consumeQueuedMessage, cancelQueuedMessage, setQueuePreservedChat, consumeQueuePreservedChat, markSessionFinalizing, clearSessionFinalizing, reserveAutoRecovery, consumeAutoRecoveryReservation, cancelAutoRecoveryReservation, hasAutoRecoveryReservation, } from "./session-chat-binding.js";
+import { bindChatToSession, unbindChatFromSession, getChatsForSession, activePrompts, displayCards, unifiedDisplayLoopHandle, setUnifiedDisplayLoopHandle, rebuildSessionChatsFromRegistry, recordLastActiveChat, getLastActiveChat, pickDisplayChat, dequeueMessage, consumeQueuedMessage, cancelQueuedMessage, shiftInjection, unshiftInjection, drainRemainingInjections, clearInjections, setQueuePreservedChat, consumeQueuePreservedChat, markSessionFinalizing, clearSessionFinalizing, reserveAutoRecovery, consumeAutoRecoveryReservation, cancelAutoRecoveryReservation, hasAutoRecoveryReservation, } from "./session-chat-binding.js";
 async function sendFinalReplyTextOnce(platform, chatId, sessionId, turnCount, text) {
     const sent = await platform.sendText(chatId, text).then((ok) => ok !== false).catch(() => false);
     if (sent)
@@ -827,6 +827,10 @@ export function accumulateBlockContent(block, state, toolCallMap) {
         }
         case "agent_status":
             break;
+        case "input_injected":
+            // 协作式让位：显示一条轻量注入标记（仅过程展示，不进入最终回复）。
+            state.accumulatedContent += `\n\n↳ 已注入新消息：${block.text}\n`;
+            break;
     }
 }
 export async function switchChatBinding(args) {
@@ -1283,6 +1287,8 @@ export async function runAgentSession(sessionId, userText, platform, _chatId, ms
         }
     }
     try {
+        // 供 onInjectionRejected 退回的“最后一条已取出但未成功注入”的消息
+        let lastShiftedInjection = null;
         for await (const unifiedMsg of adapter.prompt(sessionId, userTextWithCapabilities, cwd, controller.signal, {
             onProcessStart: (processInfo) => {
                 startPromptProcessMonitor(sessionId, processInfo);
@@ -1299,6 +1305,24 @@ export async function runAgentSession(sessionId, userText, platform, _chatId, ms
                 if (prompt)
                     prompt.closeSession = closeSession;
             },
+            // ccc 内核与 codex app-server 支持协作式让位：同步从注入队列取队首文本，
+            // 供适配器在每个 model step 边界吸收。其他 adapter 忽略该字段。
+            drainInput: tool === "ccc" || tool === "codex" ? () => {
+                const injected = shiftInjection(sessionId);
+                if (!injected)
+                    return undefined;
+                lastShiftedInjection = injected;
+                // 与首次消息保持一致的结构化包装；imSkillsPrompt 已在首次消息中，
+                // 此处不重复注入，避免多轮注入导致上下文膨胀。
+                return `[User message]\n${injected.text}\n[/User message]`;
+            } : undefined,
+            // 注入未被当前 turn 吸收（如 turn 恰好已结束）时，退回队列头部，避免丢消息。
+            onInjectionRejected: tool === "ccc" || tool === "codex" ? () => {
+                if (lastShiftedInjection) {
+                    unshiftInjection(sessionId, lastShiftedInjection);
+                    lastShiftedInjection = null;
+                }
+            } : undefined,
         })) {
             if (unifiedMsg.isFinalResponse) {
                 const prompt = activePrompts.get(sessionId);
@@ -1630,11 +1654,20 @@ export async function runAgentSession(sessionId, userText, platform, _chatId, ms
                 if (discarded) {
                     console.log(`[${ts()}] [QUEUE] Discarding queued message for stopped session ${sessionId}`);
                 }
+                const discardedInjections = drainRemainingInjections(sessionId);
+                if (discardedInjections.length > 0) {
+                    console.log(`[${ts()}] [INJECT] Discarding ${discardedInjections.length} pending injection(s) for stopped session ${sessionId}`);
+                }
             }
             else if (!shouldScheduleAutoRecovery) {
                 // 第一次 response-stall 后保留普通缓存；恢复轮结束后由恢复轮的
                 // finally 再消费，顺序固定为“自动恢复 → 用户缓存”。
                 queuedForConsumption = dequeueMessage(sessionId);
+                // ccc/codex 注入队列剩余（turn 期间未注入完，如 non-streaming 或收尾窗口到达）
+                // 取第一条转普通消费，其余留待下一轮结束后继续消费。
+                if (!queuedForConsumption) {
+                    queuedForConsumption = shiftInjection(sessionId);
+                }
             }
             if (queuedForConsumption) {
                 const queued = queuedForConsumption;
@@ -2043,6 +2076,7 @@ export function stopSession(sessionId) {
     if (!prompt) {
         if (cancelledRecovery) {
             cancelQueuedMessage(sessionId);
+            clearInjections(sessionId);
             console.log(`[${ts()}] [STOP] Reserved automatic recovery for ${sessionId} cancelled`);
             return true;
         }
@@ -2054,6 +2088,7 @@ export function stopSession(sessionId) {
     clearPromptAvatarRefreshTimer(sessionId);
     clearPromptFinalResponseCloseTimer(sessionId);
     cancelQueuedMessage(sessionId);
+    clearInjections(sessionId);
     // 先发起整棵进程树清理，再触发 close/abort。Windows 上 CLI 由
     // cmd.exe → node → 实际二进制组成；若先 process.kill(cmd.exe)，taskkill
     // 随后便无法从已消失的根 PID 找到后代，正是幽灵 Codex/Cursor 的来源。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.286",
+  "version": "0.2.288",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",