@yuandc/aica 0.1.54 → 0.1.55
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/acp/providers/codex-acp/adapter.js +4 -4
- package/dist/acp/providers/codex-acp/control-tool-loop.js +1 -1
- package/dist/acp/providers/codex-acp/control-tool-steering.js +1 -1
- package/dist/acp/providers/codex-acp/provider.js +1 -1
- package/dist/acp/providers/codex-acp/subtask-executions.js +1 -0
- package/dist/acp/providers/codex-acp/subtask-routing.js +1 -1
- package/dist/core/acp-event-coalescer.js +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import{JsonLineRpcClient as
|
|
2
|
-
`);this.lineBuffer=t.pop()??"";for(const s of t){const
|
|
3
|
-
`),await this.shutdown(),process.exit(1)}}async handleRequest(e,t){switch(e){case"initialize":return this.initializeResponse();case"aca/runtime_config":return this.applyRuntimeConfig(t);case"session/new":return this.newSession(t);case"session/resume":case"session/load":return this.resumeSession(t);case"session/fork":return this.forkSession(t);case"session/prompt":return this.prompt(t);case"session/compact":return this.manualCompact(t);case"aca/session_recover":return this.recoverSession(t);case"session/cancel":return await this.cancel(t),{};case"session/close":return await this.closeSession(t),{};case"session/set_config_option":return this.setConfigOption(t);case"session/set_mode":return this.setMode(t);case"fs/read_text_file":case"fs/write_text_file":case"terminal/create":case"terminal/output":case"terminal/wait_for_exit":case"terminal/kill":case"terminal/release":return{};default:throw new Error(`Unsupported ACP method: ${e}`)}}initializeResponse(){return{protocolVersion:1,agentCapabilities:{loadSession:!0,sessionCapabilities:{resume:!0,close:!0}}}}applyRuntimeConfig(e){if(this.started)throw new Error("Codex runtime config must be applied before app-server starts");const t=u(e.codexProvider);if(Object.keys(t).length===0)return this.managedProvider=null,{configured:!1};const s=a(t,"baseUrl"),n=a(t,"apiKey"),o=Number(t.revision||0);if(!s||!n||!Number.isSafeInteger(o)||o<1)throw new Error("Invalid Codex managed provider runtime config");return this.managedProvider={baseUrl:s,apiKey:n,revision:o},{configured:!0,revision:o}}async newSession(e){const t=a(e,"cwd")||process.cwd();this.applyInitialConfig(e),await this.ensureCodex(t);const s=await this.requireRpc().request("thread/start",{cwd:t,approvalsReviewer:"user",...this.codexConfig(),ephemeral:!1,experimentalRawEvents:!0,threadSource:"aca-codex-acp"},6e4),n=b(s);if(!n)throw new Error("Codex thread/start did not return thread id");return this.currentSessionId=n,this.currentCwd=t,this.resetSubtaskState(),this.captureThreadMetadata(s),this.sessionResponse(n)}async resumeSession(e){const t=a(e,"sessionId");if(!t)throw new Error("sessionId is required");const s=a(e,"cwd")||this.currentCwd;this.applyInitialConfig(e),await this.ensureCodex(s);const n=await this.requireRpc().request("thread/resume",{threadId:t,cwd:s,approvalsReviewer:"user",...this.codexConfig()},6e4);return this.currentSessionId=b(n)||t,this.currentCwd=s,this.resetSubtaskState(n),await this.subscribeKnownSubtasks(!1),this.captureThreadMetadata(n),this.sessionResponse(this.currentSessionId)}async forkSession(e){const t=a(e,"sessionId");if(!t)throw new Error("sessionId is required");const s=a(e,"cwd")||this.currentCwd;this.applyInitialConfig(e),await this.ensureCodex(s);const n=await this.requireRpc().request("thread/fork",{threadId:t,cwd:s,approvalsReviewer:"user",ephemeral:!1,threadSource:"aca-codex-acp-fork",...this.codexConfig()},12e4),o=b(n);if(!o)throw new Error("Codex thread/fork did not return thread id");return this.currentSessionId=o,this.currentCwd=s,this.resetSubtaskState(n),this.captureThreadMetadata(n),this.sessionResponse(o)}async prompt(e){this.promptCancelled=!1;const t=a(e,"sessionId")||this.currentSessionId;let s=this.resolveSessionAlias(t);if(!s)throw new Error("sessionId is required");const n=Array.isArray(e.prompt)?e.prompt:[],o=this.requireRpc();this.currentSessionId&&this.currentSessionId!==s&&this.resetSubtaskState(),this.currentSessionId=s;const r=await this.maintainContext("before",{userRequest:this.previousUserText,assistantResponse:this.previousAssistantText,affectedFiles:[...this.previousAffectedFiles]},{allowRollover:!0});if(ue(r),this.promptCancelled||this.shutdownPromise)throw new Error("Codex prompt cancelled");s=this.currentSessionId||s,this.promptActive=!0,this.currentTurnId=null,this.controlToolLoop.reset(),this.controlToolSteering.reset(),this.currentPromptText=Y(n),this.currentAssistantText="",this.currentAffectedFiles.clear(),this.connectionRecovery.reset(),this.agentMessagePhases.clear(),this.planDeltas.reset(),this.pendingSubtaskNotifications=[];let c;try{this.turnStartPromise=o.request("turn/start",{threadId:s,clientUserMessageId:`aca-acp-${Date.now()}-${Math.random().toString(16).slice(2)}`,input:Z(n),cwd:this.currentCwd,...ee(this.config)},D()),c=await this.turnStartPromise;const d=String(c?.turn?.id??"");this.currentTurnId=d||null;const l=d?await this.waitForTurnCompleted(d,D()):c?.turn,h=await this.subtaskRouter.waitForIdle(fe());if(h.timedOut&&h.activeThreadIds.length>0&&this.notifySessionUpdate({sessionUpdate:"aca_codex_subtask_drain",label:"子任务收尾等待超时",detail:`仍有 ${h.activeThreadIds.length} 个子任务未结束`,_meta:{aca:{subtaskDrain:h}}}),this.promptCancelled)throw new Error("Codex prompt cancelled");this.threadTurnCount+=1,this.previousUserText=this.currentPromptText,this.previousAssistantText=this.currentAssistantText,this.previousAffectedFiles.clear();for(const I of this.currentAffectedFiles)this.previousAffectedFiles.add(I);const p=await this.maintainContext("after",{userRequest:this.previousUserText,assistantResponse:this.previousAssistantText,affectedFiles:[...this.previousAffectedFiles]},{allowRollover:!0});return{stopReason:"end_turn",sessionId:this.currentSessionId,turn:l,_meta:{acaContextUsage:q(p)??ce(this.latestTokenUsage),acaContextMaintenance:p,acaSubtaskDrain:h}}}catch(d){const l=this.connectionRecovery.fail(d);throw l&&this.notifySessionUpdate(l),d}finally{this.controlToolLoop.reset(),this.promptActive=!1,this.currentTurnId=null,this.turnStartPromise=null,this.pendingSubtaskNotifications=[]}}resetSubtaskState(e){this.subtaskRouter.reset(),this.subtaskAgentMessagePhases.clear(),this.subtaskPlanDeltas.clear(),this.subscribedSubtaskThreadIds.clear(),this.pendingSubtaskSubscriptions.clear(),this.hydratedSubtaskThreadIds.clear(),this.seenSubtaskItemIds.clear(),this.pendingSubtaskNotifications=[],e!==void 0&&this.subtaskRouter.restoreFromSessionSnapshot(e,this.currentSessionId)}async subscribeKnownSubtasks(e=!0){const t=this.subtaskRouter.routesForSubscription().map(s=>this.subscribeSubtask(s,e));await Promise.allSettled(t)}subscribeSubtask(e,t){const s=e.sourceThreadId;if(!s||s===this.currentSessionId||this.subscribedSubtaskThreadIds.has(s))return Promise.resolve();const n=this.pendingSubtaskSubscriptions.get(s);if(n)return n;const o=this.requireRpc().request("thread/resume",{threadId:s,approvalsReviewer:"user",excludeTurns:!1},6e4).then(r=>{this.subscribedSubtaskThreadIds.add(s);const c=this.subtaskRouter.restoreFromSessionSnapshot(r,this.currentSessionId);t&&this.hydrateSubtaskHistory(r,e),c>0&&this.subscribeKnownSubtasks(t)}).catch(()=>{}).finally(()=>{this.pendingSubtaskSubscriptions.delete(s)});return this.pendingSubtaskSubscriptions.set(s,o),o}async cancel(e){const t=this.resolveSessionAlias(a(e,"sessionId")||this.currentSessionId);if(!t||!this.rpc)return;if(t!==this.currentSessionId)throw new Error("Cannot cancel a different Codex session");this.promptCancelled=!0,this.subtaskRouter.stopWaiting();const s=this.turnStartPromise?await X(this.turnStartPromise):null,n=this.currentTurnId||a(m(s,"turn"),"id");if(await this.rpc.request("turn/interrupt",{threadId:t,turnId:n},5e3),n){const o=this.pendingTurnCompletions.get(n);o&&(this.pendingTurnCompletions.delete(n),clearTimeout(o.timer),o.reject(new Error("Codex prompt cancelled")))}}async manualCompact(e){const t=a(e,"sessionId")||this.currentSessionId,s=this.resolveSessionAlias(t);if(!s)throw new Error("sessionId is required");if(this.promptActive||this.maintenanceActive)throw new Error("Codex session is busy");this.currentSessionId=s;const n=k(),o=await this.maintainContext("manual",{userRequest:this.previousUserText,assistantResponse:this.previousAssistantText,affectedFiles:[...this.previousAffectedFiles]},{force:!0,allowRollover:e.allowRollover===!0,compactTimeoutMs:ae(e,n.compactTimeoutMs)}),r=String(o.action||"");if(r==="compact_failed"||r==="rollover_failed"){const c=String(o.compactError||"Codex 上下文压缩未完成");throw new Error(`Codex 上下文压缩失败：${c}`)}return{sessionId:this.currentSessionId,maintenance:o,contextUsage:q(o)}}async recoverSession(e){const t=a(e,"sessionId")||this.currentSessionId,s=this.resolveSessionAlias(t);if(!s)throw new Error("sessionId is required");const n=a(e,"reason");if(n!=="low_output_loop"&&n!=="control_tool_loop")throw new Error("Unsupported Codex recovery reason");if(this.promptActive||this.maintenanceActive)throw new Error("Codex session is busy");if(s!==this.currentSessionId)throw new Error("Cannot recover a different Codex session");const o=new Set([...this.previousAffectedFiles,...this.currentAffectedFiles]);return await this.rotateThread(s,{userRequest:this.currentPromptText||this.previousUserText,assistantResponse:this.currentAssistantText||this.previousAssistantText,affectedFiles:[...o]}),{...u(this.sessionResponse(this.currentSessionId)),previousSessionId:s,recoveryReason:n}}async closeSession(e){await this.shutdown()}async ensureCodex(e){if(this.rpc&&this.started&&this.started.child.exitCode===null&&this.started.child.signalCode===null)return;if(this.codexStartupPromise){await this.codexStartupPromise;return}const t=(async()=>{if(this.rpc&&this.started&&this.started.child.exitCode===null&&this.started.child.signalCode===null)return;const s=j(e,this.managedProvider),n=new $(s.child,{peerName:"Codex app-server",onNotification:(o,r)=>this.handleCodexNotification(o,r),onRequest:async(o,r)=>this.handleCodexRequest(o,r)});this.started=s,this.rpc=n,this.initialized=!1,await n.request("initialize",{clientInfo:{name:"aca-codex-acp",version:"0.1.0"},capabilities:{experimentalApi:!0,requestAttestation:!1}},6e4),this.initialized=!0})();this.codexStartupPromise=t;try{await t}catch(s){throw this.rpc&&this.started&&!this.initialized&&await T(this.started.child,1e3),this.rpc=null,this.started=null,s}finally{this.codexStartupPromise===t&&(this.codexStartupPromise=null)}}handleCodexNotification(e,t){const s=R(t);if(this.maintenanceActive&&(!s.threadId||s.threadId===this.currentSessionId)){this.captureContextNotification(e,t);return}if(!J(t,this.currentSessionId,this.currentTurnId)){if(!this.promptActive||!s.threadId||s.threadId===this.currentSessionId)return;const d=this.subtaskRouter.routeFor(s.threadId);if(!d){this.bufferPendingSubtaskNotification(e,t,s.threadId);return}this.handleSubtaskNotification(e,t,d),this.flushPendingSubtaskNotifications();return}const n=this.subtaskRouter.observe(t,this.currentSessionId);if(n>0&&this.subscribeKnownSubtasks(!0),this.captureContextNotification(e,t),this.maintenanceActive||!this.promptActive&&e!=="turn/completed")return;this.rpc?.refreshPendingRequestTimeout("turn/start"),this.captureAgentMessagePhase(e,t);const o=this.connectionRecovery.beforeNotification(e,t);e==="turn/completed"&&this.resolveTurnCompleted(t);const r=e==="rawResponseItem/completed"?le(this.controlToolLoop,t):[],c=e==="rawResponse/completed"?de(t):e==="rawResponseItem/completed"?r.map(({update:d})=>d):x(e,t,{agentMessagePhases:this.agentMessagePhases,planDeltas:this.planDeltas});for(const d of r)this.maybeSteerControlToolLoop(d.event);for(const d of[...o,...c]){const l=P(d,e,t,this.agentMessagePhases);A(l)&&this.notifyControlToolProgress(),this.captureUpdateEvidence(l),this.notifySessionUpdate(l)}n>0&&this.flushPendingSubtaskNotifications()}handleSubtaskNotification(e,t,s){if(!this.promptActive)return;(e==="rawResponseItem/completed"||e==="item/completed")&&Q(u(u(t).item))&&this.notifyControlToolProgress(),this.rememberSubtaskItem(s.sourceThreadId,t),this.rpc?.refreshPendingRequestTimeout("turn/start");const n=this.subtaskAgentMessagePhases.get(s.sourceThreadId)??new Map;this.subtaskAgentMessagePhases.set(s.sourceThreadId,n);const o=this.subtaskPlanDeltas.get(s.sourceThreadId)??new y;this.subtaskPlanDeltas.set(s.sourceThreadId,o),this.captureAgentMessagePhase(e,t,n),this.subtaskRouter.observe(t,this.currentSessionId)>0&&this.subscribeKnownSubtasks(!0);const c=x(e,t,{agentMessagePhases:n,planDeltas:o}),d=R(t).turnId;for(const l of c){const h=P(l,e,t,n);if(!he(h))continue;A(h)&&this.notifyControlToolProgress();const p=E(h,s,d);w(p,this.currentAffectedFiles),this.notifySessionUpdate(p)}}hydrateSubtaskHistory(e,t){if(!(!this.promptActive||this.hydratedSubtaskThreadIds.has(t.sourceThreadId))){this.hydratedSubtaskThreadIds.add(t.sourceThreadId);for(const s of H(e)){const n=N(t.sourceThreadId,s.itemId);if(this.seenSubtaskItemIds.has(n))continue;this.seenSubtaskItemIds.add(n);const o=E(s.update,t,s.sourceTurnId),r=u(o._meta);o._meta={...r,aca:{...u(r.aca),historyReplay:!0}},w(o,this.currentAffectedFiles),this.notifySessionUpdate(o)}}}rememberSubtaskItem(e,t){const s=u(t),n=u(s.item),o=a(n,"id")||a(s,"itemId");o&&this.seenSubtaskItemIds.add(N(e,o))}bufferPendingSubtaskNotification(e,t,s){this.pendingSubtaskNotifications.push({method:e,params:t,threadId:s}),this.pendingSubtaskNotifications.length>200&&this.pendingSubtaskNotifications.shift()}flushPendingSubtaskNotifications(){if(this.pendingSubtaskNotifications.length===0)return;let e=!0;for(;e&&this.pendingSubtaskNotifications.length>0;){e=!1;const t=[];for(const s of this.pendingSubtaskNotifications){const n=this.subtaskRouter.routeFor(s.threadId);if(!n){t.push(s);continue}e=!0,this.handleSubtaskNotification(s.method,s.params,n)}this.pendingSubtaskNotifications=t}}notifySessionUpdate(e){this.notify("session/update",{sessionId:this.currentSessionId,update:e})}async handleCodexRequest(e,t){if(O(e))return B(e,t,async s=>{const n=await this.requestParent("session/request_permission",{sessionId:this.currentSessionId,request:{...s,params:t,method:e}}),o=u(n),r=u(o.outcome);return r.outcome==="selected"&&typeof r.optionId=="string"?{outcome:{outcome:"selected",optionId:r.optionId}}:{outcome:{outcome:"cancelled"}}});if(pe(e)){const s=await this.requestParent("elicitation/create",{sessionId:this.currentSessionId,request:{...u(t),method:e}}),n=u(s),o=u(n.outcome);return o.outcome==="submitted"?{outcome:{outcome:"submitted",value:typeof o.value=="string"?o.value:""}}:{outcome:{outcome:"cancelled"}}}return{}}captureAgentMessagePhase(e,t,s=this.agentMessagePhases){if(e!=="item/started"&&e!=="item/completed")return;const n=m(t,"item");if(a(n,"type")!=="agentMessage")return;const o=a(n,"id");o&&s.set(o,a(n,"phase"))}waitForTurnCompleted(e,t){const s=this.completedTurns.get(e);return s?Promise.resolve(s):new Promise((n,o)=>{const r=setTimeout(()=>{this.pendingTurnCompletions.delete(e),o(new Error("Codex app-server request timed out while waiting for turn/completed"))},t);r.unref(),this.pendingTurnCompletions.set(e,{resolve:n,reject:o,timer:r})})}resolveTurnCompleted(e){const t=m(e,"turn"),s=a(t,"id");if(!s)return;this.completedTurns.set(s,t);const n=this.pendingTurnCompletions.get(s);if(n){if(this.pendingTurnCompletions.delete(s),clearTimeout(n.timer),a(t,"status")==="failed"){n.reject(new Error(`Codex turn failed: ${JSON.stringify(t.error??{})}`));return}n.resolve(t)}}async shutdown(){return this.shutdownPromise?this.shutdownPromise:(this.shutdownPromise=this.performShutdown(),this.shutdownPromise)}async performShutdown(){this.pendingCompaction&&(clearTimeout(this.pendingCompaction.timer),this.pendingCompaction.reject(new Error("Codex ACP adapter closed")),this.pendingCompaction=null);for(const t of this.pendingParentRequests.values())clearTimeout(t.timer),t.reject(new Error("Codex ACP adapter closed"));this.pendingParentRequests.clear();for(const t of this.pendingTurnCompletions.values())clearTimeout(t.timer),t.reject(new Error("Codex ACP adapter closed"));this.pendingTurnCompletions.clear();const e=this.started?.child;!e||e.exitCode!==null||e.signalCode!==null||(e.stdin.end(),!await T(e,2e3)&&(e.kill("SIGTERM"),!await T(e,1e3)&&(e.kill("SIGKILL"),await T(e,1e3))))}sessionResponse(e){return{sessionId:e,modes:{currentModeId:"workspace-write",availableModes:[{id:"read-only",name:"Read Only"},{id:"workspace-write",name:"Workspace Write"},{id:"danger-full-access",name:"Full Access"}]},configOptions:[{id:"model",category:"model",type:"string"},{id:"approvalPolicy",category:"approval",type:"string"},{id:"sandbox",category:"mode",type:"string"}]}}requireRpc(){if(!this.rpc)throw new Error("Codex app-server is not started");return this.rpc}notify(e,t){this.write({jsonrpc:"2.0",method:e,params:t})}requestParent(e,t,s=600*1e3){const n=this.nextParentRequestId++;return new Promise((o,r)=>{const c=setTimeout(()=>{this.pendingParentRequests.delete(n),r(new Error(`ACP client request timed out: ${e}`))},s);c.unref(),this.pendingParentRequests.set(n,{resolve:o,reject:r,timer:c}),this.write({jsonrpc:"2.0",id:n,method:e,params:t})})}handleParentResponse(e){const t=Number(e.id),s=this.pendingParentRequests.get(t);if(s){if(this.pendingParentRequests.delete(t),clearTimeout(s.timer),"error"in e){const n=u(e.error);s.reject(new Error(a(n,"message")||"ACP client request failed"));return}s.resolve(e.result)}}setConfigOption(e){const t=a(e,"configId"),s=e.value;if(!t)throw new Error("configId is required");if(typeof s!="string"&&typeof s!="boolean")throw new Error("config value must be string or boolean");return this.config[t]=s,this.notify("session/update",{sessionId:this.currentSessionId,update:{sessionUpdate:"config_option_update",configId:t,value:s}}),{}}setMode(e){const t=a(e,"modeId");if(!t)throw new Error("modeId is required");return this.config.sandbox=t,this.notify("session/update",{sessionId:this.currentSessionId,update:{sessionUpdate:"current_mode_update",modeId:t}}),{}}applyInitialConfig(e){const t=m(e,"config");for(const[s,n]of Object.entries(t))(typeof n=="string"||typeof n=="boolean")&&(this.config[s]=n)}codexConfig(){return{...typeof this.config.model=="string"&&this.config.model?{model:this.config.model}:{},approvalPolicy:typeof this.config.approvalPolicy=="string"?this.config.approvalPolicy:"on-request",sandbox:typeof this.config.sandbox=="string"?this.config.sandbox:"workspace-write"}}captureContextNotification(e,t){if(e==="thread/tokenUsage/updated"&&(this.latestTokenUsage=W(t)??this.latestTokenUsage),e==="thread/compacted"&&this.pendingCompaction&&this.resolveCompaction(),e==="item/completed"){const s=m(t,"item"),n=a(u(t),"threadId");a(s,"type")==="contextCompaction"&&(!n||n===this.currentSessionId)&&this.resolveCompaction(),a(s,"type")==="agentMessage"&&a(s,"phase")==="final_answer"&&(this.currentAssistantText=g(s)||this.currentAssistantText)}}resolveCompaction(){if(!this.pendingCompaction)return;const e=this.pendingCompaction;this.pendingCompaction=null,clearTimeout(e.timer),e.resolve()}captureUpdateEvidence(e){String(e.sessionUpdate||"")==="agent_message_chunk"&&(this.currentAssistantText+=g(e.content)),w(e,this.currentAffectedFiles)}captureThreadMetadata(e){const t=m(e,"thread");this.currentRolloutPath=a(t,"path")||null,this.threadTurnCount=Array.isArray(t.turns)?t.turns.length:0;const s=re(t.turns);s.userRequest&&(this.previousUserText=s.userRequest),s.assistantResponse&&(this.previousAssistantText=s.assistantResponse),this.previousAffectedFiles.clear();for(const n of s.affectedFiles)this.previousAffectedFiles.add(n);this.latestTokenUsage=null}async maintainContext(e,t,s={}){const n=k(),o=this.contextState(),r=v(o,n);if(!r.compact&&!s.force||!this.currentSessionId)return this.maintenanceResult({stage:e,action:"none",reasons:r.reasons,beforeState:o});const c=this.currentSessionId;this.notifyContextStatus("正在整理会话上下文",U(o)),this.maintenanceActive=!0;let d=!1,l="",h=o,p=r,I=!1,C="";try{const f=o.usage?.observedAtMs??0;await this.compactThread(c,s.compactTimeoutMs??n.compactTimeoutMs),await this.waitForTokenUsageAfter(f,2e3)}catch(f){d=!0,l=f instanceof Error?f.message:String(f)}try{if(e!=="manual"&&this.promptCancelled||this.shutdownPromise)throw new Error("Codex prompt cancelled");if(h=this.contextState(),p=v(h,n,{compactAttempted:!0,compactFailed:d}),p.rollover&&s.allowRollover!==!1){this.notifyContextStatus("正在创建轻量会话",p.reasons.join(", "));try{await this.rotateThread(c,t),I=!0}catch(f){C=f instanceof Error?f.message:String(f),this.notifyContextStatus("轻量会话创建失败",C)}}else d||this.notifyContextStatus("会话上下文已压缩",U(h))}finally{this.maintenanceActive=!1}return this.maintenanceResult({action:I?"rollover":C?"rollover_failed":d?"compact_failed":"compact",stage:e,reasons:p.reasons,beforeState:o,afterState:h,compactError:[l,C].filter(Boolean).join("; "),previousThreadId:c,rolloverRecommended:p.rollover&&s.allowRollover===!1})}compactThread(e,t){return this.pendingCompaction?Promise.reject(new Error("Codex context compaction is already running")):new Promise((s,n)=>{const o=setTimeout(()=>{this.pendingCompaction?.timer===o&&(this.pendingCompaction=null),n(new Error("Codex thread compaction timed out"))},t);o.unref(),this.pendingCompaction={resolve:s,reject:n,timer:o},this.requireRpc().request("thread/compact/start",{threadId:e},t).catch(r=>{this.pendingCompaction?.timer===o&&(this.pendingCompaction=null,clearTimeout(o),n(r instanceof Error?r:new Error(String(r))))})})}async rotateThread(e,t){const s=z({previousThreadId:e,cwd:this.currentCwd,userRequest:t.userRequest,assistantResponse:t.assistantResponse,affectedFiles:t.affectedFiles}),n=await this.requireRpc().request("thread/start",{cwd:this.currentCwd,approvalsReviewer:"user",...this.codexConfig(),developerInstructions:s,ephemeral:!1,experimentalRawEvents:!0,threadSource:"aca-codex-acp-rollover"},6e4),o=b(n);if(!o)throw new Error("Codex rollover thread/start did not return thread id");this.sessionAliases.set(e,o),this.currentSessionId=o,this.resetSubtaskState(n),this.captureThreadMetadata(n)}async waitForTokenUsageAfter(e,t){const s=Date.now()+t;for(;Date.now()<s;){if((this.latestTokenUsage?.observedAtMs??0)>e)return;await me(50)}}resolveSessionAlias(e){if(!e)return null;let t=e;const s=new Set;for(;this.sessionAliases.has(t)&&!s.has(t);)s.add(t),t=this.sessionAliases.get(t)??t;return t}contextState(){return{usage:this.latestTokenUsage,rolloutBytes:G(this.currentRolloutPath),turnCount:this.threadTurnCount}}maintenanceResult(e){return{stage:e.stage,action:e.action,reasons:e.reasons,previousThreadId:e.previousThreadId??null,sessionId:this.currentSessionId,before:e.beforeState,after:e.afterState??null,compactError:e.compactError||null,rolloverRecommended:e.rolloverRecommended===!0}}notifyContextStatus(e,t){this.notify("session/update",{sessionId:this.currentSessionId,update:{sessionUpdate:"aca_context_maintenance",label:e,detail:t}})}notifyControlToolProgress(){const e=this.controlToolLoop.recordProgress();e&&this.notifySessionUpdate(_(e))}maybeSteerControlToolLoop(e){const t=se(e.detection.kind,this.controlToolPolicy),s=this.controlToolSteering.next(e,t.warningCalls);if(!s)return;const{threadId:n,turnId:o}=e.detection;!n||!o||this.requireRpc().request("turn/steer",{threadId:n,expectedTurnId:o,clientUserMessageId:`aca-loop-steer-${Date.now()}-${Math.random().toString(16).slice(2)}`,input:[{type:"text",text:s.text,text_elements:[]}]},6e4).then(()=>{this.notifySessionUpdate(M(e,s,{succeeded:!0}))}).catch(r=>{this.notifySessionUpdate(M(e,s,{succeeded:!1,error:r}))})}write(e){process.stdout.write(`${JSON.stringify(e)}
|
|
4
|
-
`)}}function
|
|
1
|
+
import{JsonLineRpcClient as D}from"../../client/json-rpc.js";import{startCodexAppServer as $}from"../codex/codex-process.js";import{CodexConnectionRecoveryTracker as L}from"../codex/connection-events.js";import{codexAcpSessionUpdatesFromNotification as C}from"../codex/events.js";import{CodexPlanDeltaState as y}from"../codex/plan-events.js";import{isCodexApprovalRequest as O,resolveCodexApprovalRequest as j}from"../codex/permissions.js";import{buildCodexContinuityInstructions as B,codexTokenUsageFromRawResponseCompleted as K,codexTokenUsageFromNotification as W,decideCodexContextMaintenance as k,readCodexContextMaintenancePolicy as v,rolloutFileSize as z}from"./context-maintenance.js";import{codexNotificationBelongsToCurrentTurn as G,codexNotificationRouting as R}from"./notification-routing.js";import{completedSubtaskHistoryUpdates as J}from"./subtask-history.js";import{CodexSubtaskRouter as H}from"./subtask-routing.js";import{decorateSubtaskUpdate as A}from"./subtask-executions.js";import{waitForCancellableTurnStart as V}from"./cancellation.js";import{codexAcpUpdateIsMeaningfulProgress as P,codexRawItemIsMeaningfulProgress as X,withCodexProgressMetadata as _}from"./progress-evidence.js";import{acpPromptText as Q,acpPromptToCodexInput as Y,turnConfigFromConfig as Z}from"./turn-input.js";import{CodexControlToolLoopDetector as ee,codexControlToolLoopAcpUpdate as M,controlToolLoopDetectionThresholds as te,controlToolLoopReady as se,readCodexControlToolLoopPolicy as oe}from"./control-tool-loop.js";import{CodexControlToolSteeringLimiter as ne,codexControlToolSteeringAcpUpdate as q}from"./control-tool-steering.js";class ie{lineBuffer="";started=null;rpc=null;codexStartupPromise=null;initialized=!1;currentSessionId=null;currentCwd=process.cwd();promptActive=!1;currentTurnId=null;turnStartPromise=null;promptCancelled=!1;nextParentRequestId=1;pendingParentRequests=new Map;completedTurns=new Map;pendingTurnCompletions=new Map;agentMessagePhases=new Map;planDeltas=new y;subtaskRouter=new H;subtaskGeneration=0;subtaskAgentMessagePhases=new Map;subtaskPlanDeltas=new Map;subscribedSubtaskThreadIds=new Set;pendingSubtaskSubscriptions=new Map;hydratedSubtaskThreadIds=new Set;seenSubtaskItemIds=new Set;pendingSubtaskNotifications=[];config={};sessionAliases=new Map;currentAffectedFiles=new Set;connectionRecovery=new L;latestTokenUsage=null;currentRolloutPath=null;threadTurnCount=0;currentPromptText="";currentAssistantText="";previousUserText="";previousAssistantText="";previousAffectedFiles=new Set;maintenanceActive=!1;pendingCompaction=null;shutdownPromise=null;managedProvider=null;controlToolLoop;controlToolPolicy=oe();controlToolSteering=new ne(this.controlToolPolicy.steeringMaxAttempts);constructor(){this.controlToolLoop=new ee({hasActiveSubtasks:()=>this.subtaskRouter.hasActiveSubtasks(),shortSleepMaxDurationMs:this.controlToolPolicy.shortSleepMaxDurationMs}),process.stdin.setEncoding("utf8"),process.stdin.on("data",t=>this.handleInput(String(t)));const e=()=>{this.shutdown().finally(()=>process.exit(0))};process.stdin.once("end",e),process.stdin.once("close",e),process.stdin.once("error",e),process.once("SIGTERM",()=>{this.shutdown().finally(()=>process.exit(0))}),process.once("SIGINT",()=>{this.shutdown().finally(()=>process.exit(130))})}handleInput(e){this.lineBuffer+=e;const t=this.lineBuffer.split(`
|
|
2
|
+
`);this.lineBuffer=t.pop()??"";for(const s of t){const o=s.trim();if(!o)continue;let n;try{n=JSON.parse(o)}catch{continue}this.handleMessage(n)}}async handleMessage(e){if("id"in e&&("result"in e||"error"in e)&&typeof e.method!="string"){this.handleParentResponse(e);return}const t=typeof e.method=="string"?e.method:"",s=e.id;if(t){if(s===void 0){await this.handleNotification(t,d(e.params));return}try{const o=await this.handleRequest(t,d(e.params));this.write({jsonrpc:"2.0",id:s,result:o})}catch(o){this.write({jsonrpc:"2.0",id:s,error:{code:-32603,message:o instanceof Error?o.message:String(o)}})}}}async handleNotification(e,t){if(e==="session/cancel")try{await this.cancel(t)}catch(s){process.stderr.write(`Codex cancel failed: ${s instanceof Error?s.message:String(s)}
|
|
3
|
+
`),await this.shutdown(),process.exit(1)}}async handleRequest(e,t){switch(e){case"initialize":return this.initializeResponse();case"aca/runtime_config":return this.applyRuntimeConfig(t);case"session/new":return this.newSession(t);case"session/resume":case"session/load":return this.resumeSession(t);case"session/fork":return this.forkSession(t);case"session/prompt":return this.prompt(t);case"session/compact":return this.manualCompact(t);case"aca/session_recover":return this.recoverSession(t);case"session/cancel":return await this.cancel(t),{};case"session/close":return await this.closeSession(t),{};case"session/set_config_option":return this.setConfigOption(t);case"session/set_mode":return this.setMode(t);case"fs/read_text_file":case"fs/write_text_file":case"terminal/create":case"terminal/output":case"terminal/wait_for_exit":case"terminal/kill":case"terminal/release":return{};default:throw new Error(`Unsupported ACP method: ${e}`)}}initializeResponse(){return{protocolVersion:1,agentCapabilities:{loadSession:!0,sessionCapabilities:{resume:!0,close:!0}}}}applyRuntimeConfig(e){if(this.started)throw new Error("Codex runtime config must be applied before app-server starts");const t=d(e.codexProvider);if(Object.keys(t).length===0)return this.managedProvider=null,{configured:!1};const s=a(t,"baseUrl"),o=a(t,"apiKey"),n=Number(t.revision||0);if(!s||!o||!Number.isSafeInteger(n)||n<1)throw new Error("Invalid Codex managed provider runtime config");return this.managedProvider={baseUrl:s,apiKey:o,revision:n},{configured:!0,revision:n}}async newSession(e){const t=a(e,"cwd")||process.cwd();this.applyInitialConfig(e),await this.ensureCodex(t);const s=await this.requireRpc().request("thread/start",{cwd:t,approvalsReviewer:"user",...this.codexConfig(),ephemeral:!1,experimentalRawEvents:!0,threadSource:"aca-codex-acp"},6e4),o=x(s);if(!o)throw new Error("Codex thread/start did not return thread id");return this.currentSessionId=o,this.currentCwd=t,this.resetSubtaskState(),this.captureThreadMetadata(s),this.sessionResponse(o)}async resumeSession(e){const t=a(e,"sessionId");if(!t)throw new Error("sessionId is required");const s=a(e,"cwd")||this.currentCwd;this.applyInitialConfig(e),await this.ensureCodex(s);const o=await this.requireRpc().request("thread/resume",{threadId:t,cwd:s,approvalsReviewer:"user",...this.codexConfig()},6e4);return this.currentSessionId=x(o)||t,this.currentCwd=s,this.resetSubtaskState(o),await this.subscribeKnownSubtasks(!1),this.captureThreadMetadata(o),this.sessionResponse(this.currentSessionId)}async forkSession(e){const t=a(e,"sessionId");if(!t)throw new Error("sessionId is required");const s=a(e,"cwd")||this.currentCwd;this.applyInitialConfig(e),await this.ensureCodex(s);const o=await this.requireRpc().request("thread/fork",{threadId:t,cwd:s,approvalsReviewer:"user",ephemeral:!1,threadSource:"aca-codex-acp-fork",...this.codexConfig()},12e4),n=x(o);if(!n)throw new Error("Codex thread/fork did not return thread id");return this.currentSessionId=n,this.currentCwd=s,this.resetSubtaskState(o),this.captureThreadMetadata(o),this.sessionResponse(n)}async prompt(e){this.promptCancelled=!1;const t=a(e,"sessionId")||this.currentSessionId;let s=this.resolveSessionAlias(t);if(!s)throw new Error("sessionId is required");const o=Array.isArray(e.prompt)?e.prompt:[],n=this.requireRpc();this.currentSessionId&&this.currentSessionId!==s&&this.resetSubtaskState(),this.currentSessionId=s;const r=await this.maintainContext("before",{userRequest:this.previousUserText,assistantResponse:this.previousAssistantText,affectedFiles:[...this.previousAffectedFiles]},{allowRollover:!0});if(ue(r),this.promptCancelled||this.shutdownPromise)throw new Error("Codex prompt cancelled");s=this.currentSessionId||s,this.promptActive=!0,this.currentTurnId=null,this.controlToolLoop.reset(),this.controlToolSteering.reset(),this.currentPromptText=Q(o),this.currentAssistantText="",this.currentAffectedFiles.clear(),this.connectionRecovery.reset(),this.agentMessagePhases.clear(),this.planDeltas.reset(),this.pendingSubtaskNotifications=[],this.flushSubtaskStates();let c;try{this.turnStartPromise=n.request("turn/start",{threadId:s,clientUserMessageId:`aca-acp-${Date.now()}-${Math.random().toString(16).slice(2)}`,input:Y(o),cwd:this.currentCwd,...Z(this.config)},N()),c=await this.turnStartPromise;const u=String(c?.turn?.id??"");this.currentTurnId=u||null;const l=u?await this.waitForTurnCompleted(u,N()):c?.turn,h=await this.subtaskRouter.waitForIdle(fe());if(h.timedOut&&h.activeThreadIds.length>0&&this.notifySessionUpdate({sessionUpdate:"aca_codex_subtask_drain",label:"子任务收尾等待超时",detail:`仍有 ${h.activeThreadIds.length} 个子任务未结束`,_meta:{aca:{subtaskDrain:h}}}),this.promptCancelled)throw new Error("Codex prompt cancelled");this.threadTurnCount+=1,this.previousUserText=this.currentPromptText,this.previousAssistantText=this.currentAssistantText,this.previousAffectedFiles.clear();for(const p of this.currentAffectedFiles)this.previousAffectedFiles.add(p);const f=await this.maintainContext("after",{userRequest:this.previousUserText,assistantResponse:this.previousAssistantText,affectedFiles:[...this.previousAffectedFiles]},{allowRollover:!0});return{stopReason:"end_turn",sessionId:this.currentSessionId,turn:l,_meta:{acaContextUsage:U(f)??ce(this.latestTokenUsage),acaContextMaintenance:f,acaSubtaskDrain:h}}}catch(u){const l=this.connectionRecovery.fail(u);throw l&&this.notifySessionUpdate(l),u}finally{this.subtaskRouter.executions.loseObservation(this.promptCancelled?"父任务已中断，子执行状态需重新确认":"本轮观测结束，未确认子执行终态"),this.flushSubtaskStates(),this.controlToolLoop.reset(),this.promptActive=!1,this.currentTurnId=null,this.turnStartPromise=null,this.pendingSubtaskNotifications=[]}}resetSubtaskState(e){this.subtaskGeneration+=1,this.subtaskRouter.reset(),this.subtaskAgentMessagePhases.clear(),this.subtaskPlanDeltas.clear(),this.subscribedSubtaskThreadIds.clear(),this.pendingSubtaskSubscriptions.clear(),this.hydratedSubtaskThreadIds.clear(),this.seenSubtaskItemIds.clear(),this.pendingSubtaskNotifications=[],e!==void 0&&this.subtaskRouter.restoreFromSessionSnapshot(e,this.currentSessionId)}async subscribeKnownSubtasks(e=!0){const t=this.subtaskRouter.routesForSubscription().map(s=>this.subscribeSubtask(s,e));await Promise.allSettled(t)}subscribeSubtask(e,t){const s=e.sourceThreadId;if(!s||s===this.currentSessionId||this.subscribedSubtaskThreadIds.has(s))return Promise.resolve();const o=this.pendingSubtaskSubscriptions.get(s);if(o)return o;const n=this.subtaskGeneration,r=this.requireRpc().request("thread/resume",{threadId:s,approvalsReviewer:"user",excludeTurns:!1},6e4).then(c=>{if(n!==this.subtaskGeneration)return;this.subscribedSubtaskThreadIds.add(s);const u=this.subtaskRouter.restoreFromSessionSnapshot(c,this.currentSessionId);t&&this.hydrateSubtaskHistory(c,e),u>0&&this.subscribeKnownSubtasks(t)}).catch(()=>{}).finally(()=>{this.pendingSubtaskSubscriptions.get(s)===r&&this.pendingSubtaskSubscriptions.delete(s)});return this.pendingSubtaskSubscriptions.set(s,r),r}async cancel(e){const t=this.resolveSessionAlias(a(e,"sessionId")||this.currentSessionId);if(!t||!this.rpc)return;if(t!==this.currentSessionId)throw new Error("Cannot cancel a different Codex session");this.promptCancelled=!0,this.subtaskRouter.stopWaiting();const s=this.turnStartPromise?await V(this.turnStartPromise):null,o=this.currentTurnId||a(w(s,"turn"),"id");if(await this.rpc.request("turn/interrupt",{threadId:t,turnId:o},5e3),o){const n=this.pendingTurnCompletions.get(o);n&&(this.pendingTurnCompletions.delete(o),clearTimeout(n.timer),n.reject(new Error("Codex prompt cancelled")))}}async manualCompact(e){const t=a(e,"sessionId")||this.currentSessionId,s=this.resolveSessionAlias(t);if(!s)throw new Error("sessionId is required");if(this.promptActive||this.maintenanceActive)throw new Error("Codex session is busy");this.currentSessionId=s;const o=v(),n=await this.maintainContext("manual",{userRequest:this.previousUserText,assistantResponse:this.previousAssistantText,affectedFiles:[...this.previousAffectedFiles]},{force:!0,allowRollover:e.allowRollover===!0,compactTimeoutMs:ae(e,o.compactTimeoutMs)}),r=String(n.action||"");if(r==="compact_failed"||r==="rollover_failed"){const c=String(n.compactError||"Codex 上下文压缩未完成");throw new Error(`Codex 上下文压缩失败：${c}`)}return{sessionId:this.currentSessionId,maintenance:n,contextUsage:U(n)}}async recoverSession(e){const t=a(e,"sessionId")||this.currentSessionId,s=this.resolveSessionAlias(t);if(!s)throw new Error("sessionId is required");const o=a(e,"reason");if(o!=="low_output_loop"&&o!=="control_tool_loop")throw new Error("Unsupported Codex recovery reason");if(this.promptActive||this.maintenanceActive)throw new Error("Codex session is busy");if(s!==this.currentSessionId)throw new Error("Cannot recover a different Codex session");const n=new Set([...this.previousAffectedFiles,...this.currentAffectedFiles]);return await this.rotateThread(s,{userRequest:this.currentPromptText||this.previousUserText,assistantResponse:this.currentAssistantText||this.previousAssistantText,affectedFiles:[...n]}),{...d(this.sessionResponse(this.currentSessionId)),previousSessionId:s,recoveryReason:o}}async closeSession(e){await this.shutdown()}async ensureCodex(e){if(this.rpc&&this.started&&this.started.child.exitCode===null&&this.started.child.signalCode===null)return;if(this.codexStartupPromise){await this.codexStartupPromise;return}const t=(async()=>{if(this.rpc&&this.started&&this.started.child.exitCode===null&&this.started.child.signalCode===null)return;const s=$(e,this.managedProvider),o=new D(s.child,{peerName:"Codex app-server",onNotification:(n,r)=>this.handleCodexNotification(n,r),onRequest:async(n,r)=>this.handleCodexRequest(n,r)});this.started=s,this.rpc=o,s.child.once("exit",()=>{this.started===s&&(this.subtaskRouter.executions.loseObservation("执行连接断开，未确认子代理终态"),this.flushSubtaskStates(),this.subtaskRouter.stopWaiting())}),this.initialized=!1,await o.request("initialize",{clientInfo:{name:"aca-codex-acp",version:"0.1.0"},capabilities:{experimentalApi:!0,requestAttestation:!1}},6e4),this.initialized=!0})();this.codexStartupPromise=t;try{await t}catch(s){throw this.rpc&&this.started&&!this.initialized&&await T(this.started.child,1e3),this.rpc=null,this.started=null,s}finally{this.codexStartupPromise===t&&(this.codexStartupPromise=null)}}handleCodexNotification(e,t){const s=R(t);if(this.maintenanceActive&&(!s.threadId||s.threadId===this.currentSessionId)){this.captureContextNotification(e,t);return}if(!G(t,this.currentSessionId,this.currentTurnId)){if(!this.promptActive||!s.threadId||s.threadId===this.currentSessionId)return;const u=this.subtaskRouter.routeFor(s.threadId);if(!u){this.bufferPendingSubtaskNotification(e,t,s.threadId);return}this.handleSubtaskNotification(e,t,u),this.flushPendingSubtaskNotifications();return}const o=this.subtaskRouter.observe(t,this.currentSessionId);if(this.flushSubtaskStates(),o>0&&this.subscribeKnownSubtasks(!0),this.captureContextNotification(e,t),this.maintenanceActive||!this.promptActive&&e!=="turn/completed")return;this.rpc?.refreshPendingRequestTimeout("turn/start"),this.captureAgentMessagePhase(e,t);const n=this.connectionRecovery.beforeNotification(e,t);e==="turn/completed"&&this.resolveTurnCompleted(t);const r=e==="rawResponseItem/completed"?le(this.controlToolLoop,t):[],c=e==="rawResponse/completed"?de(t):e==="rawResponseItem/completed"?r.map(({update:u})=>u):C(e,t,{agentMessagePhases:this.agentMessagePhases,planDeltas:this.planDeltas});for(const u of r)this.maybeSteerControlToolLoop(u.event);for(const u of[...n,...c]){const l=_(u,e,t,this.agentMessagePhases);P(l)&&this.notifyControlToolProgress(),this.captureUpdateEvidence(l),this.notifySessionUpdate(l)}o>0&&this.flushPendingSubtaskNotifications()}handleSubtaskNotification(e,t,s){if(!this.promptActive)return;const o=this.subtaskRouter.acceptNotification(s,e,t);if(this.flushSubtaskStates(),!o)return;(e==="rawResponseItem/completed"||e==="item/completed")&&X(d(d(t).item))&&this.notifyControlToolProgress(),this.rememberSubtaskItem(s.sourceThreadId,t),this.rpc?.refreshPendingRequestTimeout("turn/start");const n=this.subtaskRouter.executions.get(s.sourceThreadId)?.runId||s.sourceThreadId,r=this.subtaskAgentMessagePhases.get(n)??new Map;this.subtaskAgentMessagePhases.set(n,r);const c=this.subtaskPlanDeltas.get(n)??new y;this.subtaskPlanDeltas.set(n,c),this.captureAgentMessagePhase(e,t,r);const u=this.subtaskRouter.observe(t,this.currentSessionId);this.flushSubtaskStates(),u>0&&this.subscribeKnownSubtasks(!0);const l=C(e,t,{agentMessagePhases:r,planDeltas:c}),h=R(t).turnId;for(const f of l){const p=_(f,e,t,r);if(!he(p))continue;a(p,"title")&&this.subtaskRouter.executions.action(s.sourceThreadId,a(p,"title")),P(p)&&(this.notifyControlToolProgress(),this.subtaskRouter.executions.progress(s.sourceThreadId,a(p,"title")||"收到执行结果"));const g=A(p,s,h,this.subtaskRouter.executions.get(s.sourceThreadId));b(g,this.currentAffectedFiles),this.notifySessionUpdate(g)}}hydrateSubtaskHistory(e,t){if(!(!this.promptActive||this.hydratedSubtaskThreadIds.has(t.sourceThreadId))){this.hydratedSubtaskThreadIds.add(t.sourceThreadId);for(const s of J(e)){const o=F(t.sourceThreadId,s.itemId);if(this.seenSubtaskItemIds.has(o))continue;this.seenSubtaskItemIds.add(o);const n=A(s.update,t,s.sourceTurnId,{runId:`history.${t.sourceThreadId}.${s.sourceTurnId}`,state:"unknown",outputIncomplete:!0,reason:"历史过程回放，不代表当前执行状态"}),r=d(n._meta);n._meta={...r,aca:{...d(r.aca),historyReplay:!0}},b(n,this.currentAffectedFiles),this.notifySessionUpdate(n)}}}rememberSubtaskItem(e,t){const s=d(t),o=d(s.item),n=a(o,"id")||a(s,"itemId");n&&this.seenSubtaskItemIds.add(F(e,n))}bufferPendingSubtaskNotification(e,t,s){this.pendingSubtaskNotifications.push({method:e,params:t,threadId:s}),this.pendingSubtaskNotifications.length>200&&this.pendingSubtaskNotifications.shift()}flushPendingSubtaskNotifications(){if(this.pendingSubtaskNotifications.length===0)return;let e=!0;for(;e&&this.pendingSubtaskNotifications.length>0;){e=!1;const t=[];for(const s of this.pendingSubtaskNotifications){const o=this.subtaskRouter.routeFor(s.threadId);if(!o){t.push(s);continue}e=!0,this.handleSubtaskNotification(s.method,s.params,o)}this.pendingSubtaskNotifications=t}}notifySessionUpdate(e){this.notify("session/update",{sessionId:this.currentSessionId,update:e})}flushSubtaskStates(){if(this.promptActive)for(const e of this.subtaskRouter.executions.drainUpdates())this.notifySessionUpdate(e)}async handleCodexRequest(e,t){if(O(e))return j(e,t,async s=>{const o=await this.requestParent("session/request_permission",{sessionId:this.currentSessionId,request:{...s,params:t,method:e}}),n=d(o),r=d(n.outcome);return r.outcome==="selected"&&typeof r.optionId=="string"?{outcome:{outcome:"selected",optionId:r.optionId}}:{outcome:{outcome:"cancelled"}}});if(pe(e)){const s=await this.requestParent("elicitation/create",{sessionId:this.currentSessionId,request:{...d(t),method:e}}),o=d(s),n=d(o.outcome);return n.outcome==="submitted"?{outcome:{outcome:"submitted",value:typeof n.value=="string"?n.value:""}}:{outcome:{outcome:"cancelled"}}}return{}}captureAgentMessagePhase(e,t,s=this.agentMessagePhases){if(e!=="item/started"&&e!=="item/completed")return;const o=w(t,"item");if(a(o,"type")!=="agentMessage")return;const n=a(o,"id");n&&s.set(n,a(o,"phase"))}waitForTurnCompleted(e,t){const s=this.completedTurns.get(e);return s?Promise.resolve(s):new Promise((o,n)=>{const r=setTimeout(()=>{this.pendingTurnCompletions.delete(e),n(new Error("Codex app-server request timed out while waiting for turn/completed"))},t);r.unref(),this.pendingTurnCompletions.set(e,{resolve:o,reject:n,timer:r})})}resolveTurnCompleted(e){const t=w(e,"turn"),s=a(t,"id");if(!s)return;this.completedTurns.set(s,t);const o=this.pendingTurnCompletions.get(s);if(o){if(this.pendingTurnCompletions.delete(s),clearTimeout(o.timer),a(t,"status")==="failed"){o.reject(new Error(`Codex turn failed: ${JSON.stringify(t.error??{})}`));return}o.resolve(t)}}async shutdown(){return this.shutdownPromise?this.shutdownPromise:(this.shutdownPromise=this.performShutdown(),this.shutdownPromise)}async performShutdown(){this.subtaskRouter.executions.loseObservation("执行连接关闭，未确认子代理终态"),this.flushSubtaskStates(),this.subtaskRouter.stopWaiting(),this.pendingCompaction&&(clearTimeout(this.pendingCompaction.timer),this.pendingCompaction.reject(new Error("Codex ACP adapter closed")),this.pendingCompaction=null);for(const t of this.pendingParentRequests.values())clearTimeout(t.timer),t.reject(new Error("Codex ACP adapter closed"));this.pendingParentRequests.clear();for(const t of this.pendingTurnCompletions.values())clearTimeout(t.timer),t.reject(new Error("Codex ACP adapter closed"));this.pendingTurnCompletions.clear();const e=this.started?.child;!e||e.exitCode!==null||e.signalCode!==null||(e.stdin.end(),!await T(e,2e3)&&(e.kill("SIGTERM"),!await T(e,1e3)&&(e.kill("SIGKILL"),await T(e,1e3))))}sessionResponse(e){return{sessionId:e,modes:{currentModeId:"workspace-write",availableModes:[{id:"read-only",name:"Read Only"},{id:"workspace-write",name:"Workspace Write"},{id:"danger-full-access",name:"Full Access"}]},configOptions:[{id:"model",category:"model",type:"string"},{id:"approvalPolicy",category:"approval",type:"string"},{id:"sandbox",category:"mode",type:"string"}]}}requireRpc(){if(!this.rpc)throw new Error("Codex app-server is not started");return this.rpc}notify(e,t){this.write({jsonrpc:"2.0",method:e,params:t})}requestParent(e,t,s=600*1e3){const o=this.nextParentRequestId++;return new Promise((n,r)=>{const c=setTimeout(()=>{this.pendingParentRequests.delete(o),r(new Error(`ACP client request timed out: ${e}`))},s);c.unref(),this.pendingParentRequests.set(o,{resolve:n,reject:r,timer:c}),this.write({jsonrpc:"2.0",id:o,method:e,params:t})})}handleParentResponse(e){const t=Number(e.id),s=this.pendingParentRequests.get(t);if(s){if(this.pendingParentRequests.delete(t),clearTimeout(s.timer),"error"in e){const o=d(e.error);s.reject(new Error(a(o,"message")||"ACP client request failed"));return}s.resolve(e.result)}}setConfigOption(e){const t=a(e,"configId"),s=e.value;if(!t)throw new Error("configId is required");if(typeof s!="string"&&typeof s!="boolean")throw new Error("config value must be string or boolean");return this.config[t]=s,this.notify("session/update",{sessionId:this.currentSessionId,update:{sessionUpdate:"config_option_update",configId:t,value:s}}),{}}setMode(e){const t=a(e,"modeId");if(!t)throw new Error("modeId is required");return this.config.sandbox=t,this.notify("session/update",{sessionId:this.currentSessionId,update:{sessionUpdate:"current_mode_update",modeId:t}}),{}}applyInitialConfig(e){const t=w(e,"config");for(const[s,o]of Object.entries(t))(typeof o=="string"||typeof o=="boolean")&&(this.config[s]=o)}codexConfig(){return{...typeof this.config.model=="string"&&this.config.model?{model:this.config.model}:{},approvalPolicy:typeof this.config.approvalPolicy=="string"?this.config.approvalPolicy:"on-request",sandbox:typeof this.config.sandbox=="string"?this.config.sandbox:"workspace-write"}}captureContextNotification(e,t){if(e==="thread/tokenUsage/updated"&&(this.latestTokenUsage=W(t)??this.latestTokenUsage),e==="thread/compacted"&&this.pendingCompaction&&this.resolveCompaction(),e==="item/completed"){const s=w(t,"item"),o=a(d(t),"threadId");a(s,"type")==="contextCompaction"&&(!o||o===this.currentSessionId)&&this.resolveCompaction(),a(s,"type")==="agentMessage"&&a(s,"phase")==="final_answer"&&(this.currentAssistantText=S(s)||this.currentAssistantText)}}resolveCompaction(){if(!this.pendingCompaction)return;const e=this.pendingCompaction;this.pendingCompaction=null,clearTimeout(e.timer),e.resolve()}captureUpdateEvidence(e){String(e.sessionUpdate||"")==="agent_message_chunk"&&(this.currentAssistantText+=S(e.content)),b(e,this.currentAffectedFiles)}captureThreadMetadata(e){const t=w(e,"thread");this.currentRolloutPath=a(t,"path")||null,this.threadTurnCount=Array.isArray(t.turns)?t.turns.length:0;const s=re(t.turns);s.userRequest&&(this.previousUserText=s.userRequest),s.assistantResponse&&(this.previousAssistantText=s.assistantResponse),this.previousAffectedFiles.clear();for(const o of s.affectedFiles)this.previousAffectedFiles.add(o);this.latestTokenUsage=null}async maintainContext(e,t,s={}){const o=v(),n=this.contextState(),r=k(n,o);if(!r.compact&&!s.force||!this.currentSessionId)return this.maintenanceResult({stage:e,action:"none",reasons:r.reasons,beforeState:n});const c=this.currentSessionId;this.notifyContextStatus("正在整理会话上下文",E(n)),this.maintenanceActive=!0;let u=!1,l="",h=n,f=r,p=!1,g="";try{const m=n.usage?.observedAtMs??0;await this.compactThread(c,s.compactTimeoutMs??o.compactTimeoutMs),await this.waitForTokenUsageAfter(m,2e3)}catch(m){u=!0,l=m instanceof Error?m.message:String(m)}try{if(e!=="manual"&&this.promptCancelled||this.shutdownPromise)throw new Error("Codex prompt cancelled");if(h=this.contextState(),f=k(h,o,{compactAttempted:!0,compactFailed:u}),f.rollover&&s.allowRollover!==!1){this.notifyContextStatus("正在创建轻量会话",f.reasons.join(", "));try{await this.rotateThread(c,t),p=!0}catch(m){g=m instanceof Error?m.message:String(m),this.notifyContextStatus("轻量会话创建失败",g)}}else u||this.notifyContextStatus("会话上下文已压缩",E(h))}finally{this.maintenanceActive=!1}return this.maintenanceResult({action:p?"rollover":g?"rollover_failed":u?"compact_failed":"compact",stage:e,reasons:f.reasons,beforeState:n,afterState:h,compactError:[l,g].filter(Boolean).join("; "),previousThreadId:c,rolloverRecommended:f.rollover&&s.allowRollover===!1})}compactThread(e,t){return this.pendingCompaction?Promise.reject(new Error("Codex context compaction is already running")):new Promise((s,o)=>{const n=setTimeout(()=>{this.pendingCompaction?.timer===n&&(this.pendingCompaction=null),o(new Error("Codex thread compaction timed out"))},t);n.unref(),this.pendingCompaction={resolve:s,reject:o,timer:n},this.requireRpc().request("thread/compact/start",{threadId:e},t).catch(r=>{this.pendingCompaction?.timer===n&&(this.pendingCompaction=null,clearTimeout(n),o(r instanceof Error?r:new Error(String(r))))})})}async rotateThread(e,t){const s=B({previousThreadId:e,cwd:this.currentCwd,userRequest:t.userRequest,assistantResponse:t.assistantResponse,affectedFiles:t.affectedFiles}),o=await this.requireRpc().request("thread/start",{cwd:this.currentCwd,approvalsReviewer:"user",...this.codexConfig(),developerInstructions:s,ephemeral:!1,experimentalRawEvents:!0,threadSource:"aca-codex-acp-rollover"},6e4),n=x(o);if(!n)throw new Error("Codex rollover thread/start did not return thread id");this.sessionAliases.set(e,n),this.currentSessionId=n,this.resetSubtaskState(o),this.captureThreadMetadata(o)}async waitForTokenUsageAfter(e,t){const s=Date.now()+t;for(;Date.now()<s;){if((this.latestTokenUsage?.observedAtMs??0)>e)return;await me(50)}}resolveSessionAlias(e){if(!e)return null;let t=e;const s=new Set;for(;this.sessionAliases.has(t)&&!s.has(t);)s.add(t),t=this.sessionAliases.get(t)??t;return t}contextState(){return{usage:this.latestTokenUsage,rolloutBytes:z(this.currentRolloutPath),turnCount:this.threadTurnCount}}maintenanceResult(e){return{stage:e.stage,action:e.action,reasons:e.reasons,previousThreadId:e.previousThreadId??null,sessionId:this.currentSessionId,before:e.beforeState,after:e.afterState??null,compactError:e.compactError||null,rolloverRecommended:e.rolloverRecommended===!0}}notifyContextStatus(e,t){this.notify("session/update",{sessionId:this.currentSessionId,update:{sessionUpdate:"aca_context_maintenance",label:e,detail:t}})}notifyControlToolProgress(){const e=this.controlToolLoop.recordProgress();e&&this.notifySessionUpdate(M(e))}maybeSteerControlToolLoop(e){if(!se(e.detection,this.controlToolPolicy))return;const t=te(e.detection,this.controlToolPolicy),s=this.controlToolSteering.next(e,t.warningCalls);if(!s)return;const{threadId:o,turnId:n}=e.detection;!o||!n||this.requireRpc().request("turn/steer",{threadId:o,expectedTurnId:n,clientUserMessageId:`aca-loop-steer-${Date.now()}-${Math.random().toString(16).slice(2)}`,input:[{type:"text",text:s.text,text_elements:[]}]},6e4).then(()=>{this.notifySessionUpdate(q(e,s,{succeeded:!0}))}).catch(r=>{this.notifySessionUpdate(q(e,s,{succeeded:!1,error:r}))})}write(e){process.stdout.write(`${JSON.stringify(e)}
|
|
4
|
+
`)}}function x(i){const e=w(i,"thread");return a(e,"id")||null}function w(i,e){const t=d(i);return d(t[e])}function d(i){return i&&typeof i=="object"&&!Array.isArray(i)?i:{}}function S(i){if(typeof i=="string")return i;if(Array.isArray(i))return i.map(S).filter(Boolean).join("");if(!i||typeof i!="object")return"";const e=d(i);for(const t of["text","message","content","output_text"]){const s=S(e[t]);if(s)return s}return""}function b(i,e){if(Array.isArray(i)){for(const n of i)b(n,e);return}const t=d(i),s=a(t,"type").toLowerCase(),o=a(t,"path");if(o&&["diff","resource_link","content"].includes(s)&&e.add(o),Array.isArray(t.locations))for(const n of t.locations){const r=a(d(n),"path");r&&e.add(r)}for(const n of[t.content,t.update,t.rawInput,t.rawOutput])n&&n!==i&&b(n,e)}function re(i){if(!Array.isArray(i)||i.length===0)return{userRequest:"",assistantResponse:"",affectedFiles:[]};const e=i.at(-1),t=new Set;b(e,t);let s="",o="";const n=r=>{if(Array.isArray(r)){for(const l of r)n(l);return}if(!r||typeof r!="object")return;const c=d(r),u=a(c,"type").toLowerCase();u==="usermessage"&&(s=S(c)||s),u==="agentmessage"&&(o=S(c)||o);for(const l of["items","content","input"])c[l]&&n(c[l])};return n(e),{userRequest:s,assistantResponse:o,affectedFiles:[...t]}}function ae(i,e){const t=I(i,"timeoutMs");return!Number.isFinite(t)||t<=0?e:Math.max(3e4,Math.min(59e4,t-1e4))}function U(i){const e=String(i.action||"none"),t=d(i.after),s=d(i.before),o=d(t.usage),n=d(s.usage),r=Object.keys(o).length>0?o:n,c=I(r,"contextWindow");if(e==="rollover")return{usedTokens:0,inputTokens:0,contextWindow:c,ratio:0,observedAtMs:Date.now(),state:"new_thread",maintenanceAction:e};if(Object.keys(r).length===0)return null;const u=I(r,"totalTokens"),l=I(r,"inputTokens");return{usedTokens:u||l,inputTokens:l,contextWindow:c,ratio:c>0?(u||l)/c:0,observedAtMs:I(r,"observedAtMs")||Date.now(),state:e==="compact"?"compacted":"active",maintenanceAction:e}}function ce(i){return i?{usedTokens:i.totalTokens||i.inputTokens,inputTokens:i.inputTokens,contextWindow:i.contextWindow,ratio:i.contextWindow>0?(i.totalTokens||i.inputTokens)/i.contextWindow:0,observedAtMs:i.observedAtMs,state:"active",maintenanceAction:null}:null}function E(i){const e=i.usage?`${i.usage.inputTokens} tokens`:"token unknown",t=i.rolloutBytes>0?`${Math.round(i.rolloutBytes/1024/1024)}MB rollout`:"rollout unknown";return`${e}, ${t}, ${i.turnCount} turns`}function ue(i){const e=String(i.action||"none");if(e!=="compact_failed"&&e!=="rollover_failed")return;const t=String(i.compactError||"Codex 上下文维护未完成");throw new Error(`Codex 自动上下文维护失败：${t}`)}function I(i,e){const t=d(i)[e];return typeof t=="number"&&Number.isFinite(t)?t:0}function de(i){return K(i)?[{sessionUpdate:"aca_codex_raw_response_usage",_meta:{codex:{rawResponse:i}}}]:[]}function le(i,e){const t=i.observeRawResponseItem(e);return t?[{event:t,update:M(t)}]:[]}function he(i){return["agent_message_chunk","agent_progress_chunk","agent_thought_chunk","tool_call","tool_call_update","plan","plan_update","plan_removed"].includes(String(i.sessionUpdate||""))}function F(i,e){return`${i}:${e}`}function a(i,e){const s=d(i)[e];return typeof s=="string"?s:""}function pe(i){const e=i.toLowerCase();return e.includes("elicitation")||e.includes("requestuserinput")||e.includes("request_user_input")||e.includes("input/request")}function N(){const i=Number.parseInt(process.env.ACA_ACP_PROMPT_TIMEOUT_MS??"",10);return Number.isInteger(i)&&i>=3e4?i:360*60*1e3}function fe(){const i=Number.parseInt(process.env.ACA_CODEX_SUBTASK_DRAIN_TIMEOUT_MS??"",10);return Number.isInteger(i)&&i>=1e3?Math.min(i,600*1e3):600*1e3}function T(i,e){return i.exitCode!==null||i.signalCode!==null?Promise.resolve(!0):new Promise(t=>{const s=setTimeout(()=>t(!1),e);s.unref(),i.once("close",()=>{clearTimeout(s),t(!0)})})}function me(i){return new Promise(e=>setTimeout(e,i))}function ge(){new ie}const we=process.argv[1]||"";/(?:^|[\\/])adapter\.(?:js|ts)$/.test(we)&&ge();export{ge as runCodexAcpAdapter};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{codexRawItemIsMeaningfulProgress as
|
|
1
|
+
import{codexRawItemIsMeaningfulProgress as E,toolOutputIsMeaningfulProgress as T}from"./progress-evidence.js";const L="aca_codex_control_tool_loop";class X{options;pendingControls=new Map;pendingWork=new Map;runningCommands=new Map;latest=null;nextSegmentId=1;progressVersion=0;constructor(n={}){this.options=n}observeRawResponseItem(n,r=Date.now()){const s=c(n),e=c(s.item),i=l(e,"type"),a=I(s.threadId),u=I(s.turnId);if(i==="function_call"||i==="custom_tool_call"){const o=P(e,a,u,this.options.shortSleepMaxDurationMs??x().shortSleepMaxDurationMs,this.options.hasActiveSubtasks?.()===!0,this.progressVersion);if(o)return this.pendingControls.set(o.callId,o),null;const g=l(e,"call_id")||l(e,"callId");return g&&this.pendingWork.set(g,{toolName:D(e),arguments:S(e.arguments??e.input)}),null}if(i==="function_call_output"||i==="custom_tool_call_output"){const o=l(e,"call_id")||l(e,"callId"),g=o?this.pendingControls.get(o):void 0;if(!g){const f=o?this.pendingWork.get(o):void 0;return o&&this.pendingWork.delete(o),this.updateRunningCommands(f,e.output),T(e.output)?this.recordProgress():null}return this.pendingControls.delete(o),g.progressVersion!==this.progressVersion||g.kind==="list_agents_no_live"&&!R(e.output)||g.kind==="wait_agent_no_live"&&(g.activeSubtasksAtCall||this.options.hasActiveSubtasks?.())?null:{state:"observed",detection:this.recordControlCall(g,r)}}return E(e)?this.recordProgress():null}recordProgress(){this.progressVersion+=1;const n=this.latest;return this.latest=null,n?{state:"recovered",detection:n}:null}reset(){this.pendingControls.clear(),this.pendingWork.clear(),this.runningCommands.clear(),this.latest=null,this.nextSegmentId=1,this.progressVersion=0}recordControlCall(n,r){const s=this.latest,e=s&&M(s.threadId,n.threadId)&&M(s.turnId,n.turnId),i=e&&s.kind!==n.kind?"mixed_control_no_progress":n.kind,a={kind:i,toolName:n.toolName,arguments:n.arguments,signature:i,sampleCount:e?s.sampleCount+1:1,firstObservedAtMs:e?s.firstObservedAtMs:r,detectedAtMs:r,elapsedMs:e?Math.max(0,r-s.firstObservedAtMs):0,segmentId:e?s.segmentId:this.nextSegmentId++,activeToolNames:this.activeToolNames(),containsDelegation:n.kind==="delegation_no_progress"||!!(e&&s.containsDelegation),threadId:n.threadId,turnId:n.turnId};return this.latest=a,a}activeToolNames(){return[...new Set([...[...this.pendingWork.values()].map(n=>n.toolName),...[...this.runningCommands.entries()].map(([n,r])=>`${r}（${n}）`)].filter(Boolean))].sort()}updateRunningCommands(n,r){if(!(n&&!b(n.toolName))){for(const s of m(n?.arguments))this.runningCommands.delete(s);for(const s of m(r))this.runningCommands.set(s,n?.toolName||"后台命令")}}}function x(t=process.env){const n=d(t.ACA_CODEX_LIST_AGENTS_LOOP_WARNING_CALLS,3),r=d(t.ACA_CODEX_WAIT_AGENT_LOOP_WARNING_CALLS,3),s=d(t.ACA_CODEX_SEND_MESSAGE_LOOP_WARNING_CALLS,3),e=d(t.ACA_CODEX_SHORT_SLEEP_LOOP_WARNING_CALLS,5),i=d(t.ACA_CODEX_DELEGATION_LOOP_WARNING_CALLS,6);return{listAgentsWarningCalls:n,listAgentsInterruptCalls:Math.max(n+1,d(t.ACA_CODEX_LIST_AGENTS_LOOP_INTERRUPT_CALLS,5)),waitAgentWarningCalls:r,waitAgentInterruptCalls:Math.max(r+1,d(t.ACA_CODEX_WAIT_AGENT_LOOP_INTERRUPT_CALLS,5)),sendMessageWarningCalls:s,sendMessageInterruptCalls:Math.max(s+1,d(t.ACA_CODEX_SEND_MESSAGE_LOOP_INTERRUPT_CALLS,8)),shortSleepWarningCalls:e,shortSleepInterruptCalls:Math.max(e+1,d(t.ACA_CODEX_SHORT_SLEEP_LOOP_INTERRUPT_CALLS,8)),shortSleepMaxDurationMs:d(t.ACA_CODEX_SHORT_SLEEP_MAX_DURATION_MS,1e3),steeringMaxAttempts:d(t.ACA_CODEX_CONTROL_TOOL_STEERING_MAX_ATTEMPTS,3),delegationWarningCalls:i,delegationInterruptCalls:Math.max(i+1,d(t.ACA_CODEX_DELEGATION_LOOP_INTERRUPT_CALLS,12)),delegationMinElapsedMs:d(t.ACA_CODEX_DELEGATION_LOOP_MIN_ELAPSED_MS,6e4)}}function w(t,n){return t==="delegation_no_progress"?{warningCalls:n.delegationWarningCalls,interruptCalls:n.delegationInterruptCalls}:t==="mixed_control_no_progress"?{warningCalls:Math.min(n.listAgentsWarningCalls,n.waitAgentWarningCalls,n.sendMessageWarningCalls,n.shortSleepWarningCalls),interruptCalls:Math.max(n.listAgentsInterruptCalls,n.waitAgentInterruptCalls,n.sendMessageInterruptCalls,n.shortSleepInterruptCalls)}:t==="list_agents_no_live"?{warningCalls:n.listAgentsWarningCalls,interruptCalls:n.listAgentsInterruptCalls}:t==="wait_agent_no_live"?{warningCalls:n.waitAgentWarningCalls,interruptCalls:n.waitAgentInterruptCalls}:t==="send_message_no_progress"?{warningCalls:n.sendMessageWarningCalls,interruptCalls:n.sendMessageInterruptCalls}:{warningCalls:n.shortSleepWarningCalls,interruptCalls:n.shortSleepInterruptCalls}}function y(t,n){return!t.containsDelegation||t.elapsedMs>=n.delegationMinElapsedMs}function U(t,n){const r=w(t.kind,n);return t.containsDelegation?{warningCalls:Math.max(r.warningCalls,n.delegationWarningCalls),interruptCalls:Math.max(r.interruptCalls,n.delegationInterruptCalls)}:r}function $(t){return{sessionUpdate:L,_meta:{codex:{controlToolLoop:t}}}}function V(t){const n=c(t),r=c(n.update);if(l(r,"sessionUpdate")!==L)return null;const s=c(r._meta),e=c(s.codex),i=c(e.controlToolLoop),a=c(i.detection),u=l(i,"state"),o=l(a,"kind");return u!=="observed"&&u!=="recovered"||o!=="list_agents_no_live"&&o!=="wait_agent_no_live"&&o!=="send_message_no_progress"&&o!=="delegation_no_progress"&&o!=="mixed_control_no_progress"&&o!=="short_sleep"?null:{state:u,detection:{kind:o,toolName:l(a,"toolName"),arguments:a.arguments,signature:l(a,"signature"),sampleCount:C(a.sampleCount),firstObservedAtMs:C(a.firstObservedAtMs),detectedAtMs:C(a.detectedAtMs),elapsedMs:C(a.elapsedMs),segmentId:C(a.segmentId),activeToolNames:k(a.activeToolNames),containsDelegation:a.containsDelegation===!0||o==="delegation_no_progress",threadId:I(a.threadId),turnId:I(a.turnId)}}}function D(t){const n=l(t,"name"),r=l(t,"namespace");return r?`${r}.${n}`:n}function m(t,n=0){if(n>5)return[];if(typeof t=="string"){const e=h(t);if(e!==null)return m(e,n+1);const i=t.match(/Script running with cell ID\s+([^\s.]+)/i);return i?.[1]?[`cell:${i[1]}`]:[]}if(Array.isArray(t))return t.flatMap(e=>m(e,n+1));const r=c(t),s=[];for(const e of["cell_id","cellId"]){const i=r[e];typeof i=="string"&&i.trim()&&s.push(`cell:${i.trim()}`)}for(const e of["session_id","sessionId"]){const i=r[e];(typeof i=="string"||typeof i=="number")&&String(i).trim()&&s.push(`session:${String(i).trim()}`)}for(const e of["output","content","result","structuredContent"])e in r&&s.push(...m(r[e],n+1));return[...new Set(s)]}function b(t){const n=t.split(".").at(-1)||t;return["exec","execcommand","wait","writestdin"].includes(n.replace(/[^a-z0-9]/gi,"").toLowerCase())}function P(t,n,r,s,e,i){const a=l(t,"call_id")||l(t,"callId");if(!a)return null;const u=l(t,"name"),o=l(t,"namespace")||(u.includes(".")?u.slice(0,u.lastIndexOf(".")):""),g=u.includes(".")?u:o?`${o}.${u}`:u,f=S(t.arguments??t.input),N=u.split(".").at(-1)||u,p=N.replace(/[^a-z0-9]/gi,"").toLowerCase();let _=null;if(["spawnagent","followuptask","resumeagent"].includes(p)&&(!o||o==="collaboration"))_="delegation_no_progress";else if(p==="listagents"&&(!o||o==="collaboration"))_="list_agents_no_live";else if((p==="waitagent"||p==="wait")&&(!o||o==="collaboration"))_="wait_agent_no_live";else if(p==="sendmessage"&&(!o||o==="collaboration"))_="send_message_no_progress";else if(N==="sleep"&&(!o||o==="clock")){const O=W(c(f).duration_ms);O>=0&&O<=s&&(_="short_sleep")}return _?{callId:a,kind:_,toolName:g,arguments:f,threadId:n,turnId:r,activeSubtasksAtCall:e,progressVersion:i}:null}function R(t){const n=A(t,0);return n?!n.some(r=>{const s=c(r),e=String(s.agent_name??s.agentName??"").trim(),i=String(s.agent_status??s.agentStatus??s.status??"").trim().toLowerCase();return e==="/root"?!1:["pending","pendinginit","running","active","in_progress","inprogress"].includes(i)}):!1}function A(t,n){if(n>4)return null;if(typeof t=="string"){const s=h(t);return s===null?null:A(s,n+1)}if(Array.isArray(t)){for(const s of t){const e=c(s),i=A(e.text??e.content??s,n+1);if(i)return i}return null}const r=c(t);if(Array.isArray(r.agents))return r.agents;for(const s of["structuredContent","output","content","result"]){if(!(s in r))continue;const e=A(r[s],n+1);if(e)return e}return null}function S(t){return typeof t!="string"?t??{}:h(t)??t.trim()}function h(t){try{return JSON.parse(t)}catch{return null}}function M(t,n){return!t||!n||t===n}function d(t,n){const r=Number.parseInt(t??"",10);return Number.isInteger(r)&&r>0?r:n}function C(t){return typeof t=="number"&&Number.isFinite(t)&&t>=0?Math.floor(t):0}function W(t){return typeof t=="number"&&Number.isFinite(t)?t:Number.NaN}function c(t){return t&&typeof t=="object"&&!Array.isArray(t)?t:{}}function l(t,n){const r=t[n];return typeof r=="string"?r:""}function I(t){return typeof t=="string"&&t.trim()?t.trim():null}function k(t){return Array.isArray(t)?t.filter(n=>typeof n=="string"&&n.trim().length>0):[]}export{X as CodexControlToolLoopDetector,$ as codexControlToolLoopAcpUpdate,V as codexControlToolLoopFromAcpSessionUpdate,U as controlToolLoopDetectionThresholds,y as controlToolLoopReady,w as controlToolLoopThresholds,x as readCodexControlToolLoopPolicy};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
function c(e,t,s){const r=s.succeeded?"steeredAtMs":"failedAtMs";return{sessionUpdate:"aca_codex_control_tool_steer",label:s.succeeded?"已发送 Codex 工具循环纠偏提示":"Codex 工具循环纠偏发送失败",detail:s.succeeded?t.text:s.error instanceof Error?s.error.message:String(s.error),_meta:{aca:{controlToolSteering:{...e.detection,attempt:t.attempt,maxAttempts:t.maxAttempts,[r]:Date.now()}}}}}class g{maxAttempts;steeredStages=new Set;attemptsBySegment=new Map;attemptsByTurn=new Map;constructor(t){this.maxAttempts=t}next(t,s){const{threadId:r,turnId:n}=t.detection;if(!r||!n)return null;const o=`${r}:${n}`,i=this.attemptsByTurn.get(o)??0;if(i>=this.maxAttempts)return null;const d=`${o}:${t.detection.segmentId}`,l=(this.attemptsBySegment.get(d)??0)+1,a=p(t,s,l);if(!a||this.steeredStages.has(a.key))return null;const m=i+1;return this.steeredStages.add(a.key),this.attemptsBySegment.set(d,l),this.attemptsByTurn.set(o,m),{...a,attempt:m,maxAttempts:this.maxAttempts}}reset(){this.steeredStages.clear(),this.attemptsBySegment.clear(),this.attemptsByTurn.clear()}}function p(e,t,s=1){const r=t+Math.max(0,s-1)*2;if(e.state!=="observed"||e.detection.sampleCount<r)return null;const n=e.detection;return!n.threadId||!n.turnId?null:{key:`${n.threadId}:${n.turnId}:${n.segmentId}:${s}`,text:u(n)}}function u(e){const t=e.activeToolNames.length>0?` 当前仍有普通工具或后台命令等待收取结果（${e.activeToolNames.join("、")}）；请使用该工具对应的 wait、write_stdin 或结果收取机制继续等待，不能用子代理查询工具轮询普通命令。`:"";return e.kind==="list_agents_no_live"?`系统检测到当前没有运行中的子代理。不要继续调用 list_agents；请直接继续执行原始用户任务，并用实际工作成果推进任务。${t}`:e.kind==="wait_agent_no_live"?`系统检测到当前没有可等待的子代理。不要继续调用 wait_agent；请直接继续执行原始用户任务，并用实际工作成果推进任务。${t}`:e.kind==="send_message_no_progress"?`系统检测到连续投递子任务消息没有产生新进展。send_message 只投递消息，不会为已结束的子任务启动新 Turn；不要继续轮换 target 发送消息。需要让已结束子任务重新执行时使用 followup_task，否则请直接汇总已有结果并完成原始用户任务。${t}`:e.kind==="mixed_control_no_progress"
|
|
1
|
+
function c(e,t,s){const r=s.succeeded?"steeredAtMs":"failedAtMs";return{sessionUpdate:"aca_codex_control_tool_steer",label:s.succeeded?"已发送 Codex 工具循环纠偏提示":"Codex 工具循环纠偏发送失败",detail:s.succeeded?t.text:s.error instanceof Error?s.error.message:String(s.error),_meta:{aca:{controlToolSteering:{...e.detection,attempt:t.attempt,maxAttempts:t.maxAttempts,[r]:Date.now()}}}}}class g{maxAttempts;steeredStages=new Set;attemptsBySegment=new Map;attemptsByTurn=new Map;constructor(t){this.maxAttempts=t}next(t,s){const{threadId:r,turnId:n}=t.detection;if(!r||!n)return null;const o=`${r}:${n}`,i=this.attemptsByTurn.get(o)??0;if(i>=this.maxAttempts)return null;const d=`${o}:${t.detection.segmentId}`,l=(this.attemptsBySegment.get(d)??0)+1,a=p(t,s,l);if(!a||this.steeredStages.has(a.key))return null;const m=i+1;return this.steeredStages.add(a.key),this.attemptsBySegment.set(d,l),this.attemptsByTurn.set(o,m),{...a,attempt:m,maxAttempts:this.maxAttempts}}reset(){this.steeredStages.clear(),this.attemptsBySegment.clear(),this.attemptsByTurn.clear()}}function p(e,t,s=1){const r=t+Math.max(0,s-1)*2;if(e.state!=="observed"||e.detection.sampleCount<r)return null;const n=e.detection;return!n.threadId||!n.turnId?null:{key:`${n.threadId}:${n.turnId}:${n.segmentId}:${s}`,text:u(n)}}function u(e){const t=e.activeToolNames.length>0?` 当前仍有普通工具或后台命令等待收取结果（${e.activeToolNames.join("、")}）；请使用该工具对应的 wait、write_stdin 或结果收取机制继续等待，不能用子代理查询工具轮询普通命令。`:"";return e.kind==="list_agents_no_live"?`系统检测到当前没有运行中的子代理。不要继续调用 list_agents；请直接继续执行原始用户任务，并用实际工作成果推进任务。${t}`:e.kind==="wait_agent_no_live"?`系统检测到当前没有可等待的子代理。不要继续调用 wait_agent；请直接继续执行原始用户任务，并用实际工作成果推进任务。${t}`:e.kind==="send_message_no_progress"?`系统检测到连续投递子任务消息没有产生新进展。send_message 只投递消息，不会为已结束的子任务启动新 Turn；不要继续轮换 target 发送消息。需要让已结束子任务重新执行时使用 followup_task，否则请直接汇总已有结果并完成原始用户任务。${t}`:e.kind==="mixed_control_no_progress"?`系统检测到交替委派、查询、等待或投递子任务消息仍未产生实际进展。切换工具或 target 不能推进任务；停止重复创建或重启子任务，请收取真实运行任务的结果，或直接执行原始用户任务。${t}`:e.kind==="delegation_no_progress"?`系统检测到反复创建或重新启动子代理，却没有收到有效工作成果。停止重复委派；已有任务仍在运行时等待其结果，已结束时汇总已有成果，必要时由主代理直接推进原始任务。不要以再次启动子代理代替完成任务。${t}`:`系统检测到连续短时 sleep 没有带来进展。不要继续短时轮询；请直接继续执行原始用户任务，或使用能等待真实运行任务完成的机制。${t}`}export{g as CodexControlToolSteeringLimiter,c as codexControlToolSteeringAcpUpdate,p as controlToolLoopSteeringInput};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import _ from"node:fs";import{runAbortableRequest as L}from"../../client/abortable-request.js";import{BoundedItemBuffer as B}from"../../client/bounded-buffer.js";import{promptBlocksToAcpContent as K}from"../../client/acp-content.js";import{acpSessionUpdateFromParams as X,eventFromAcpSessionUpdate as Y,statusFromAcpSessionUpdate as G,subtaskContextFromAcpSessionUpdate as J}from"../../client/acp-events.js";import{defaultAcpRuntimePool as E}from"../../client/acp-runtime-pool.js";import{resolveCodexAcpLaunch as D}from"./launch.js";import{cancelCodexRuntime as Q}from"./cancellation.js";import{CodexPromptPerformanceTracker as Z,CodexUsageLoopDetector as U,codexRawResponseUsageFromAcpSessionUpdate as ee,codexTokenUsageFromAcpSessionUpdate as oe,readCodexContextMaintenancePolicy as q}from"./context-maintenance.js";import{ensureCodexProviderRuntimeConfig as $}from"../../../core/codex-provider-runtime-config.js";import{codexControlToolLoopFromAcpSessionUpdate as te,controlToolLoopThresholds as se,readCodexControlToolLoopPolicy as re}from"./control-tool-loop.js";import{attachCodexDiagnostics as ne,CodexTurnDiagnosticsTracker as ie}from"./turn-diagnostics.js";import{AcpSessionInvalidatedError as O}from"../../session-errors.js";import{codexAcpUpdateIsMeaningfulProgress as ae}from"./progress-evidence.js";const ce={sessionResume:!0,imageInput:!0,fileAttachment:!0,filesystem:!0,terminal:!0,permissionRequest:!0,configOptions:!0,usage:!0,contextUsage:!0,contextCompaction:!0,plan:!0,diff:!0};class Ee{id="codex-acp";name="Codex ACP";capabilities=ce;async createSession(e){return new le(e.cwd,e.providerSessionId??null,e.timeoutMs)}async forkSession(e){if(!_.existsSync(e.cwd)||!_.statSync(e.cwd).isDirectory())throw new Error(`Project root does not exist or is not a directory: ${e.cwd}`);const t=e.sourceProviderSessionId.trim(),r=await $(),a=await E.acquire({providerId:"codex-acp",cwd:e.cwd,providerSessionId:t,runtimeIdentity:r?.runtimeIdentity||"default",env:N(r),...D(),onSessionUpdate:()=>{}});try{await W(a,r),a.initialized||(await a.client.initialize(6e4),a.markInitialized()),e.onStatus?.({phase:"forking",label:"正在分叉 Codex 会话",detail:t,updateType:"session/fork",atMs:Date.now()});const n=await a.client.forkSession({sessionId:t,cwd:e.cwd,config:F(e)},e.timeoutMs??12e4),o=b(n);if(!o)throw new Error("Codex ACP session/fork did not return sessionId");return{providerSessionId:o}}finally{a.release()}}}class le{cwd;providerSessionId;defaultTimeoutMs;lease=null;sessionResponse=null;statusCallback=null;updateCallback=null;permissionCallback=null;userInputCallback=null;abortHandler=null;statusTimeline=[];updates=new B(16);content="";performanceTracker=null;usageLoopDetector=null;usagePatternReport=null;controlToolPatternReport=null;turnDiagnosticsTracker=null;usageLoopWarningActive=!1;controlToolLoopWarningActive=!1;controlToolLoopInterrupting=!1;cancellation=null;constructor(e,t,r=ge()){this.cwd=e,this.providerSessionId=t,this.defaultTimeoutMs=r}async sendPrompt(e){if(!_.existsSync(e.cwd)||!_.statSync(e.cwd).isDirectory())throw new Error(`Project root does not exist or is not a directory: ${e.cwd}`);const t=Date.now();this.statusCallback=e.onStatus??null,this.updateCallback=e.onUpdate??null,this.permissionCallback=e.onPermissionRequest??null,this.userInputCallback=e.onUserInputRequest??null,this.attachAbortSignal(e.signal),this.content="",this.updates.clear(),this.statusTimeline.length=0;const r=q(),a=re();this.performanceTracker=new Z(t),this.usageLoopDetector=new U(r);const n=new ie;this.turnDiagnosticsTracker=n,this.usageLoopWarningActive=!1,this.controlToolLoopWarningActive=!1,this.controlToolLoopInterrupting=!1;let o={error:null,stopping:null,detection:null,controlDetection:null,interruption:null,kind:null},i=null,c=null,w=this.providerSessionId,x,k=null;try{this.emitStatus("initializing","Codex ACP 启动中","codex-acp");const m=await this.acquireRuntime(e.cwd);this.lease=m,i=m.client,c=m.started,await this.initialize(m),w=await this.establishSession(m,e),await this.applyConfig(i,w,e);const S=i,V=K(e.prompt,e.promptBlocks);let T=!1;for(this.emitStatus("thinking","思考中"),k=this.startSlowStatusTimer();;){const f=w;o={error:null,stopping:null,detection:null,controlDetection:null,interruption:null,kind:null},this.usageLoopDetector=new U(r),this.usageLoopWarningActive=!1,this.controlToolLoopWarningActive=!1,this.controlToolLoopInterrupting=!1,this.usagePatternReport=u=>{if(o.error)return;const v=Math.round(u.maxInputTokens/1e3),g=`同一 Turn 已连续请求至少 ${u.sampleCount} 次，单次输入约 ${v}k tokens`;if(n.recordUsageLoop(u.sampleCount,u.detectedAtMs,g),u.sampleCount<r.usageLoopInterruptSamples){this.usageLoopWarningActive=!0,this.emitStatus("thinking","Codex 出现低产出内部循环",g,"aca.performance.low_output_loop");return}const C=`Codex 低产出内部循环：同一 Turn 已连续请求至少 ${u.sampleCount} 次，单次输入约 ${v}k tokens，且未观察到有效进展`;o.error=new Error(C),o.detection=u,o.kind="low_output_loop",this.emitStatus("thinking","正在中断 Codex 低产出内部循环",g,"aca.performance.low_output_loop_interrupting"),o.stopping=this.stopRuntime(m,f).then(l=>{if(o.interruption=l,n.recordInterrupt({acknowledged:!l.forced,forcedRuntimeClose:l.forced,reason:l.reason}),l.forced){const d=l.reason||"取消请求失败";o.error=new Error(`${C}；取消请求失败：${d}；已关闭运行实例`)}}).catch(l=>{const d=l instanceof Error?l.message:String(l);n.recordInterrupt({acknowledged:!1,forcedRuntimeClose:!1,reason:d}),o.error=new Error(`${C}；${d}`),this.emitStatus("failed","Codex 循环中断失败",d,"aca.performance.low_output_loop_interrupt_failed")})},this.controlToolPatternReport=u=>{if(o.error)return;const v=se(u.kind,a);if(u.sampleCount<v.warningCalls)return;const g=u.kind==="list_agents_no_live"?"list_agents 查询不到运行中的子任务":u.kind==="wait_agent_no_live"?"无运行子任务时调用 wait_agent":u.kind==="send_message_no_progress"?"send_message 投递未产生进展":u.kind==="mixed_control_no_progress"?"混合控制工具且未产生进展":"短时 sleep",C=Math.max(1,Math.round(u.elapsedMs/6e4)),l=`同一 Turn 已连续 ${u.sampleCount} 次执行 ${g}，持续约 ${C} 分钟`;if(n.recordControlLoop(u,l),u.sampleCount<v.interruptCalls){this.controlToolLoopWarningActive=!0,this.emitStatus("thinking","Codex 出现无进展控制工具循环",l,"aca.performance.control_tool_loop");return}const d=`Codex 无进展控制工具循环：${l}`;o.error=new Error(d),o.controlDetection=u,o.kind="control_tool_loop",this.controlToolLoopInterrupting=!0,this.emitStatus("thinking","正在中断 Codex 无进展控制工具循环",l,"aca.performance.control_tool_loop_interrupting"),o.stopping=this.stopRuntime(m,f).then(p=>{o.interruption=p,n.recordInterrupt({acknowledged:!p.forced,forcedRuntimeClose:p.forced,reason:p.reason});const I=p.forced?`${l}；取消请求失败：${p.reason}；已关闭运行实例`:l;p.forced&&(o.error=new Error(`${d}；取消请求失败：${p.reason}；已关闭运行实例`)),this.emitStatus("failed","Codex 已中断无进展控制工具循环",I,"aca.performance.control_tool_loop_interrupted")}).catch(p=>{const I=p instanceof Error?p.message:String(p);n.recordInterrupt({acknowledged:!1,forcedRuntimeClose:!1,reason:I}),o.error=new Error(`${d}；${I}`),this.emitStatus("failed","Codex 控制工具循环中断失败",I,"aca.performance.control_tool_loop_interrupt_failed")})};let P;try{x=await this.promptWithAbort(S,{sessionId:f,prompt:V,timeoutMs:e.timeoutMs??this.defaultTimeoutMs,signal:e.signal})}catch(u){P=u}if(await o.stopping,o.error){const u=o.detection;if(o.kind==="low_output_loop"&&u?.source==="thread_usage"&&!T&&o.interruption?.forced===!1&&!e.signal?.aborted){T=!0,this.emitStatus("resuming","正在迁移异常 Codex 会话","保留本轮进度并创建干净线程","aca.performance.low_output_loop_recovering");try{const l=await S.recoverSession({sessionId:f,reason:"low_output_loop"}),d=b(l);if(!d||d===f)throw new Error("Codex recovery did not create a new session");w=d,this.providerSessionId=d,this.sessionResponse=h(l),m.setProviderSession({providerSessionId:d,sessionResponse:this.sessionResponse});const p={previousProviderSessionId:f,providerSessionId:d,reason:"low_output_loop",migratedAtMs:Date.now()};n.recordMigration(p),await e.onProviderSessionMigration?.(p),n.recordRecovery(p.migratedAtMs),this.content="",this.emitStatus("thinking","Codex 会话已迁移，继续执行",d,"aca.performance.low_output_loop_recovered_session");continue}catch(l){const d=l instanceof Error?l.message:String(l);o.error=new Error(`${o.error.message}；自动迁移失败：${d}`)}}if(o.kind==="low_output_loop")throw this.emitStatus("failed","Codex 已中断低产出内部循环",o.error.message,"aca.performance.low_output_loop_interrupted"),new O(o.error.message,f,{source:u?.source??null,sampleCount:u?.sampleCount??null,recoveryAttempted:T});const g=o.controlDetection;if(o.interruption?.forced===!1&&!e.signal?.aborted){this.emitStatus("resuming","正在迁移异常 Codex 会话","保留本轮证据并为后续任务创建干净线程","aca.performance.control_tool_loop_migrating");try{const l=await S.recoverSession({sessionId:f,reason:"control_tool_loop"}),d=b(l);if(!d||d===f)throw new Error("Codex recovery did not create a new session");w=d,this.providerSessionId=d,this.sessionResponse=h(l),m.setProviderSession({providerSessionId:d,sessionResponse:this.sessionResponse});const p={previousProviderSessionId:f,providerSessionId:d,reason:"control_tool_loop",migratedAtMs:Date.now()};throw n.recordMigration(p),await e.onProviderSessionMigration?.(p),this.emitStatus("failed","Codex 循环已中断，会话已自动迁移",d,"aca.performance.control_tool_loop_migrated_session"),de(o.error,d)}catch(l){if(ue(l))throw l;const d=l instanceof Error?l.message:String(l);o.error=new Error(`${o.error.message}；自动迁移失败：${d}`)}}throw new O(o.error.message,f,{source:"control_tool_loop",kind:g?.kind??null,sampleCount:g?.sampleCount??null,segmentId:g?.segmentId??null})}if(P)throw P;const y=z(x);y&&y!==w&&(w=y,this.providerSessionId=y,m.setProviderSession({providerSessionId:y,sessionResponse:this.sessionResponse}));break}}catch(m){if(m instanceof Error){const S=ne(m,n.snapshot());throw S.statusTimeline=[...this.statusTimeline],S.performance=this.performanceTracker?.snapshot(),S}throw m}finally{await o.stopping,await this.cancellation?.catch(()=>{}),k&&clearInterval(k),this.usagePatternReport=null,this.controlToolPatternReport=null,this.turnDiagnosticsTracker=null,this.usageLoopDetector=null,this.usageLoopWarningActive=!1,this.controlToolLoopWarningActive=!1,this.controlToolLoopInterrupting=!1,this.abortHandler&&e.signal&&(e.signal.removeEventListener("abort",this.abortHandler),this.abortHandler=null),this.releaseLease()}return this.emitStatus("completed","已完成"),{providerSessionId:w,cliType:"builtin",agentType:"codex",effectiveConfig:{model:e.model??null,mode:e.mode??null,configOptionValues:e.configOptionValues??null,command:c.command,processPid:c.child.pid??null,provider:"codex-acp",protocol:"acp"},command:c.command,args:c.args,cwd:e.cwd,exitCode:c.child.exitCode,signal:c.child.signalCode,durationMs:Date.now()-t,stdout:i.rpc.stdout,stderr:i.rpc.stderr,content:this.content.trim(),updateCount:this.updates.count(),updates:this.updates.snapshot(),statusTimeline:[...this.statusTimeline],performance:this.performanceTracker?.snapshot(),contextUsage:Se(x),providerDiagnostics:n.snapshot(),promptResponse:x}}async compactContext(e){if(!_.existsSync(e.cwd)||!_.statSync(e.cwd).isDirectory())throw new Error(`Project root does not exist or is not a directory: ${e.cwd}`);const t=Date.now();this.statusCallback=e.onStatus??null,this.updateCallback=e.onUpdate??null,this.attachAbortSignal(e.signal);let r=this.providerSessionId,a;try{this.emitStatus("initializing","Codex ACP 启动中","codex-acp");const o=await this.acquireRuntime(e.cwd);this.lease=o,await this.initialize(o),r=await this.establishSession(o,e),await this.applyConfig(o.client,r,e);const i=we(e.timeoutMs);a=await this.compactWithAbort(o.client,{sessionId:r,allowRollover:e.allowRollover===!0,timeoutMs:i,signal:e.signal});const c=z(a);c&&c!==r&&(r=c,this.providerSessionId=c,o.setProviderSession({providerSessionId:c,sessionResponse:this.sessionResponse}))}catch(o){if(this.lease&&pe(o,e.signal)){const i=this.lease;this.lease=null,await i.dispose().catch(()=>{})}throw this.emitStatus("failed","上下文压缩失败",o instanceof Error?o.message:String(o)),o}finally{this.abortHandler&&e.signal&&(e.signal.removeEventListener("abort",this.abortHandler),this.abortHandler=null),this.releaseLease()}const n=h(a)??{};return{providerSessionId:r||this.providerSessionId||"",contextUsage:H(n.contextUsage),maintenance:h(n.maintenance)??{},durationMs:Date.now()-t}}async cancel(){this.providerSessionId&&this.lease&&await this.stopRuntime(this.lease,this.providerSessionId)}stopRuntime(e,t){if(this.cancellation)return this.cancellation;const r=Q(e,t);return this.cancellation=r,r.finally(()=>{this.cancellation===r&&(this.cancellation=null)}).catch(()=>{}),r}async close(){await this.cancellation?.catch(()=>{}),this.statusCallback=null,this.updateCallback=null,this.permissionCallback=null,this.userInputCallback=null,this.abortHandler&&(this.abortHandler=null),this.releaseLease()}async acquireRuntime(e){const t=D(),r=await $(),a=await E.acquire({providerId:"codex-acp",cwd:e,providerSessionId:this.providerSessionId,runtimeIdentity:r?.runtimeIdentity||"default",env:N(r),command:t.command,args:t.args,onSessionUpdate:n=>this.handleSessionUpdate(n),onClientRequest:async(n,o)=>{if(n==="session/request_permission")return this.requestPermission(o);if(n==="elicitation/create"||n==="session/request_user_input")return this.requestUserInput(o);throw new Error(`Unsupported Codex ACP client request: ${n}`)}});try{return await W(a,r),a}catch(n){throw await a.dispose().catch(()=>{}),n}}async initialize(e){e.initialized||(await e.client.initialize(6e4),e.markInitialized())}async establishSession(e,t){const r=e.client,a=F(t);if(e.providerSessionId&&e.sessionEstablished)return this.providerSessionId=e.providerSessionId,this.sessionResponse=e.sessionResponse,e.providerSessionId;if(this.providerSessionId)try{this.emitStatus("resuming","Codex ACP 会话恢复中","session/load");const i=await r.loadSession({sessionId:this.providerSessionId,cwd:t.cwd,config:a},6e4);this.sessionResponse=h(i);const c=b(i)||this.providerSessionId;return this.providerSessionId=c,e.setProviderSession({providerSessionId:c,sessionResponse:this.sessionResponse}),c}catch(i){if(t.requireSessionResume){const c=i instanceof Error?i.message:String(i);throw new Error(`无法恢复导入的 Codex ACP Session ${this.providerSessionId}：${c}`)}this.providerSessionId=null}this.emitStatus("acp","Codex ACP 会话创建中","session/new");const n=await r.newSession({cwd:t.cwd,config:a},12e4);this.sessionResponse=h(n);const o=b(n);if(!o)throw new Error("Codex ACP session/new did not return sessionId");return this.providerSessionId=o,e.setProviderSession({providerSessionId:o,sessionResponse:this.sessionResponse}),o}async applyConfig(e,t,r){r.model&&await e.setSessionConfigOption({sessionId:t,configId:"model",value:r.model},6e4).catch(()=>{});const a=M(r.mode);a&&await e.setSessionConfigOption({sessionId:t,configId:"approvalPolicy",value:a},6e4).catch(()=>{});const n=R(r.mode);n&&await e.setSessionConfigOption({sessionId:t,configId:"sandbox",value:n},6e4).catch(()=>{});for(const[o,i]of Object.entries(r.configOptionValues??{}))["model","mode","sandbox","approvalPolicy"].includes(o)||await e.setSessionConfigOption({sessionId:t,configId:o,value:i},6e4).catch(()=>{})}handleSessionUpdate(e){const t=X(e),r=String(t?.update.sessionUpdate||""),a=J(e);if(!a&&r==="aca_codex_subtask_drain"){const i=String(t?.update.label||"子任务收尾等待超时"),c=String(t?.update.detail||"仍有子任务未结束");this.emitStatus("exploring",i,c,r)}else if(!a&&r==="aca_codex_control_tool_loop"){const i=te(e);i?.state==="observed"&&this.controlToolPatternReport?.(i.detection),i?.state==="recovered"&&this.controlToolLoopWarningActive&&!this.controlToolLoopInterrupting&&(this.controlToolLoopWarningActive=!1,this.turnDiagnosticsTracker?.recordRecovery(),this.emitStatus("thinking","Codex 已恢复执行","无进展控制工具循环已结束","aca.performance.control_tool_loop_recovered"))}else if(!a&&r==="aca_codex_control_tool_steer"){const i=me(t?.update);i&&this.turnDiagnosticsTracker?.recordControlToolSteering(i)}else if(ae(t?.update))this.recordMeaningfulProgress();else if(!a&&r==="aca_codex_raw_response_usage"){const i=ee(e);i&&this.turnDiagnosticsTracker?.recordUsage(i);const c=i?this.usageLoopDetector?.recordUsage(i):null;c&&this.usagePatternReport?.(c)}else if(!a&&r==="usage_update"){const i=oe(e);i&&this.turnDiagnosticsTracker?.recordUsage(i);const c=i?this.usageLoopDetector?.recordUsage(i):null;c&&this.usagePatternReport?.(c)}this.updates.push({method:"session/update",params:e});const n=Y(e);n&&(n.type==="agent_message_chunk"&&!a&&(this.content+=n.text??""),this.updateCallback?.(n));const o=G(e);o&&this.emitStatus(o.phase,o.label,o.detail,o.updateType)}recordMeaningfulProgress(){this.performanceTracker?.recordEvent();const e=this.usageLoopDetector?.recordMeaningfulEvent();this.usageLoopWarningActive&&(this.usageLoopWarningActive=!1,e&&this.turnDiagnosticsTracker?.recordRecovery(),this.emitStatus("thinking","Codex 已恢复执行","已重新执行工具或产生有效输出","aca.performance.loop_recovered"))}startSlowStatusTimer(){const e=q().slowEventThresholdMs,t=setInterval(()=>{const r=this.performanceTracker,a=Date.now();if(!r?.shouldReportSlow(a,e))return;const n=r.snapshot(a),o=Math.max(1,Math.round(n.silentForMs/6e4)),i=this.usageLoopWarningActive||this.controlToolLoopWarningActive?"Codex 可能卡在内部循环":"Codex 长时间没有有效进展";this.emitStatus("thinking",i,`已 ${o} 分钟没有执行工具或产生有效输出`,"aca.performance.slow")},Math.min(3e4,Math.max(1e3,Math.floor(e/4))));return t.unref(),t}attachAbortSignal(e){if(e){if(this.abortHandler=()=>{this.cancel().catch(()=>{})},e.aborted)throw new Error("Codex ACP prompt cancelled");e.addEventListener("abort",this.abortHandler,{once:!0})}}async promptWithAbort(e,t){return L({signal:t.signal,cancelledMessage:"Codex ACP prompt cancelled",startRequest:()=>e.prompt({sessionId:t.sessionId,prompt:t.prompt},t.timeoutMs),onAbort:async()=>{await this.lease?.dispose()}})}async compactWithAbort(e,t){return L({signal:t.signal,cancelledMessage:"Codex ACP 上下文压缩已取消",startRequest:()=>e.compactSession({sessionId:t.sessionId,allowRollover:t.allowRollover,timeoutMs:t.timeoutMs},t.timeoutMs),onAbort:async()=>{await this.lease?.dispose()}})}async requestPermission(e){if(!this.permissionCallback)return{outcome:{outcome:"cancelled"}};const t=e&&typeof e=="object"&&!Array.isArray(e)?e:{},r=t.request&&typeof t.request=="object"&&!Array.isArray(t.request)?t.request:t,n=(Array.isArray(r.options)?r.options:[]).map((o,i)=>{const c=o&&typeof o=="object"&&!Array.isArray(o)?o:{};return{optionId:String(c.optionId??c.id??i),kind:String(c.kind??"choice"),...typeof c.label=="string"?{label:c.label}:{}}});return this.emitStatus("requestPermission","等待授权",he(r),"session/request_permission"),this.permissionCallback({requestId:String(r.requestId??r.id??`codex-acp-permission-${Date.now()}`),params:e,options:n})}async requestUserInput(e){if(!this.userInputCallback)return{outcome:{outcome:"cancelled"}};const t=e&&typeof e=="object"&&!Array.isArray(e)?e:{},r=t.request&&typeof t.request=="object"&&!Array.isArray(t.request)?t.request:t;return this.emitStatus("requestPermission","等待输入",fe(r),"elicitation/create"),this.userInputCallback({requestId:String(r.requestId??r.id??`codex-acp-input-${Date.now()}`),prompt:String(r.prompt??r.message??r.question??""),params:e,...typeof r.defaultValue=="string"?{defaultValue:r.defaultValue}:{}})}emitStatus(e,t,r,a){const n={phase:e,label:t,...r?{detail:r}:{},...a?{updateType:a}:{},atMs:Date.now()},o=this.statusTimeline[this.statusTimeline.length-1];o&&o.phase===n.phase&&o.label===n.label&&o.detail===n.detail&&o.updateType===n.updateType||(this.statusTimeline.push(n),this.statusCallback?.(n))}releaseLease(){this.lease?.release(),this.lease=null}}function de(s,e){const t=s;return t.controlLoopMigratedProviderSessionId=e,t}function ue(s){if(!s||typeof s!="object"||Array.isArray(s))return null;const e=s.controlLoopMigratedProviderSessionId;return typeof e=="string"&&e.trim()?e.trim():null}async function W(s,e){s.runtimeConfigured||(await s.client.configureRuntime({codexProvider:e?{baseUrl:e.baseUrl,apiKey:e.apiKey,revision:e.revision}:null}),s.markRuntimeConfigured())}function N(s){return s?{OPENAI_API_KEY:s.apiKey,OPENAI_BASE_URL:s.baseUrl}:{}}function pe(s,e){if(e?.aborted)return!0;const t=s instanceof Error?s.message:String(s||"");return/compact.*timed out|request timed out.*compact|adapter closed|aborted|cancelled/i.test(t)}function b(s){if(!s||typeof s!="object"||Array.isArray(s))return null;const e=s.sessionId;return typeof e=="string"&&e.trim()?e.trim():null}function h(s){return s&&typeof s=="object"&&!Array.isArray(s)?s:null}function me(s){const e=h(s),t=h(e?._meta),r=h(t?.aca),a=h(r?.controlToolSteering);if(!a)return null;const n=Number(a.attempt),o=Number(a.maxAttempts);if(!Number.isInteger(n)||n<=0||!Number.isInteger(o)||o<=0)return null;const i=Number(a.steeredAtMs),c=Number(a.failedAtMs);return{segmentId:Math.max(0,Math.floor(Number(a.segmentId)||0)),attempt:n,maxAttempts:o,succeeded:Number.isFinite(i)&&i>0,observedAtMs:Number.isFinite(i)&&i>0?i:Number.isFinite(c)&&c>0?c:Date.now()}}function R(s){const e=String(s||"").trim();return e?e==="read-only"?"read-only":["agent-full-access","full-access","bypassPermissions","danger-full-access"].includes(e)?"danger-full-access":"workspace-write":null}function M(s){const e=String(s||"").trim();return e?["agent-full-access","full-access","bypassPermissions","danger-full-access"].includes(e)?"never":e==="acceptEdits"||e==="accept-edits"?"on-failure":"on-request":null}function F(s){return{...s.model?{model:s.model}:{},...M(s.mode)?{approvalPolicy:M(s.mode)}:{},...R(s.mode)?{sandbox:R(s.mode)}:{},...s.configOptionValues??{}}}function he(s){const e=s.params&&typeof s.params=="object"&&!Array.isArray(s.params)?s.params:s;for(const t of["command","cwd","reason","grantRoot","method"]){const r=e[t];if(typeof r=="string"&&r.trim())return j(r)}}function fe(s){for(const e of["prompt","message","question","title"]){const t=s[e];if(typeof t=="string"&&t.trim())return j(t)}}function j(s){const e=s.replace(/\s+/g," ").trim();return e.length>120?`${e.slice(0,117)}...`:e}function ge(){const s=Number.parseInt(process.env.ACA_CODEX_ACP_PROMPT_TIMEOUT_MS??process.env.ACA_ACP_PROMPT_TIMEOUT_MS??"",10);return Number.isInteger(s)&&s>=3e4?s:360*60*1e3}function we(s){const e=Number.isInteger(s)?Number(s):Number.parseInt(process.env.ACA_CODEX_ACP_COMPACT_TIMEOUT_MS??"",10);return Number.isFinite(e)&&e>=3e4?Math.min(e,6e5):12e4}function z(s){if(!s||typeof s!="object"||Array.isArray(s))return null;const e=s;return typeof e.sessionId=="string"&&e.sessionId.trim()?e.sessionId:null}function Se(s){const e=h(s),t=h(e?._meta);return H(t?.acaContextUsage)}function H(s){const e=h(s);if(!e)return null;const t=A(e.contextWindow),r=A(e.usedTokens),a=A(e.inputTokens),n=String(e.state||"unknown"),o=["active","compacted","new_thread"].includes(n)?n:"unknown";return{usedTokens:r,inputTokens:a,contextWindow:t,ratio:t>0?Math.max(0,A(e.ratio)||r/t):0,observedAtMs:A(e.observedAtMs)||Date.now(),state:o,maintenanceAction:typeof e.maintenanceAction=="string"?e.maintenanceAction:null}}function A(s){return typeof s=="number"&&Number.isFinite(s)&&s>=0?s:0}export{Ee as CodexAcpProvider,ce as codexAcpCapabilities};
|
|
1
|
+
import _ from"node:fs";import{runAbortableRequest as L}from"../../client/abortable-request.js";import{BoundedItemBuffer as B}from"../../client/bounded-buffer.js";import{promptBlocksToAcpContent as K}from"../../client/acp-content.js";import{acpSessionUpdateFromParams as X,eventFromAcpSessionUpdate as Y,statusFromAcpSessionUpdate as G,subtaskContextFromAcpSessionUpdate as J}from"../../client/acp-events.js";import{defaultAcpRuntimePool as E}from"../../client/acp-runtime-pool.js";import{resolveCodexAcpLaunch as D}from"./launch.js";import{cancelCodexRuntime as Q}from"./cancellation.js";import{CodexPromptPerformanceTracker as Z,CodexUsageLoopDetector as U,codexRawResponseUsageFromAcpSessionUpdate as ee,codexTokenUsageFromAcpSessionUpdate as oe,readCodexContextMaintenancePolicy as q}from"./context-maintenance.js";import{ensureCodexProviderRuntimeConfig as $}from"../../../core/codex-provider-runtime-config.js";import{codexControlToolLoopFromAcpSessionUpdate as te,controlToolLoopDetectionThresholds as se,controlToolLoopReady as re,readCodexControlToolLoopPolicy as ne}from"./control-tool-loop.js";import{attachCodexDiagnostics as ie,CodexTurnDiagnosticsTracker as ae}from"./turn-diagnostics.js";import{AcpSessionInvalidatedError as O}from"../../session-errors.js";import{codexAcpUpdateIsMeaningfulProgress as ce}from"./progress-evidence.js";const le={sessionResume:!0,imageInput:!0,fileAttachment:!0,filesystem:!0,terminal:!0,permissionRequest:!0,configOptions:!0,usage:!0,contextUsage:!0,contextCompaction:!0,plan:!0,diff:!0};class De{id="codex-acp";name="Codex ACP";capabilities=le;async createSession(e){return new de(e.cwd,e.providerSessionId??null,e.timeoutMs)}async forkSession(e){if(!_.existsSync(e.cwd)||!_.statSync(e.cwd).isDirectory())throw new Error(`Project root does not exist or is not a directory: ${e.cwd}`);const t=e.sourceProviderSessionId.trim(),r=await $(),a=await E.acquire({providerId:"codex-acp",cwd:e.cwd,providerSessionId:t,runtimeIdentity:r?.runtimeIdentity||"default",env:N(r),...D(),onSessionUpdate:()=>{}});try{await W(a,r),a.initialized||(await a.client.initialize(6e4),a.markInitialized()),e.onStatus?.({phase:"forking",label:"正在分叉 Codex 会话",detail:t,updateType:"session/fork",atMs:Date.now()});const n=await a.client.forkSession({sessionId:t,cwd:e.cwd,config:F(e)},e.timeoutMs??12e4),o=b(n);if(!o)throw new Error("Codex ACP session/fork did not return sessionId");return{providerSessionId:o}}finally{a.release()}}}class de{cwd;providerSessionId;defaultTimeoutMs;lease=null;sessionResponse=null;statusCallback=null;updateCallback=null;permissionCallback=null;userInputCallback=null;abortHandler=null;statusTimeline=[];updates=new B(16);content="";performanceTracker=null;usageLoopDetector=null;usagePatternReport=null;controlToolPatternReport=null;turnDiagnosticsTracker=null;usageLoopWarningActive=!1;controlToolLoopWarningActive=!1;controlToolLoopInterrupting=!1;cancellation=null;constructor(e,t,r=we()){this.cwd=e,this.providerSessionId=t,this.defaultTimeoutMs=r}async sendPrompt(e){if(!_.existsSync(e.cwd)||!_.statSync(e.cwd).isDirectory())throw new Error(`Project root does not exist or is not a directory: ${e.cwd}`);const t=Date.now();this.statusCallback=e.onStatus??null,this.updateCallback=e.onUpdate??null,this.permissionCallback=e.onPermissionRequest??null,this.userInputCallback=e.onUserInputRequest??null,this.attachAbortSignal(e.signal),this.content="",this.updates.clear(),this.statusTimeline.length=0;const r=q(),a=ne();this.performanceTracker=new Z(t),this.usageLoopDetector=new U(r);const n=new ae;this.turnDiagnosticsTracker=n,this.usageLoopWarningActive=!1,this.controlToolLoopWarningActive=!1,this.controlToolLoopInterrupting=!1;let o={error:null,stopping:null,detection:null,controlDetection:null,interruption:null,kind:null},i=null,c=null,w=this.providerSessionId,x,k=null;try{this.emitStatus("initializing","Codex ACP 启动中","codex-acp");const m=await this.acquireRuntime(e.cwd);this.lease=m,i=m.client,c=m.started,await this.initialize(m),w=await this.establishSession(m,e),await this.applyConfig(i,w,e);const S=i,V=K(e.prompt,e.promptBlocks);let T=!1;for(this.emitStatus("thinking","思考中"),k=this.startSlowStatusTimer();;){const f=w;o={error:null,stopping:null,detection:null,controlDetection:null,interruption:null,kind:null},this.usageLoopDetector=new U(r),this.usageLoopWarningActive=!1,this.controlToolLoopWarningActive=!1,this.controlToolLoopInterrupting=!1,this.usagePatternReport=u=>{if(o.error)return;const v=Math.round(u.maxInputTokens/1e3),g=`同一 Turn 已连续请求至少 ${u.sampleCount} 次，单次输入约 ${v}k tokens`;if(n.recordUsageLoop(u.sampleCount,u.detectedAtMs,g),u.sampleCount<r.usageLoopInterruptSamples){this.usageLoopWarningActive=!0,this.emitStatus("thinking","Codex 出现低产出内部循环",g,"aca.performance.low_output_loop");return}const C=`Codex 低产出内部循环：同一 Turn 已连续请求至少 ${u.sampleCount} 次，单次输入约 ${v}k tokens，且未观察到有效进展`;o.error=new Error(C),o.detection=u,o.kind="low_output_loop",this.emitStatus("thinking","正在中断 Codex 低产出内部循环",g,"aca.performance.low_output_loop_interrupting"),o.stopping=this.stopRuntime(m,f).then(l=>{if(o.interruption=l,n.recordInterrupt({acknowledged:!l.forced,forcedRuntimeClose:l.forced,reason:l.reason}),l.forced){const d=l.reason||"取消请求失败";o.error=new Error(`${C}；取消请求失败：${d}；已关闭运行实例`)}}).catch(l=>{const d=l instanceof Error?l.message:String(l);n.recordInterrupt({acknowledged:!1,forcedRuntimeClose:!1,reason:d}),o.error=new Error(`${C}；${d}`),this.emitStatus("failed","Codex 循环中断失败",d,"aca.performance.low_output_loop_interrupt_failed")})},this.controlToolPatternReport=u=>{if(o.error||!re(u,a))return;const v=se(u,a);if(u.sampleCount<v.warningCalls)return;const g=u.kind==="list_agents_no_live"?"list_agents 查询不到运行中的子任务":u.kind==="wait_agent_no_live"?"无运行子任务时调用 wait_agent":u.kind==="send_message_no_progress"?"send_message 投递未产生进展":u.kind==="delegation_no_progress"?"重复创建或重启子任务且未产生进展":u.kind==="mixed_control_no_progress"?"混合控制工具且未产生进展":"短时 sleep",C=Math.max(1,Math.round(u.elapsedMs/6e4)),l=`同一 Turn 已连续 ${u.sampleCount} 次执行 ${g}，持续约 ${C} 分钟`;if(n.recordControlLoop(u,l),u.sampleCount<v.interruptCalls){this.controlToolLoopWarningActive=!0,this.emitStatus("thinking","Codex 出现无进展控制工具循环",l,"aca.performance.control_tool_loop");return}const d=`Codex 无进展控制工具循环：${l}`;o.error=new Error(d),o.controlDetection=u,o.kind="control_tool_loop",this.controlToolLoopInterrupting=!0,this.emitStatus("thinking","正在中断 Codex 无进展控制工具循环",l,"aca.performance.control_tool_loop_interrupting"),o.stopping=this.stopRuntime(m,f).then(p=>{o.interruption=p,n.recordInterrupt({acknowledged:!p.forced,forcedRuntimeClose:p.forced,reason:p.reason});const I=p.forced?`${l}；取消请求失败：${p.reason}；已关闭运行实例`:l;p.forced&&(o.error=new Error(`${d}；取消请求失败：${p.reason}；已关闭运行实例`)),this.emitStatus("failed","Codex 已中断无进展控制工具循环",I,"aca.performance.control_tool_loop_interrupted")}).catch(p=>{const I=p instanceof Error?p.message:String(p);n.recordInterrupt({acknowledged:!1,forcedRuntimeClose:!1,reason:I}),o.error=new Error(`${d}；${I}`),this.emitStatus("failed","Codex 控制工具循环中断失败",I,"aca.performance.control_tool_loop_interrupt_failed")})};let P;try{x=await this.promptWithAbort(S,{sessionId:f,prompt:V,timeoutMs:e.timeoutMs??this.defaultTimeoutMs,signal:e.signal})}catch(u){P=u}if(await o.stopping,o.error){const u=o.detection;if(o.kind==="low_output_loop"&&u?.source==="thread_usage"&&!T&&o.interruption?.forced===!1&&!e.signal?.aborted){T=!0,this.emitStatus("resuming","正在迁移异常 Codex 会话","保留本轮进度并创建干净线程","aca.performance.low_output_loop_recovering");try{const l=await S.recoverSession({sessionId:f,reason:"low_output_loop"}),d=b(l);if(!d||d===f)throw new Error("Codex recovery did not create a new session");w=d,this.providerSessionId=d,this.sessionResponse=h(l),m.setProviderSession({providerSessionId:d,sessionResponse:this.sessionResponse});const p={previousProviderSessionId:f,providerSessionId:d,reason:"low_output_loop",migratedAtMs:Date.now()};n.recordMigration(p),await e.onProviderSessionMigration?.(p),n.recordRecovery(p.migratedAtMs),this.content="",this.emitStatus("thinking","Codex 会话已迁移，继续执行",d,"aca.performance.low_output_loop_recovered_session");continue}catch(l){const d=l instanceof Error?l.message:String(l);o.error=new Error(`${o.error.message}；自动迁移失败：${d}`)}}if(o.kind==="low_output_loop")throw this.emitStatus("failed","Codex 已中断低产出内部循环",o.error.message,"aca.performance.low_output_loop_interrupted"),new O(o.error.message,f,{source:u?.source??null,sampleCount:u?.sampleCount??null,recoveryAttempted:T});const g=o.controlDetection;if(o.interruption?.forced===!1&&!e.signal?.aborted){this.emitStatus("resuming","正在迁移异常 Codex 会话","保留本轮证据并为后续任务创建干净线程","aca.performance.control_tool_loop_migrating");try{const l=await S.recoverSession({sessionId:f,reason:"control_tool_loop"}),d=b(l);if(!d||d===f)throw new Error("Codex recovery did not create a new session");w=d,this.providerSessionId=d,this.sessionResponse=h(l),m.setProviderSession({providerSessionId:d,sessionResponse:this.sessionResponse});const p={previousProviderSessionId:f,providerSessionId:d,reason:"control_tool_loop",migratedAtMs:Date.now()};throw n.recordMigration(p),await e.onProviderSessionMigration?.(p),this.emitStatus("failed","Codex 循环已中断，会话已自动迁移",d,"aca.performance.control_tool_loop_migrated_session"),ue(o.error,d)}catch(l){if(pe(l))throw l;const d=l instanceof Error?l.message:String(l);o.error=new Error(`${o.error.message}；自动迁移失败：${d}`)}}throw new O(o.error.message,f,{source:"control_tool_loop",kind:g?.kind??null,sampleCount:g?.sampleCount??null,segmentId:g?.segmentId??null})}if(P)throw P;const y=z(x);y&&y!==w&&(w=y,this.providerSessionId=y,m.setProviderSession({providerSessionId:y,sessionResponse:this.sessionResponse}));break}}catch(m){if(m instanceof Error){const S=ie(m,n.snapshot());throw S.statusTimeline=[...this.statusTimeline],S.performance=this.performanceTracker?.snapshot(),S}throw m}finally{await o.stopping,await this.cancellation?.catch(()=>{}),k&&clearInterval(k),this.usagePatternReport=null,this.controlToolPatternReport=null,this.turnDiagnosticsTracker=null,this.usageLoopDetector=null,this.usageLoopWarningActive=!1,this.controlToolLoopWarningActive=!1,this.controlToolLoopInterrupting=!1,this.abortHandler&&e.signal&&(e.signal.removeEventListener("abort",this.abortHandler),this.abortHandler=null),this.releaseLease()}return this.emitStatus("completed","已完成"),{providerSessionId:w,cliType:"builtin",agentType:"codex",effectiveConfig:{model:e.model??null,mode:e.mode??null,configOptionValues:e.configOptionValues??null,command:c.command,processPid:c.child.pid??null,provider:"codex-acp",protocol:"acp"},command:c.command,args:c.args,cwd:e.cwd,exitCode:c.child.exitCode,signal:c.child.signalCode,durationMs:Date.now()-t,stdout:i.rpc.stdout,stderr:i.rpc.stderr,content:this.content.trim(),updateCount:this.updates.count(),updates:this.updates.snapshot(),statusTimeline:[...this.statusTimeline],performance:this.performanceTracker?.snapshot(),contextUsage:ve(x),providerDiagnostics:n.snapshot(),promptResponse:x}}async compactContext(e){if(!_.existsSync(e.cwd)||!_.statSync(e.cwd).isDirectory())throw new Error(`Project root does not exist or is not a directory: ${e.cwd}`);const t=Date.now();this.statusCallback=e.onStatus??null,this.updateCallback=e.onUpdate??null,this.attachAbortSignal(e.signal);let r=this.providerSessionId,a;try{this.emitStatus("initializing","Codex ACP 启动中","codex-acp");const o=await this.acquireRuntime(e.cwd);this.lease=o,await this.initialize(o),r=await this.establishSession(o,e),await this.applyConfig(o.client,r,e);const i=Se(e.timeoutMs);a=await this.compactWithAbort(o.client,{sessionId:r,allowRollover:e.allowRollover===!0,timeoutMs:i,signal:e.signal});const c=z(a);c&&c!==r&&(r=c,this.providerSessionId=c,o.setProviderSession({providerSessionId:c,sessionResponse:this.sessionResponse}))}catch(o){if(this.lease&&me(o,e.signal)){const i=this.lease;this.lease=null,await i.dispose().catch(()=>{})}throw this.emitStatus("failed","上下文压缩失败",o instanceof Error?o.message:String(o)),o}finally{this.abortHandler&&e.signal&&(e.signal.removeEventListener("abort",this.abortHandler),this.abortHandler=null),this.releaseLease()}const n=h(a)??{};return{providerSessionId:r||this.providerSessionId||"",contextUsage:H(n.contextUsage),maintenance:h(n.maintenance)??{},durationMs:Date.now()-t}}async cancel(){this.providerSessionId&&this.lease&&await this.stopRuntime(this.lease,this.providerSessionId)}stopRuntime(e,t){if(this.cancellation)return this.cancellation;const r=Q(e,t);return this.cancellation=r,r.finally(()=>{this.cancellation===r&&(this.cancellation=null)}).catch(()=>{}),r}async close(){await this.cancellation?.catch(()=>{}),this.statusCallback=null,this.updateCallback=null,this.permissionCallback=null,this.userInputCallback=null,this.abortHandler&&(this.abortHandler=null),this.releaseLease()}async acquireRuntime(e){const t=D(),r=await $(),a=await E.acquire({providerId:"codex-acp",cwd:e,providerSessionId:this.providerSessionId,runtimeIdentity:r?.runtimeIdentity||"default",env:N(r),command:t.command,args:t.args,onSessionUpdate:n=>this.handleSessionUpdate(n),onClientRequest:async(n,o)=>{if(n==="session/request_permission")return this.requestPermission(o);if(n==="elicitation/create"||n==="session/request_user_input")return this.requestUserInput(o);throw new Error(`Unsupported Codex ACP client request: ${n}`)}});try{return await W(a,r),a}catch(n){throw await a.dispose().catch(()=>{}),n}}async initialize(e){e.initialized||(await e.client.initialize(6e4),e.markInitialized())}async establishSession(e,t){const r=e.client,a=F(t);if(e.providerSessionId&&e.sessionEstablished)return this.providerSessionId=e.providerSessionId,this.sessionResponse=e.sessionResponse,e.providerSessionId;if(this.providerSessionId)try{this.emitStatus("resuming","Codex ACP 会话恢复中","session/load");const i=await r.loadSession({sessionId:this.providerSessionId,cwd:t.cwd,config:a},6e4);this.sessionResponse=h(i);const c=b(i)||this.providerSessionId;return this.providerSessionId=c,e.setProviderSession({providerSessionId:c,sessionResponse:this.sessionResponse}),c}catch(i){if(t.requireSessionResume){const c=i instanceof Error?i.message:String(i);throw new Error(`无法恢复导入的 Codex ACP Session ${this.providerSessionId}：${c}`)}this.providerSessionId=null}this.emitStatus("acp","Codex ACP 会话创建中","session/new");const n=await r.newSession({cwd:t.cwd,config:a},12e4);this.sessionResponse=h(n);const o=b(n);if(!o)throw new Error("Codex ACP session/new did not return sessionId");return this.providerSessionId=o,e.setProviderSession({providerSessionId:o,sessionResponse:this.sessionResponse}),o}async applyConfig(e,t,r){r.model&&await e.setSessionConfigOption({sessionId:t,configId:"model",value:r.model},6e4).catch(()=>{});const a=M(r.mode);a&&await e.setSessionConfigOption({sessionId:t,configId:"approvalPolicy",value:a},6e4).catch(()=>{});const n=R(r.mode);n&&await e.setSessionConfigOption({sessionId:t,configId:"sandbox",value:n},6e4).catch(()=>{});for(const[o,i]of Object.entries(r.configOptionValues??{}))["model","mode","sandbox","approvalPolicy"].includes(o)||await e.setSessionConfigOption({sessionId:t,configId:o,value:i},6e4).catch(()=>{})}handleSessionUpdate(e){const t=X(e),r=String(t?.update.sessionUpdate||""),a=J(e);if(!a&&r==="aca_codex_subtask_drain"){const i=String(t?.update.label||"子任务收尾等待超时"),c=String(t?.update.detail||"仍有子任务未结束");this.emitStatus("exploring",i,c,r)}else if(!a&&r==="aca_codex_control_tool_loop"){const i=te(e);i?.state==="observed"&&this.controlToolPatternReport?.(i.detection),i?.state==="recovered"&&this.controlToolLoopWarningActive&&!this.controlToolLoopInterrupting&&(this.controlToolLoopWarningActive=!1,this.turnDiagnosticsTracker?.recordRecovery(),this.emitStatus("thinking","Codex 已恢复执行","无进展控制工具循环已结束","aca.performance.control_tool_loop_recovered"))}else if(!a&&r==="aca_codex_control_tool_steer"){const i=he(t?.update);i&&this.turnDiagnosticsTracker?.recordControlToolSteering(i)}else if(ce(t?.update))this.recordMeaningfulProgress();else if(!a&&r==="aca_codex_raw_response_usage"){const i=ee(e);i&&this.turnDiagnosticsTracker?.recordUsage(i);const c=i?this.usageLoopDetector?.recordUsage(i):null;c&&this.usagePatternReport?.(c)}else if(!a&&r==="usage_update"){const i=oe(e);i&&this.turnDiagnosticsTracker?.recordUsage(i);const c=i?this.usageLoopDetector?.recordUsage(i):null;c&&this.usagePatternReport?.(c)}this.updates.push({method:"session/update",params:e});const n=Y(e);n&&(n.type==="agent_message_chunk"&&!a&&(this.content+=n.text??""),this.updateCallback?.(n));const o=G(e);o&&this.emitStatus(o.phase,o.label,o.detail,o.updateType)}recordMeaningfulProgress(){this.performanceTracker?.recordEvent();const e=this.usageLoopDetector?.recordMeaningfulEvent();this.usageLoopWarningActive&&(this.usageLoopWarningActive=!1,e&&this.turnDiagnosticsTracker?.recordRecovery(),this.emitStatus("thinking","Codex 已恢复执行","已重新执行工具或产生有效输出","aca.performance.loop_recovered"))}startSlowStatusTimer(){const e=q().slowEventThresholdMs,t=setInterval(()=>{const r=this.performanceTracker,a=Date.now();if(!r?.shouldReportSlow(a,e))return;const n=r.snapshot(a),o=Math.max(1,Math.round(n.silentForMs/6e4)),i=this.usageLoopWarningActive||this.controlToolLoopWarningActive?"Codex 可能卡在内部循环":"Codex 长时间没有有效进展";this.emitStatus("thinking",i,`已 ${o} 分钟没有执行工具或产生有效输出`,"aca.performance.slow")},Math.min(3e4,Math.max(1e3,Math.floor(e/4))));return t.unref(),t}attachAbortSignal(e){if(e){if(this.abortHandler=()=>{this.cancel().catch(()=>{})},e.aborted)throw new Error("Codex ACP prompt cancelled");e.addEventListener("abort",this.abortHandler,{once:!0})}}async promptWithAbort(e,t){return L({signal:t.signal,cancelledMessage:"Codex ACP prompt cancelled",startRequest:()=>e.prompt({sessionId:t.sessionId,prompt:t.prompt},t.timeoutMs),onAbort:async()=>{await this.lease?.dispose()}})}async compactWithAbort(e,t){return L({signal:t.signal,cancelledMessage:"Codex ACP 上下文压缩已取消",startRequest:()=>e.compactSession({sessionId:t.sessionId,allowRollover:t.allowRollover,timeoutMs:t.timeoutMs},t.timeoutMs),onAbort:async()=>{await this.lease?.dispose()}})}async requestPermission(e){if(!this.permissionCallback)return{outcome:{outcome:"cancelled"}};const t=e&&typeof e=="object"&&!Array.isArray(e)?e:{},r=t.request&&typeof t.request=="object"&&!Array.isArray(t.request)?t.request:t,n=(Array.isArray(r.options)?r.options:[]).map((o,i)=>{const c=o&&typeof o=="object"&&!Array.isArray(o)?o:{};return{optionId:String(c.optionId??c.id??i),kind:String(c.kind??"choice"),...typeof c.label=="string"?{label:c.label}:{}}});return this.emitStatus("requestPermission","等待授权",fe(r),"session/request_permission"),this.permissionCallback({requestId:String(r.requestId??r.id??`codex-acp-permission-${Date.now()}`),params:e,options:n})}async requestUserInput(e){if(!this.userInputCallback)return{outcome:{outcome:"cancelled"}};const t=e&&typeof e=="object"&&!Array.isArray(e)?e:{},r=t.request&&typeof t.request=="object"&&!Array.isArray(t.request)?t.request:t;return this.emitStatus("requestPermission","等待输入",ge(r),"elicitation/create"),this.userInputCallback({requestId:String(r.requestId??r.id??`codex-acp-input-${Date.now()}`),prompt:String(r.prompt??r.message??r.question??""),params:e,...typeof r.defaultValue=="string"?{defaultValue:r.defaultValue}:{}})}emitStatus(e,t,r,a){const n={phase:e,label:t,...r?{detail:r}:{},...a?{updateType:a}:{},atMs:Date.now()},o=this.statusTimeline[this.statusTimeline.length-1];o&&o.phase===n.phase&&o.label===n.label&&o.detail===n.detail&&o.updateType===n.updateType||(this.statusTimeline.push(n),this.statusCallback?.(n))}releaseLease(){this.lease?.release(),this.lease=null}}function ue(s,e){const t=s;return t.controlLoopMigratedProviderSessionId=e,t}function pe(s){if(!s||typeof s!="object"||Array.isArray(s))return null;const e=s.controlLoopMigratedProviderSessionId;return typeof e=="string"&&e.trim()?e.trim():null}async function W(s,e){s.runtimeConfigured||(await s.client.configureRuntime({codexProvider:e?{baseUrl:e.baseUrl,apiKey:e.apiKey,revision:e.revision}:null}),s.markRuntimeConfigured())}function N(s){return s?{OPENAI_API_KEY:s.apiKey,OPENAI_BASE_URL:s.baseUrl}:{}}function me(s,e){if(e?.aborted)return!0;const t=s instanceof Error?s.message:String(s||"");return/compact.*timed out|request timed out.*compact|adapter closed|aborted|cancelled/i.test(t)}function b(s){if(!s||typeof s!="object"||Array.isArray(s))return null;const e=s.sessionId;return typeof e=="string"&&e.trim()?e.trim():null}function h(s){return s&&typeof s=="object"&&!Array.isArray(s)?s:null}function he(s){const e=h(s),t=h(e?._meta),r=h(t?.aca),a=h(r?.controlToolSteering);if(!a)return null;const n=Number(a.attempt),o=Number(a.maxAttempts);if(!Number.isInteger(n)||n<=0||!Number.isInteger(o)||o<=0)return null;const i=Number(a.steeredAtMs),c=Number(a.failedAtMs);return{segmentId:Math.max(0,Math.floor(Number(a.segmentId)||0)),attempt:n,maxAttempts:o,succeeded:Number.isFinite(i)&&i>0,observedAtMs:Number.isFinite(i)&&i>0?i:Number.isFinite(c)&&c>0?c:Date.now()}}function R(s){const e=String(s||"").trim();return e?e==="read-only"?"read-only":["agent-full-access","full-access","bypassPermissions","danger-full-access"].includes(e)?"danger-full-access":"workspace-write":null}function M(s){const e=String(s||"").trim();return e?["agent-full-access","full-access","bypassPermissions","danger-full-access"].includes(e)?"never":e==="acceptEdits"||e==="accept-edits"?"on-failure":"on-request":null}function F(s){return{...s.model?{model:s.model}:{},...M(s.mode)?{approvalPolicy:M(s.mode)}:{},...R(s.mode)?{sandbox:R(s.mode)}:{},...s.configOptionValues??{}}}function fe(s){const e=s.params&&typeof s.params=="object"&&!Array.isArray(s.params)?s.params:s;for(const t of["command","cwd","reason","grantRoot","method"]){const r=e[t];if(typeof r=="string"&&r.trim())return j(r)}}function ge(s){for(const e of["prompt","message","question","title"]){const t=s[e];if(typeof t=="string"&&t.trim())return j(t)}}function j(s){const e=s.replace(/\s+/g," ").trim();return e.length>120?`${e.slice(0,117)}...`:e}function we(){const s=Number.parseInt(process.env.ACA_CODEX_ACP_PROMPT_TIMEOUT_MS??process.env.ACA_ACP_PROMPT_TIMEOUT_MS??"",10);return Number.isInteger(s)&&s>=3e4?s:360*60*1e3}function Se(s){const e=Number.isInteger(s)?Number(s):Number.parseInt(process.env.ACA_CODEX_ACP_COMPACT_TIMEOUT_MS??"",10);return Number.isFinite(e)&&e>=3e4?Math.min(e,6e5):12e4}function z(s){if(!s||typeof s!="object"||Array.isArray(s))return null;const e=s;return typeof e.sessionId=="string"&&e.sessionId.trim()?e.sessionId:null}function ve(s){const e=h(s),t=h(e?._meta);return H(t?.acaContextUsage)}function H(s){const e=h(s);if(!e)return null;const t=A(e.contextWindow),r=A(e.usedTokens),a=A(e.inputTokens),n=String(e.state||"unknown"),o=["active","compacted","new_thread"].includes(n)?n:"unknown";return{usedTokens:r,inputTokens:a,contextWindow:t,ratio:t>0?Math.max(0,A(e.ratio)||r/t):0,observedAtMs:A(e.observedAtMs)||Date.now(),state:o,maintenanceAction:typeof e.maintenanceAction=="string"?e.maintenanceAction:null}}function A(s){return typeof s=="number"&&Number.isFinite(s)&&s>=0?s:0}export{De as CodexAcpProvider,le as codexAcpCapabilities};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
import{randomUUID as g}from"node:crypto";class T{runs=new Map;starts=new Set;closedTurns=new Map;pending=new Map;reset(){this.runs.clear(),this.starts.clear(),this.closedTurns.clear(),this.pending.clear()}get(s){return this.runs.get(s)?.snapshot}hasStart(s,n){return this.starts.has(`${s}:${n}`)}activeThreadIds(){return[...this.runs].filter(([,s])=>c(s.snapshot.state)).map(([s])=>s)}start(s,n,t,o={}){const u=`${s.sourceThreadId}:${n}`;if(this.starts.has(u))return;this.starts.add(u);const a=this.runs.get(s.sourceThreadId);if(a&&c(a.snapshot.state)){this.change(a,{...o,state:a.snapshot.state==="running"?"running":t});return}const e={route:{...s},generation:(a?.generation??0)+1,snapshot:{...o,runId:g(),state:t,startedAtMs:Date.now()}};this.runs.set(s.sourceThreadId,e),this.pending.set(e.snapshot.runId,e)}observeState(s,n){let t=this.runs.get(s.sourceThreadId);if(!t)t={route:{...s},generation:1,snapshot:{runId:g(),state:"unknown"}},this.runs.set(s.sourceThreadId,t),this.pending.set(t.snapshot.runId,t);else if(i(t.snapshot.state))return;if(!(t.snapshot.state==="running"&&n==="pending")){if(t.generation>1&&i(n)){this.change(t,{state:"unknown",outputIncomplete:!0,reason:"收到无法确认执行归属的结束通知"});return}this.change(t,{state:n,...i(n)?{endedAtMs:Date.now()}:{}})}}accept(s,n,t){const o=s.sourceThreadId,u=l(t.turn),a=h(t.turnId)||h(u.id);if(a&&this.closedTurns.get(o)?.has(a))return!1;let e=this.runs.get(o);if(n==="turn/started"&&a&&(e?.snapshot.sourceTurnId&&e.snapshot.sourceTurnId!==a&&c(e.snapshot.state)&&(this.closeTurn(o,e.snapshot.sourceTurnId),this.change(e,{state:"unknown",outputIncomplete:!0,reason:"新执行开始前未收到旧执行结束事件"})),this.start(s,`turn:${a}`,"running"),e=this.runs.get(o)),e||(this.observeState(s,"unknown"),e=this.runs.get(o)),i(e.snapshot.state)||a&&e.snapshot.sourceTurnId&&a!==e.snapshot.sourceTurnId)return!1;if(e.generation>1&&!e.snapshot.sourceTurnId&&n!=="turn/started")return this.change(e,{outputIncomplete:!0,reason:"部分事件缺少新执行归属，已隔离"}),!1;if(!a&&e.generation>1&&n!=="turn/started")return this.change(e,{outputIncomplete:!0,reason:"部分事件缺少新执行归属，已隔离"}),!1;if(a&&!e.snapshot.sourceTurnId&&this.change(e,{sourceTurnId:a}),n==="turn/completed"){const d=h(u.status).toLowerCase(),p=d==="failed"?"failed":["interrupted","cancelled","canceled"].includes(d)?"interrupted":d==="completed"?"completed":"unknown";this.change(e,{state:p,...p==="unknown"?{outputIncomplete:!0,reason:"结束通知未提供可识别的执行结果"}:{endedAtMs:Date.now()}}),a&&this.closeTurn(o,a)}return!0}progress(s,n){const t=this.runs.get(s);!t||i(t.snapshot.state)||(t.snapshot={...t.snapshot,lastProgressAtMs:Date.now(),...n?{lastAction:n}:{}})}action(s,n){const t=this.runs.get(s);t&&!i(t.snapshot.state)&&(t.snapshot={...t.snapshot,lastAction:n})}loseObservation(s){for(const n of this.runs.values())c(n.snapshot.state)&&this.change(n,{state:"unknown",outputIncomplete:!0,reason:s})}drainUpdates(){const s=[...this.pending.values()].map(({route:n,snapshot:t})=>f({sessionUpdate:"tool_call_update",toolCallId:`run.${t.runId}`,kind:"other",title:"子代理执行状态",status:t.state==="failed"?"failed":t.state==="interrupted"?"cancelled":t.state==="completed"?"completed":"in_progress",_meta:{aca:{subtaskLifecycle:!0,processKind:"subtask"}}},n,t.sourceTurnId||null,t));return this.pending.clear(),s}closeTurn(s,n){const t=this.closedTurns.get(s)??new Set;t.add(n),this.closedTurns.set(s,t)}change(s,n){const t={...s.snapshot,...n};JSON.stringify(t)!==JSON.stringify(s.snapshot)&&(i(t.state)&&t.sourceTurnId&&this.closeTurn(s.route.sourceThreadId,t.sourceTurnId),s.snapshot=t,this.pending.set(t.runId,s))}}function f(r,s,n,t){const o={...r},u=t?.runId||s.sourceThreadId;["tool_call","tool_call_update"].includes(String(r.sessionUpdate))&&r.toolCallId&&(o.toolCallId=`subtask.${u}.${r.toolCallId}`),["plan","plan_update","plan_removed"].includes(String(r.sessionUpdate))&&(o.planId=`subtask.${u}.${r.planId||r.plan_id||r.id||"current"}`,delete o.plan_id);const a=l(r._meta);return o._meta={...a,aca:{...l(a.aca),subtask:{...s,sourceTurnId:n,...t?{runId:t.runId,run:{...t}}:{}}}},o}function i(r){return["completed","failed","interrupted"].includes(r)}function c(r){return r==="pending"||r==="running"}function l(r){return r&&typeof r=="object"?r:{}}function h(r){return typeof r=="string"?r:""}export{T as CodexSubtaskExecutions,f as decorateSubtaskUpdate};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
class
|
|
1
|
+
import{CodexSubtaskExecutions as A}from"./subtask-executions.js";class O{routes=new Map;executions=new A;idleWaiters=new Set;reset(){this.routes.clear(),this.executions.reset(),this.resolveIdleWaiters(!1)}routeFor(t){return t?this.routes.get(t)??null:null}routesForSubscription(){return[...this.routes.values()]}activeThreadIds(){return this.executions.activeThreadIds()}hasActiveSubtasks(){return this.activeThreadIds().length>0}waitForIdle(t){return this.activeThreadIds().length===0?Promise.resolve({timedOut:!1,activeThreadIds:[]}):new Promise(s=>{const i={resolve:s,timer:setTimeout(()=>{this.idleWaiters.delete(i),s({timedOut:!0,activeThreadIds:this.activeThreadIds()})},t)};i.timer.unref(),this.idleWaiters.add(i)})}stopWaiting(){this.resolveIdleWaiters(!1)}acceptNotification(t,e,s){const i=this.executions.accept(t,e,d(s));return this.hasActiveSubtasks()||this.resolveIdleWaiters(!1),i}restoreFromSessionSnapshot(t,e){const s=d(t),i=d(s.thread),n=a(i,"id")||e,o=d(s.initialTurnsPage),l=[...I(i,"turns"),...I(o,"data")];let u=0;for(const f of l){const h=d(f);for(const p of I(h,"items"))u+=this.observe({threadId:n,item:p},e,!0)}return u}observe(t,e,s=!1){const i=d(t),n=d(i.item);if(a(n,"type")==="subAgentActivity")return this.observeSubAgentActivity(n,a(i,"threadId"),e,s);if(!k(n))return 0;const o=a(n,"id");if(!o)return 0;const l=a(n,"senderThreadId")||a(i,"threadId"),u=this.routeFor(l||null),f=u?.parentToolCallId||o,h=Math.min(8,(u?.depth??0)+1),p=y(n),b=w(n.agentsStates);let T=0;for(const c of p){if(!c||c===e||c===l)continue;this.routes.has(c)||(this.routes.set(c,{parentToolCallId:f,sourceThreadId:c,depth:h}),T+=1);const m=b.get(c),S=this.routes.get(c);if(s){this.executions.get(c)||this.executions.observeState(S,"unknown");continue}a(n,"tool")==="spawnAgent"&&this.executions.start(S,o,"pending",{description:a(n,"prompt")||void 0}),m?this.updateStatus(c,m):a(n,"tool")==="spawnAgent"&&this.updateStatus(c,"pending")}return T}observeSubAgentActivity(t,e,s,i){const n=a(t,"kind"),o=a(t,"agentThreadId");if(!o||o===s||!i&&n==="started"&&this.executions.hasStart(o,a(t,"id")))return 0;if(n==="completed"||n==="interrupted")return i||this.updateStatus(o,n==="completed"?"completed":"interrupted"),0;if(n!=="started"&&n!=="interacted")return 0;const l=this.routeFor(e||null),u=l?.parentToolCallId||a(t,"id"),f=Math.min(8,(l?.depth??0)+1);if(!u)return 0;const h=this.routes.has(o)?0:1;if(h&&this.routes.set(o,{parentToolCallId:u,sourceThreadId:o,depth:f}),i)return this.executions.get(o)||this.executions.observeState(this.routes.get(o),"unknown"),h;if(n==="started"){const p=this.executions.get(o);p&&!["pending","running"].includes(p.state)&&this.routes.set(o,{parentToolCallId:u,sourceThreadId:o,depth:f}),this.executions.start(this.routes.get(o),a(t,"id"),"running",{name:a(t,"agentPath").split("/").filter(Boolean).at(-1)}),this.updateStatus(o,"running")}return h}updateStatus(t,e){const s=this.routes.get(t);s&&this.executions.observeState(s,e),this.hasActiveSubtasks()||this.resolveIdleWaiters(!1)}resolveIdleWaiters(t){const e=this.activeThreadIds();for(const s of this.idleWaiters)clearTimeout(s.timer),s.resolve({timedOut:t,activeThreadIds:e});this.idleWaiters.clear()}}function w(r){const t=new Map,e=d(r);for(const[s,i]of Object.entries(e)){const n=x(a(d(i),"status"));s.trim()&&n!=="unknown"&&t.set(s.trim(),n)}return t}function x(r){switch(r.toLowerCase()){case"pending":case"pendinginit":return"pending";case"running":case"inprogress":case"in_progress":return"running";case"completed":case"shutdown":return"completed";case"failed":case"errored":case"notfound":return"failed";case"cancelled":case"canceled":case"interrupted":return"interrupted";default:return"unknown"}}function y(r){const t=d(r),e=new Set;g(e,t.newThreadId),g(e,t.receiverThreadId),C(e,t.receiverThreadIds);const s=t.agentsStates;if(Array.isArray(s))for(const i of s)v(e,i);else{const i=d(s);for(const[n,o]of Object.entries(i))v(e,o),W(n)&&e.add(n)}return[...e]}function k(r){const t=a(d(r),"type");return t==="collabAgentToolCall"||t==="collabToolCall"}function v(r,t){const e=d(t);for(const s of["threadId","thread_id","receiverThreadId","newThreadId"])g(r,e[s])}function g(r,t){typeof t=="string"&&t.trim()&&r.add(t.trim())}function C(r,t){if(Array.isArray(t))for(const e of t)g(r,e)}function I(r,t){const e=r[t];return Array.isArray(e)?e:[]}function W(r){return r.length<8?!1:!["pending","running","completed","failed","cancelled","canceled"].includes(r.toLowerCase())}function d(r){return r&&typeof r=="object"&&!Array.isArray(r)?r:{}}function a(r,t){const e=r[t];return typeof e=="string"?e:""}export{O as CodexSubtaskRouter,y as collaborationChildThreadIds,k as isCollaborationItem};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
const x=1024,k=2048,y=new Set(["agent_message_chunk","agent_progress_chunk","agent_thought_chunk","user_message_chunk"]),I=new Set(["usage_update","session_info_update"]);function q(e,t){const a=e.at(-1);if(!a)return e.push(t),!1;if(C(a,t)){const n=`${a.text??""}${t.text??""}`;if(n.length<=1024)return a.text=n,a.raw=
|
|
1
|
+
const x=1024,k=2048,y=new Set(["agent_message_chunk","agent_progress_chunk","agent_thought_chunk","user_message_chunk"]),I=new Set(["usage_update","session_info_update"]);function q(e,t){const a=e.at(-1);if(!a)return e.push(t),!1;if(C(a,t)){const n=`${a.text??""}${t.text??""}`;if(n.length<=1024)return a.text=n,a.raw=f(a.raw,t.raw,n),!0}if(S(a,t))return E(a,t),!0;if(h(a,t)){const n=T(a.raw);return a.label=t.label,a.text=t.text,a.status=t.status,a.toolCallId=t.toolCallId,a.raw=f(a.raw,t.raw,t.text,n),!0}return e.push(t),!1}function S(e,t){if(e.eventType!=="tool_call_update"||t.eventType!=="tool_call_update"||!e.toolCallId||e.toolCallId!==t.toolCallId||e.turnId!==t.turnId||d(e.raw)!==d(t.raw)||e.status!=="in_progress"||t.status!=="in_progress")return!1;const a=c(e.raw),n=c(t.raw);return!a||!n||a.terminalId!==n.terminalId?!1:a.data.length+n.data.length<=2048}function E(e,t){const a=c(e.raw),n=c(t.raw);if(!a||!n)return;e.label=t.label??e.label,e.raw=f(e.raw,t.raw,void 0);const u=r(e.raw),l=r(u?.update),s=r(l?._meta);!u||!l||!s||(u.update={...l,_meta:{...s,terminal_output_delta:{...n.raw,data:a.data+n.data}}})}function c(e){const t=r(r(e)?.update),a=r(r(t?._meta)?.terminal_output_delta);if(!a)return null;const n=typeof a?.data=="string"?a.data:"",u=typeof a?.terminal_id=="string"?a.terminal_id:"";return n&&u?{data:n,terminalId:u,raw:a}:null}function C(e,t){return y.has(e.eventType)&&e.eventType===t.eventType&&e.turnId===t.turnId&&d(e.raw)===d(t.raw)&&e.label===t.label&&e.status===t.status&&!e.toolCallId&&!t.toolCallId&&typeof e.text=="string"&&typeof t.text=="string"}function h(e,t){if(e.eventType!==t.eventType||e.turnId!==t.turnId||d(e.raw)!==d(t.raw))return!1;if(I.has(e.eventType))return!0;if(e.eventType!=="config_option_update")return!1;const a=_(e.raw),n=_(t.raw);return!!a&&a===n}function d(e){const t=r(r(e)?.update),a=r(t?._meta),n=r(a?.aca),u=r(n?.subtask),l=typeof u?.parentToolCallId=="string"?u.parentToolCallId:"",s=typeof u?.sourceThreadId=="string"?u.sourceThreadId:"",o=typeof u?.runId=="string"?u.runId:"";return l||s?`subtask:${l}:${s}:${o}`:"main"}function _(e){const t=A(e);for(const a of["configId","optionId","id","key","name"])if(typeof t?.[a]=="string"&&t[a].trim())return t[a].trim();return""}function f(e,t,a,n=T(e)){const u=r(t);if(!u)return t;const l=b(t),s=w(e)+w(t),o={...u,acaSequence:n,acaSequenceEnd:l,sourceEventCount:s};if(a!==void 0){const p=r(u.update);p&&(o.update={...p,content:{type:"text",text:a}})}return o}function A(e){return r(r(e)?.update)}function T(e){const t=r(e)?.acaSequence;return typeof t=="number"?t:void 0}function b(e){const t=r(e),a=t?.acaSequenceEnd;return typeof a=="number"?a:typeof t?.acaSequence=="number"?t.acaSequence:void 0}function w(e){const t=r(e)?.sourceEventCount;return typeof t=="number"&&t>0?t:1}function r(e){return e&&typeof e=="object"&&!Array.isArray(e)?e:null}export{q as appendCoalescedAcpEvent};
|
package/dist/version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
const o="0.1.
|
|
1
|
+
const o="0.1.55";export{o as AICA_VERSION};
|