shennian 0.3.85 → 0.3.86
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/bin/shennian.js +1 -1
- package/dist/publish-build-manifest.json +28 -28
- package/dist/src/agents/adapter.js +19 -1
- package/dist/src/agents/claude-managed-permissions.js +248 -1
- package/dist/src/agents/claude.js +393 -8
- package/dist/src/agents/codex-managed-permissions.js +294 -1
- package/dist/src/agents/codex-managed-room-tools.js +249 -1
- package/dist/src/agents/codex-utils.js +200 -7
- package/dist/src/agents/codex.js +1352 -17
- package/dist/src/agents/config-status.js +226 -1
- package/dist/src/agents/cursor-managed-permissions.js +299 -2
- package/dist/src/agents/cursor.js +314 -1
- package/dist/src/agents/custom.js +418 -4
- package/dist/src/agents/external-channel-instructions.js +94 -11
- package/dist/src/agents/gemini.js +180 -1
- package/dist/src/agents/manager.d.ts +2 -0
- package/dist/src/agents/manager.js +250 -18
- package/dist/src/agents/model-registry/cache.js +37 -1
- package/dist/src/agents/model-registry/discovery.js +188 -2
- package/dist/src/agents/model-registry/parsers.js +521 -4
- package/dist/src/agents/model-registry/runner.js +30 -1
- package/dist/src/agents/model-registry/service.js +115 -1
- package/dist/src/agents/model-registry/types.js +8 -1
- package/dist/src/agents/model-registry.js +19 -1
- package/dist/src/agents/native-capabilities.js +237 -1
- package/dist/src/agents/openclaw.js +293 -2
- package/dist/src/agents/opencode-managed-permissions.js +187 -2
- package/dist/src/agents/opencode.js +298 -1
- package/dist/src/agents/platform-instructions.js +46 -17
- package/dist/src/agents/runtime-compatibility.js +44 -1
- package/dist/src/agents/workbuddy-managed-permissions.js +329 -2
- package/dist/src/agents/workbuddy.js +444 -3
- package/dist/src/commands/room.js +2 -2
- package/dist/src/fs/boundary.js +185 -1
- package/dist/src/fs/handler.js +130 -1
- package/dist/src/fs/security.js +32 -1
- package/dist/src/fs/text-decoder.js +110 -1
- package/dist/src/index.js +587 -3
- package/dist/src/manager/prompt.js +34 -29
- package/dist/src/manager/registry.js +317 -1
- package/dist/src/manager/retired-external-channel-compat.js +40 -1
- package/dist/src/manager/runtime.d.ts +4 -0
- package/dist/src/manager/runtime.js +1514 -23
- package/dist/src/native-fusion/codex-parser.js +660 -4
- package/dist/src/native-fusion/codex-user-input.js +102 -5
- package/dist/src/native-fusion/config.js +5 -1
- package/dist/src/native-fusion/file-watcher.js +191 -1
- package/dist/src/native-fusion/local-repository.js +569 -2
- package/dist/src/native-fusion/opencode-parser.js +130 -3
- package/dist/src/native-fusion/parsers.js +140 -3
- package/dist/src/native-fusion/service.js +739 -2
- package/dist/src/native-fusion/session-header.js +101 -2
- package/dist/src/native-fusion/state.js +104 -2
- package/dist/src/native-fusion/types.js +1 -1
- package/dist/src/personal-sync/machine-authority.js +34 -1
- package/dist/src/room/activation-audit.js +45 -2
- package/dist/src/room/activation-policy.js +30 -1
- package/dist/src/room/activation-service.d.ts +1 -0
- package/dist/src/room/activation-service.js +408 -8
- package/dist/src/room/invite-bootstrap.js +156 -1
- package/dist/src/room/managed-context.d.ts +1 -1
- package/dist/src/room/managed-context.js +1 -1
- package/dist/src/room/managed-prompt-composer.d.ts +1 -1
- package/dist/src/room/managed-prompt-composer.js +6 -5
- package/dist/src/room/managed-room-binding.js +167 -1
- package/dist/src/room/managed-room-ipc.d.ts +2 -2
- package/dist/src/room/managed-room-ipc.js +2 -2
- package/dist/src/room/mirror-sync-service.js +183 -1
- package/dist/src/room/room-action-client.d.ts +11 -0
- package/dist/src/room/room-action-client.js +1 -1
- package/dist/src/room/room-binding-client.d.ts +1 -0
- package/dist/src/room/room-binding-client.js +151 -1
- package/dist/src/security/managed-agent-policy.d.ts +3 -2
- package/dist/src/security/managed-agent-policy.js +1 -1
- package/dist/src/session/archive-zip.js +220 -1
- package/dist/src/session/deletion-sync-state.js +136 -2
- package/dist/src/session/handlers/agent-capabilities.js +14 -1
- package/dist/src/session/handlers/agent-config.js +150 -1
- package/dist/src/session/handlers/agents.js +55 -1
- package/dist/src/session/handlers/chat.d.ts +1 -1
- package/dist/src/session/handlers/chat.js +1030 -2
- package/dist/src/session/handlers/control.js +61 -1
- package/dist/src/session/handlers/fs.js +594 -1
- package/dist/src/session/handlers/message-status.js +15 -1
- package/dist/src/session/handlers/remote-access.js +43 -1
- package/dist/src/session/handlers/room-managed.js +101 -1
- package/dist/src/session/handlers/session-refresh.js +35 -1
- package/dist/src/session/handlers/title.js +79 -1
- package/dist/src/session/handlers/tool-detail.js +149 -1
- package/dist/src/session/handlers/voice-window.js +62 -1
- package/dist/src/session/history-subscriptions.js +470 -1
- package/dist/src/session/manager.js +658 -1
- package/dist/src/session/native-cleanup-outbox.js +287 -2
- package/dist/src/session/native-session-lifecycle.js +327 -6
- package/dist/src/session/queue.d.ts +5 -0
- package/dist/src/session/queue.js +8 -8
- package/dist/src/upgrade/scheduler.js +126 -1
- package/node_modules/@shennian/wire/dist/agent-workspace.js +1 -1
- package/package.json +1 -1
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import p from"node:fs";import{randomUUID as
|
|
2
|
-
`,{encoding:"utf8",mode:384,flag:"wx"});const i=p.openSync(t,"r");if(typeof i=="number")try{p.fsyncSync(i)}finally{p.closeSync(i)}p.renameSync(t,s)}finally{try{p.unlinkSync(t)}catch{}}}function A(){return $("outbound-queue.json")}function _(n){const e=C();return{...M(S()),id:n.queueMessageId||n.clientMessageId||`queue-${R()}`,sessionId:n.sessionId,text:n.text,agentType:n.agentType,sessionMode:n.sessionMode,managerConfig:n.managerConfig,workDir:n.workDir,agentSessionId:n.agentSessionId??null,modelId:n.modelId??null,systemPrompt:n.systemPrompt??null,managerDefaultWorkerAgentType:n.managerDefaultWorkerAgentType??null,managerDefaultWorkerModelId:n.managerDefaultWorkerModelId??null,reasoningEffort:n.reasoningEffort??null,clientMessageId:n.clientMessageId??null,attachments:D(n.attachments),externalChannel:n.externalChannel??null,replyTarget:n.replyTarget??null,origin:n.origin,createdAt:e,updatedAt:e}}function x(n){return{id:n.clientMessageId??n.id,sessionId:n.sessionId,role:"user",ts:Date.parse(n.createdAt),payload:j(n.text,n.attachments)}}class ce{opts;draining=new Set;prepareManagedRoomTurn=null;constructor(e){this.opts=e,setTimeout(()=>this.drainIdleQueues(),0).unref?.()}getSnapshot(e){return{...M(S()),sessionId:e,busy:!!this.opts.getRuntime().sessions.get(e)?.currentRunId,pending:(g().sessions[e]??[]).map(W)}}setManagedRoomTurnPreparer(e){this.prepareManagedRoomTurn=e}async enqueueManagedRoomBatch(e){if(e.length===0)return;const s=this.opts.getRuntime(),t=g(),i=new Set,a=new Map;let d=!1;for(const o of e){const r=o.params;if(!r.sessionId||!r.text||!r.agentType||!r.workDir)throw new Error("sessionId, text, agentType and workDir are required");const l=_({...M(S()),...r});l.origin="room",l.managedRoom=o.context;const f=t.sessions[r.sessionId]??[],u=Q(f,l),y=l.clientMessageId??l.id,h=q(r.sessionId,y);if(!u&&h.state==="not_found")f.push(l),t.sessions[r.sessionId]=f,a.set(`${l.sessionId}\0${y}`,l),i.add(r.sessionId),d=!0;else if(u&&h.state==="not_found")a.set(`${u.sessionId}\0${y}`,u),i.add(r.sessionId);else if(u&&h.state==="queued")i.add(r.sessionId);else if(u){const m=f.filter(c=>c.id!==u.id);m.length?t.sessions[r.sessionId]=m:delete t.sessions[r.sessionId],d=!0}}d&&I(t);for(const o of a.values())E(o.sessionId,x(o),"queued"),b({sessionId:o.sessionId,agentType:o.agentType,sessionMode:o.sessionMode,managerConfig:o.managerConfig,workDir:o.workDir,agentSessionId:o.agentSessionId,modelId:o.modelId});if(i.size!==0){k(s.client);for(const o of i)this.broadcast(o),this.drainNext(o)}}async handleEnqueue(e){const s=this.opts.getRuntime(),t=e.params;if(F(t.sessionListProjection),!t.sessionId||!t.text||!t.agentType||!t.workDir){s.client.sendRes({type:"res",id:e.id,ok:!1,error:"sessionId, text, agentType and workDir are required"});return}const i=s.resolvePath(t.workDir),a=D(t.attachments);a?.length&&T(i,a);const d={text:t.text,attachments:a,localized:!1},o=s.sessions.get(t.sessionId);if(t.agentType==="codex"&&t.agentSessionId&&o?.currentRunId?.startsWith("dispatch:")&&z(t.agentSessionId)){s.client.sendRes({type:"res",id:e.id,ok:!1,error:O});return}const r=await this.isSessionBusy(t.sessionId),l=g(),f=l.sessions[t.sessionId]??[];if(!r&&!f.length){await this.opts.dispatchReq({...e,id:U(e.id),method:"chat.send",params:{...t,text:d.text,responseId:e.id,clientMessageId:t.clientMessageId??t.queueMessageId,waitForDispatch:!0,attachments:d.attachments}});return}const u=_({...t,text:d.text,attachments:d.attachments}),y=u.clientMessageId??u.id,h=q(t.sessionId,y);if(h.state!=="not_found"){s.client.sendRes({type:"res",id:e.id,ok:!0,payload:{queued:h.state==="queued",queueMessageId:u.id,...h,queue:this.getSnapshot(t.sessionId)}});return}const m=Q(f,u);m||(l.sessions[t.sessionId]=[...f,u],I(l));const c=m??u;b({sessionId:c.sessionId,agentType:c.agentType,sessionMode:c.sessionMode,managerConfig:c.managerConfig,workDir:c.workDir,agentSessionId:c.agentSessionId,modelId:c.modelId}),E(c.sessionId,x(c),"queued"),v(s.resolvePath(c.workDir),c.attachments??[]),k(s.client),this.broadcast(t.sessionId),s.client.sendRes({type:"res",id:e.id,ok:!0,payload:{queued:!0,queueMessageId:m?.id??u.id,...q(t.sessionId,m?.clientMessageId??m?.id??u.clientMessageId??u.id),queue:this.getSnapshot(t.sessionId),...d.localized?{localizedAttachments:!0}:{}}}),r||this.drainNext(t.sessionId)}async handleGet(e){const s=this.opts.getRuntime(),t=e.params;if(!t.sessionId){s.client.sendRes({type:"res",id:e.id,ok:!1,error:"sessionId is required"});return}s.client.sendRes({type:"res",id:e.id,ok:!0,payload:{queue:this.getSnapshot(t.sessionId)}}),this.getSnapshot(t.sessionId).busy||this.drainNext(t.sessionId)}async handleEdit(e){const s=this.opts.getRuntime(),t=e.params;if(!t.sessionId||!t.queueMessageId||!t.text){s.client.sendRes({type:"res",id:e.id,ok:!1,error:"sessionId, queueMessageId and text are required"});return}const i=g(),a=i.sessions[t.sessionId]??[],d=a.findIndex(l=>l.id===t.queueMessageId);if(d<0){s.client.sendRes({type:"res",id:e.id,ok:!1,error:"Queued message not found"});return}if(a[d].managedRoom){s.client.sendRes({type:"res",id:e.id,ok:!1,error:"managed_agent_queue_mutation_forbidden"});return}const o=D(t.attachments),r=s.resolvePath(a[d].workDir);o?.length&&T(r,o),a[d]={...a[d],text:t.text,attachments:o,updatedAt:C()},i.sessions[t.sessionId]=a,I(i),P(t.sessionId,x(a[d]),"queued"),a[d].attachments?.length&&v(r,a[d].attachments??[]),k(s.client),this.broadcast(t.sessionId),s.client.sendRes({type:"res",id:e.id,ok:!0,payload:{queue:this.getSnapshot(t.sessionId)}})}async handleDelete(e){const s=this.opts.getRuntime(),t=e.params;if(!t.sessionId||!t.queueMessageId){s.client.sendRes({type:"res",id:e.id,ok:!1,error:"sessionId and queueMessageId are required"});return}const i=g(),a=i.sessions[t.sessionId]??[],d=a.find(r=>r.id===t.queueMessageId);if(d?.managedRoom){s.client.sendRes({type:"res",id:e.id,ok:!1,error:"managed_agent_queue_mutation_forbidden"});return}const o=a.filter(r=>r.id!==t.queueMessageId);if(o.length===a.length){s.client.sendRes({type:"res",id:e.id,ok:!1,error:"Queued message not found"});return}o.length?i.sessions[t.sessionId]=o:delete i.sessions[t.sessionId],I(i),K(t.sessionId,d?.clientMessageId??d?.id??t.queueMessageId),k(s.client),this.broadcast(t.sessionId),s.client.sendRes({type:"res",id:e.id,ok:!0,payload:{queue:this.getSnapshot(t.sessionId)}})}noteTerminal(e){this.drainNext(e)}purgeSession(e){J(e),this.draining.delete(e)}drainIdleQueues(){const e=g();for(const s of Object.keys(e.sessions))this.drainNext(s)}async drainNext(e){if(!this.draining.has(e)){this.draining.add(e);try{if(await this.isSessionBusy(e))return;const t=g().sessions[e]??[],i=V(t);if(i.length===0){this.broadcast(e);return}for(const r of i)P(e,x(r),"queued");await this.dispatchQueuedMessages(i);const a=g(),d=new Set(i.map(r=>r.id)),o=(a.sessions[e]??[]).filter(r=>!d.has(r.id));o.length?a.sessions[e]=o:delete a.sessions[e],I(a),this.broadcast(e)}catch(s){console.error(`[chat.queue] dispatch failed sessionId=${e}: ${s instanceof Error?s.message:String(s)}`),this.broadcast(e)}finally{this.draining.delete(e)}}}async dispatchQueuedMessages(e){const s=e[0],t=e.flatMap(o=>o.managedRoom?[o.managedRoom]:[]),i=t.length>0?await this.prepareManagedRoomTurn?.(t):void 0;if(t.length>0&&!i)throw new Error("managed_room_turn_preparer_unavailable");const a=e.length===1?s.text:G(e),d=X(e.flatMap(o=>o.attachments??[]));await this.opts.dispatchQueuedReq({type:"req",id:`queue-send-${s.id}-${Date.now()}`,method:"chat.send",params:{...M(S()),sessionId:s.sessionId,text:a,agentType:s.agentType,sessionMode:t.length>0?"standard":s.sessionMode,managerConfig:t.length>0?null:s.managerConfig,workDir:s.workDir,agentSessionId:s.agentSessionId??null,modelId:s.modelId??void 0,systemPrompt:i?.systemPrompt??s.systemPrompt??null,managerDefaultWorkerAgentType:t.length>0?null:s.managerDefaultWorkerAgentType,managerDefaultWorkerModelId:t.length>0?null:s.managerDefaultWorkerModelId,reasoningEffort:s.reasoningEffort??void 0,clientMessageId:s.clientMessageId??s.id,attachments:d,externalChannel:s.externalChannel,replyTarget:s.replyTarget,...i??{},roomActivation:t.length>0||void 0,suppressExternalOwnerEcho:t.length>0||void 0,queuedBatchItems:e.map(W),waitForDispatch:!0}})}async isSessionBusy(e){const s=this.opts.getRuntime().sessions.get(e);if(!s)return!1;if(s.currentRunId)return!0;if(!s.adapter.getStatus)return!1;const t=await s.adapter.getStatus().catch(()=>null);return t?.active?(t.runId&&(s.currentRunId=t.runId,s.currentRunPhase=t.runPhase??s.currentRunPhase),!0):!1}broadcast(e){this.opts.getRuntime().client.sendEvent({type:"event",event:"session.queue.update",payload:{queue:this.getSnapshot(e)}})}}function J(n){const e=g();e.sessions[n]&&(delete e.sessions[n],I(e))}function Q(n,e){const s=w(e);if(s)return n.find(i=>w(i)===s)??null;if(e.origin!=="external")return null;const t=B(e);return n.find(i=>B(i)===t)??null}function W(n){const{origin:e,managedRoom:s,...t}=n;return t}function V(n){const e=n[0];if(!e)return[];const s=N(e),t=[];for(const i of n){if(N(i)!==s)break;t.push(i)}return t}function N(n){return JSON.stringify({agentType:n.agentType,sessionMode:n.sessionMode??null,workDir:n.workDir,agentSessionId:n.agentSessionId??null,modelId:n.modelId??null,systemPrompt:n.systemPrompt??null,reasoningEffort:n.reasoningEffort??null,managerConfig:n.managerConfig??null,managerDefaultWorkerAgentType:n.managerDefaultWorkerAgentType??null,managerDefaultWorkerModelId:n.managerDefaultWorkerModelId??null,externalChannel:n.externalChannel??null,replyTarget:n.replyTarget??null,roomRegistryKey:n.managedRoom?.registryKey??null})}function G(n){return n.every(e=>e.managedRoom)?`[\u7FA4\u6D88\u606F]
|
|
3
|
-
${
|
|
1
|
+
import p from"node:fs";import{randomUUID as D}from"node:crypto";import{CODEX_DESKTOP_SEND_UNAVAILABLE as O,buildUserMessagePayload as z}from"@shennian/wire";import{isCodexThreadTailInterrupted as j}from"../native-fusion/codex-files.js";import{mergeProjectedSessions as F}from"./projection.js";import{parsePersonalAttachmentReferences as _}from"./attachment-reference.js";import{assertFinishedAttachmentReferences as w,markAttachmentReferences as T}from"./attachment-transfer-store.js";import{resolvePersonalSyncV1Path as C}from"../personal-sync/paths.js";import{getPersonalSyncIdentity as M}from"../personal-sync/epoch.js";import{getDaemonInstallationId as S}from"../personal-sync/identity.js";import{appendMessage as v,getMessageDeliveryStatus as k,recordSession as E,tombstoneMessage as K,upsertMessage as b}from"./store.js";import{requestSessionIndexPublish as x}from"./index-publisher.js";class J extends Error{constructor(e){super(e),this.name="TerminalQueuedChatDispatchError"}}function U(){return{sessions:{}}}function $(){return new Date().toISOString()}function V(s){return`enqueue-send-${s}-${D()}`}function g(){try{const s=JSON.parse(p.readFileSync(P(),"utf-8"));return{sessions:s.sessions&&typeof s.sessions=="object"?s.sessions:{}}}catch(s){if(s.code==="ENOENT"||s instanceof Error&&s.message.startsWith("ENOENT:"))return U();throw s}}function y(s){const e=C();p.mkdirSync(e,{recursive:!0,mode:448});const n=P(),t=`${n}.tmp-${process.pid}-${D()}`;try{p.writeFileSync(t,`${JSON.stringify(s,null,2)}
|
|
2
|
+
`,{encoding:"utf8",mode:384,flag:"wx"});const i=p.openSync(t,"r");if(typeof i=="number")try{p.fsyncSync(i)}finally{p.closeSync(i)}p.renameSync(t,n)}finally{try{p.unlinkSync(t)}catch{}}}function P(){return C("outbound-queue.json")}function A(s){const e=$();return{...M(S()),id:s.queueMessageId||s.clientMessageId||`queue-${D()}`,sessionId:s.sessionId,text:s.text,agentType:s.agentType,sessionMode:s.sessionMode,managerConfig:s.managerConfig,workDir:s.workDir,agentSessionId:s.agentSessionId??null,modelId:s.modelId??null,systemPrompt:s.systemPrompt??null,managerDefaultWorkerAgentType:s.managerDefaultWorkerAgentType??null,managerDefaultWorkerModelId:s.managerDefaultWorkerModelId??null,reasoningEffort:s.reasoningEffort??null,clientMessageId:s.clientMessageId??null,attachments:_(s.attachments),externalChannel:s.externalChannel??null,replyTarget:s.replyTarget??null,origin:s.origin,createdAt:e,updatedAt:e}}function q(s){return{id:s.clientMessageId??s.id,sessionId:s.sessionId,role:"user",ts:Date.parse(s.createdAt),payload:z(s.text,s.attachments)}}class fe{opts;draining=new Set;prepareManagedRoomTurn=null;constructor(e){this.opts=e,setTimeout(()=>this.drainIdleQueues(),0).unref?.()}getSnapshot(e){return{...M(S()),sessionId:e,busy:!!this.opts.getRuntime().sessions.get(e)?.currentRunId,pending:(g().sessions[e]??[]).map(W)}}setManagedRoomTurnPreparer(e){this.prepareManagedRoomTurn=e}async enqueueManagedRoomBatch(e){if(e.length===0)return;const n=this.opts.getRuntime(),t=g(),i=new Set,r=new Map;let a=!1;for(const o of e){const d=o.params;if(!d.sessionId||!d.text||!d.agentType||!d.workDir)throw new Error("sessionId, text, agentType and workDir are required");const l=A({...M(S()),...d});l.origin="room",l.managedRoom=o.context;const f=t.sessions[d.sessionId]??[],u=Q(f,l),I=l.clientMessageId??l.id,h=k(d.sessionId,I);if(!u&&h.state==="not_found")f.push(l),t.sessions[d.sessionId]=f,r.set(`${l.sessionId}\0${I}`,l),i.add(d.sessionId),a=!0;else if(u&&h.state==="not_found")r.set(`${u.sessionId}\0${I}`,u),i.add(d.sessionId);else if(u&&h.state==="queued")i.add(d.sessionId);else if(u){const m=f.filter(c=>c.id!==u.id);m.length?t.sessions[d.sessionId]=m:delete t.sessions[d.sessionId],a=!0}}a&&y(t);for(const o of r.values())v(o.sessionId,q(o),"queued"),E({sessionId:o.sessionId,agentType:o.agentType,sessionMode:o.sessionMode,managerConfig:o.managerConfig,workDir:o.workDir,agentSessionId:o.agentSessionId,modelId:o.modelId});if(i.size!==0){x(n.client);for(const o of i)this.logLifecycle("enqueue.persisted",o,{origin:"room",pendingCount:g().sessions[o]?.length??0}),this.broadcast(o),this.drainNext(o)}}async handleEnqueue(e){const n=this.opts.getRuntime(),t=e.params;if(F(t.sessionListProjection),!t.sessionId||!t.text||!t.agentType||!t.workDir){n.client.sendRes({type:"res",id:e.id,ok:!1,error:"sessionId, text, agentType and workDir are required"});return}const i=n.resolvePath(t.workDir),r=_(t.attachments);r?.length&&w(i,r);const a={text:t.text,attachments:r,localized:!1},o=n.sessions.get(t.sessionId);if(t.agentType==="codex"&&t.agentSessionId&&o?.currentRunId?.startsWith("dispatch:")&&j(t.agentSessionId)){n.client.sendRes({type:"res",id:e.id,ok:!1,error:O});return}const d=await this.isSessionBusy(t.sessionId),l=g(),f=l.sessions[t.sessionId]??[];if(!d&&!f.length){await this.opts.dispatchReq({...e,id:V(e.id),method:"chat.send",params:{...t,text:a.text,responseId:e.id,clientMessageId:t.clientMessageId??t.queueMessageId,waitForDispatch:!0,attachments:a.attachments}});return}const u=A({...t,text:a.text,attachments:a.attachments}),I=u.clientMessageId??u.id,h=k(t.sessionId,I);if(h.state!=="not_found"){n.client.sendRes({type:"res",id:e.id,ok:!0,payload:{queued:h.state==="queued",queueMessageId:u.id,...h,queue:this.getSnapshot(t.sessionId)}});return}const m=Q(f,u);m||(l.sessions[t.sessionId]=[...f,u],y(l));const c=m??u;E({sessionId:c.sessionId,agentType:c.agentType,sessionMode:c.sessionMode,managerConfig:c.managerConfig,workDir:c.workDir,agentSessionId:c.agentSessionId,modelId:c.modelId}),v(c.sessionId,q(c),"queued"),T(n.resolvePath(c.workDir),c.attachments??[]),x(n.client),this.logLifecycle("enqueue.persisted",t.sessionId,{origin:t.origin??"app",queueMessageId:c.id,pendingCount:(g().sessions[t.sessionId]??[]).length}),this.broadcast(t.sessionId),n.client.sendRes({type:"res",id:e.id,ok:!0,payload:{queued:!0,queueMessageId:m?.id??u.id,...k(t.sessionId,m?.clientMessageId??m?.id??u.clientMessageId??u.id),queue:this.getSnapshot(t.sessionId),...a.localized?{localizedAttachments:!0}:{}}}),d||this.drainNext(t.sessionId)}async handleGet(e){const n=this.opts.getRuntime(),t=e.params;if(!t.sessionId){n.client.sendRes({type:"res",id:e.id,ok:!1,error:"sessionId is required"});return}n.client.sendRes({type:"res",id:e.id,ok:!0,payload:{queue:this.getSnapshot(t.sessionId)}}),this.getSnapshot(t.sessionId).busy||this.drainNext(t.sessionId)}async handleEdit(e){const n=this.opts.getRuntime(),t=e.params;if(!t.sessionId||!t.queueMessageId||!t.text){n.client.sendRes({type:"res",id:e.id,ok:!1,error:"sessionId, queueMessageId and text are required"});return}const i=g(),r=i.sessions[t.sessionId]??[],a=r.findIndex(l=>l.id===t.queueMessageId);if(a<0){n.client.sendRes({type:"res",id:e.id,ok:!1,error:"Queued message not found"});return}if(r[a].managedRoom){n.client.sendRes({type:"res",id:e.id,ok:!1,error:"managed_agent_queue_mutation_forbidden"});return}const o=_(t.attachments),d=n.resolvePath(r[a].workDir);o?.length&&w(d,o),r[a]={...r[a],text:t.text,attachments:o,updatedAt:$()},i.sessions[t.sessionId]=r,y(i),b(t.sessionId,q(r[a]),"queued"),r[a].attachments?.length&&T(d,r[a].attachments??[]),x(n.client),this.broadcast(t.sessionId),n.client.sendRes({type:"res",id:e.id,ok:!0,payload:{queue:this.getSnapshot(t.sessionId)}})}async handleDelete(e){const n=this.opts.getRuntime(),t=e.params;if(!t.sessionId||!t.queueMessageId){n.client.sendRes({type:"res",id:e.id,ok:!1,error:"sessionId and queueMessageId are required"});return}const i=g(),r=i.sessions[t.sessionId]??[],a=r.find(d=>d.id===t.queueMessageId);if(a?.managedRoom){n.client.sendRes({type:"res",id:e.id,ok:!1,error:"managed_agent_queue_mutation_forbidden"});return}const o=r.filter(d=>d.id!==t.queueMessageId);if(o.length===r.length){n.client.sendRes({type:"res",id:e.id,ok:!1,error:"Queued message not found"});return}o.length?i.sessions[t.sessionId]=o:delete i.sessions[t.sessionId],y(i),K(t.sessionId,a?.clientMessageId??a?.id??t.queueMessageId),x(n.client),this.broadcast(t.sessionId),n.client.sendRes({type:"res",id:e.id,ok:!0,payload:{queue:this.getSnapshot(t.sessionId)}})}noteTerminal(e){this.drainNext(e)}purgeSession(e){G(e),this.draining.delete(e)}drainIdleQueues(){const e=g();for(const n of Object.keys(e.sessions))this.drainNext(n)}async drainNext(e){if(this.draining.has(e))return;this.draining.add(e);let n=!1,t=[];try{if(await this.isSessionBusy(e)){this.logLifecycle("drain.deferred",e,{pendingCount:g().sessions[e]?.length??0});return}const i=g(),r=i.sessions[e]??[],a=r.filter(l=>{const f=l.clientMessageId??l.id,u=k(e,f).state;return u==="queued"||u==="not_found"});a.length!==r.length&&(a.length?i.sessions[e]=a:delete i.sessions[e],y(i),this.logLifecycle("drain.pruned-terminal",e,{prunedCount:r.length-a.length,pendingCount:a.length}));const o=H(a);if(o.length===0){this.broadcast(e);return}t=o,this.logLifecycle("dispatch.start",e,{batchCount:o.length,queueMessageId:o[0].id,origin:o[0].origin??"app"});for(const l of o)b(e,q(l),"queued");await this.dispatchQueuedMessages(o);const d=this.removeBatch(e,o);this.logLifecycle("dispatch.accepted",e,{batchCount:o.length,queueMessageId:o[0].id,pendingCount:d}),n=d>0,this.broadcast(e)}catch(i){if(i instanceof J){const r=this.removeBatch(e,t);this.logLifecycle("dispatch.terminal-failure",e,{batchCount:t.length,queueMessageId:t[0]?.id,pendingCount:r,errorCode:L(i.message,"terminal_dispatch_failed")},"error"),n=r>0}else this.logLifecycle("dispatch.transient-failure",e,{errorCode:L(i instanceof Error?i.message:String(i),"transient_dispatch_failed")},"error");this.broadcast(e)}finally{this.draining.delete(e),n&&queueMicrotask(()=>{this.drainNext(e)})}}removeBatch(e,n){if(n.length===0)return g().sessions[e]?.length??0;const t=g(),i=new Set(n.map(a=>a.id)),r=(t.sessions[e]??[]).filter(a=>!i.has(a.id));return r.length?t.sessions[e]=r:delete t.sessions[e],y(t),r.length}logLifecycle(e,n,t,i="info"){const r=`[chat.queue] ${JSON.stringify({event:e,sessionId:n,...t})}`;i==="error"?console.error(r):console.info(r)}async dispatchQueuedMessages(e){const n=e[0],t=e.flatMap(o=>o.managedRoom?[o.managedRoom]:[]),i=t.length>0?await this.prepareManagedRoomTurn?.(t):void 0;if(t.length>0&&!i)throw new Error("managed_room_turn_preparer_unavailable");const r=e.length===1?n.text:X(e),a=Z(e.flatMap(o=>o.attachments??[]));await this.opts.dispatchQueuedReq({type:"req",id:`queue-send-${n.id}-${Date.now()}`,method:"chat.send",params:{...M(S()),sessionId:n.sessionId,text:r,agentType:n.agentType,sessionMode:t.length>0?"standard":n.sessionMode,managerConfig:t.length>0?null:n.managerConfig,workDir:n.workDir,agentSessionId:n.agentSessionId??null,modelId:n.modelId??void 0,systemPrompt:i?.systemPrompt??n.systemPrompt??null,managerDefaultWorkerAgentType:t.length>0?null:n.managerDefaultWorkerAgentType,managerDefaultWorkerModelId:t.length>0?null:n.managerDefaultWorkerModelId,reasoningEffort:n.reasoningEffort??void 0,clientMessageId:n.clientMessageId??n.id,attachments:a,externalChannel:n.externalChannel,replyTarget:n.replyTarget,...i??{},roomActivation:t.length>0||void 0,suppressExternalOwnerEcho:t.length>0||void 0,queuedBatchItems:e.map(W),waitForDispatch:!0}})}async isSessionBusy(e){const n=this.opts.getRuntime().sessions.get(e);if(!n)return!1;if(n.currentRunId)return!0;if(!n.adapter.getStatus)return!1;const t=await n.adapter.getStatus().catch(()=>null);return t?.active?(t.runId&&(n.currentRunId=t.runId,n.currentRunPhase=t.runPhase??n.currentRunPhase),!0):!1}broadcast(e){this.opts.getRuntime().client.sendEvent({type:"event",event:"session.queue.update",payload:{queue:this.getSnapshot(e)}})}}function G(s){const e=g();e.sessions[s]&&(delete e.sessions[s],y(e))}function Q(s,e){const n=R(e);if(n)return s.find(i=>R(i)===n)??null;if(e.origin!=="external")return null;const t=B(e);return s.find(i=>B(i)===t)??null}function W(s){const{origin:e,managedRoom:n,...t}=s;return t}function H(s){const e=s[0];if(!e)return[];const n=N(e),t=[];for(const i of s){if(N(i)!==n)break;t.push(i)}return t}function N(s){return JSON.stringify({agentType:s.agentType,sessionMode:s.sessionMode??null,workDir:s.workDir,agentSessionId:s.agentSessionId??null,modelId:s.modelId??null,systemPrompt:s.systemPrompt??null,reasoningEffort:s.reasoningEffort??null,managerConfig:s.managerConfig??null,managerDefaultWorkerAgentType:s.managerDefaultWorkerAgentType??null,managerDefaultWorkerModelId:s.managerDefaultWorkerModelId??null,externalChannel:s.externalChannel??null,replyTarget:s.replyTarget??null,roomRegistryKey:s.managedRoom?.registryKey??null})}function X(s){return s.every(e=>e.managedRoom)?`[\u7FA4\u6D88\u606F]
|
|
3
|
+
${s.map(e=>Y(e.text)).filter(Boolean).join(`
|
|
4
4
|
|
|
5
5
|
`)}`:`[\u8FDE\u7EED\u7528\u6237\u6D88\u606F]
|
|
6
|
-
${
|
|
6
|
+
${s.map((e,n)=>`<\u6D88\u606F ${n+1}>
|
|
7
7
|
${e.text.trim()}`).join(`
|
|
8
8
|
|
|
9
|
-
`)}`}function
|
|
10
|
-
${
|
|
11
|
-
`)?e.slice(6):e}function B(
|
|
12
|
-
`)}function
|
|
9
|
+
`)}`}function Y(s){const e=s.trim(),n=e.match(/^\[群消息\][ \t]+<([^>\n]+)>\n([\s\S]*)$/);return n?`<${n[1]}>
|
|
10
|
+
${n[2]}`:e.startsWith(`[\u7FA4\u6D88\u606F]
|
|
11
|
+
`)?e.slice(6):e}function B(s){const e=R(s);return e?`id:${e}`:["body",ee(s.text),...(s.attachments??[]).map(n=>n.path||`${n.name}:${n.mimeType}`)].join(`
|
|
12
|
+
`)}function R(s){const e=typeof s.clientMessageId=="string"?s.clientMessageId.trim():"";if(e)return e;const n=typeof s.id=="string"?s.id.trim():"";return n&&!n.startsWith("queue-")?n:""}function Z(s){const e=new Set,n=[];for(const t of s){const i=t.path||`${t.name}:${t.mimeType}`;e.has(i)||(e.add(i),n.push(t))}return n.length?n:void 0}function ee(s){return String(s||"").replace(/\s+/g," ").trim()}function L(s,e){const n=s.toLowerCase();return n.includes("no rollout found")?"missing_rollout":n.includes("managed_room_permission_snapshot_mismatch")?"managed_room_permission_snapshot_mismatch":n.includes("managed_room_prompt_snapshot_mismatch")?"managed_room_prompt_snapshot_mismatch":n.includes("managed_room_turn_preparer_unavailable")?"managed_room_turn_preparer_unavailable":n.includes("timeout")?"timeout":n.includes("connection")?"connection_error":e}export{fe as ChatQueueManager,J as TerminalQueuedChatDispatchError,G as purgeQueuedSessionData};
|
|
@@ -1 +1,126 @@
|
|
|
1
|
-
|
|
1
|
+
// @arch docs/architecture/cli/upgrade.md#自动升级
|
|
2
|
+
// @test packages/cli/src/__tests__/upgrade-scheduler.test.ts
|
|
3
|
+
import { checkForUpdate, isUpgradeVersionInCooldown, } from './engine.js';
|
|
4
|
+
const DEFAULT_RELEASE_POLICY = {
|
|
5
|
+
automaticPatchEnabled: false,
|
|
6
|
+
rolloutPercentage: 0,
|
|
7
|
+
pausedVersions: [],
|
|
8
|
+
blockedVersions: [],
|
|
9
|
+
killSwitch: true,
|
|
10
|
+
};
|
|
11
|
+
export function deterministicRolloutBucket(machineId) {
|
|
12
|
+
let hash = 2166136261;
|
|
13
|
+
for (let i = 0; i < machineId.length; i++) {
|
|
14
|
+
hash ^= machineId.charCodeAt(i);
|
|
15
|
+
hash = Math.imul(hash, 16777619);
|
|
16
|
+
}
|
|
17
|
+
return (hash >>> 0) % 100;
|
|
18
|
+
}
|
|
19
|
+
export function isAutomaticPatchAllowed(policy, machineId, currentVersion, targetVersion) {
|
|
20
|
+
if (policy.killSwitch || !policy.automaticPatchEnabled)
|
|
21
|
+
return false;
|
|
22
|
+
if (policy.blockedVersions.includes(targetVersion))
|
|
23
|
+
return false;
|
|
24
|
+
if (policy.pausedVersions.includes(targetVersion) || policy.pausedVersions.includes(currentVersion))
|
|
25
|
+
return false;
|
|
26
|
+
const rollout = Math.max(0, Math.min(100, Math.floor(policy.rolloutPercentage)));
|
|
27
|
+
return deterministicRolloutBucket(machineId) < rollout;
|
|
28
|
+
}
|
|
29
|
+
export async function fetchCliReleasePolicy(serverUrl) {
|
|
30
|
+
const url = new URL('/api/releases/cli-policy', serverUrl);
|
|
31
|
+
const response = await fetch(url, {
|
|
32
|
+
headers: { Accept: 'application/json' },
|
|
33
|
+
signal: AbortSignal.timeout(10_000),
|
|
34
|
+
});
|
|
35
|
+
if (!response.ok)
|
|
36
|
+
throw new Error(`release policy returned ${response.status}`);
|
|
37
|
+
const raw = await response.json();
|
|
38
|
+
return {
|
|
39
|
+
automaticPatchEnabled: raw.automaticPatchEnabled === true,
|
|
40
|
+
rolloutPercentage: typeof raw.rolloutPercentage === 'number' ? raw.rolloutPercentage : 0,
|
|
41
|
+
pausedVersions: Array.isArray(raw.pausedVersions) ? raw.pausedVersions.filter((v) => typeof v === 'string') : [],
|
|
42
|
+
blockedVersions: Array.isArray(raw.blockedVersions) ? raw.blockedVersions.filter((v) => typeof v === 'string') : [],
|
|
43
|
+
killSwitch: raw.killSwitch !== false,
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
export class AutoUpgradeScheduler {
|
|
47
|
+
deps;
|
|
48
|
+
policy = 'none';
|
|
49
|
+
timer = null;
|
|
50
|
+
started = false;
|
|
51
|
+
upgradeInFlight = false;
|
|
52
|
+
constructor(deps) {
|
|
53
|
+
this.deps = deps;
|
|
54
|
+
}
|
|
55
|
+
start() {
|
|
56
|
+
if (this.started)
|
|
57
|
+
return;
|
|
58
|
+
this.started = true;
|
|
59
|
+
if (this.policy === 'patch')
|
|
60
|
+
this.arm(this.deps.initialDelayMs ?? 30_000);
|
|
61
|
+
}
|
|
62
|
+
stop() {
|
|
63
|
+
this.started = false;
|
|
64
|
+
if (this.timer)
|
|
65
|
+
(this.deps.clearTimeout ?? clearTimeout)(this.timer);
|
|
66
|
+
this.timer = null;
|
|
67
|
+
}
|
|
68
|
+
setPolicy(policy) {
|
|
69
|
+
this.policy = policy;
|
|
70
|
+
if (!this.started)
|
|
71
|
+
return;
|
|
72
|
+
if (policy === 'none') {
|
|
73
|
+
if (this.timer)
|
|
74
|
+
(this.deps.clearTimeout ?? clearTimeout)(this.timer);
|
|
75
|
+
this.timer = null;
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
if (!this.timer)
|
|
79
|
+
this.arm(0);
|
|
80
|
+
}
|
|
81
|
+
getPolicy() {
|
|
82
|
+
return this.policy;
|
|
83
|
+
}
|
|
84
|
+
async runOnce() {
|
|
85
|
+
if (this.policy !== 'patch' || this.upgradeInFlight)
|
|
86
|
+
return;
|
|
87
|
+
const idle = this.deps.getIdleState();
|
|
88
|
+
if (!idle.idle)
|
|
89
|
+
return;
|
|
90
|
+
const update = await (this.deps.checkForUpdate ?? checkForUpdate)(this.deps.currentVersion);
|
|
91
|
+
if (!update.hasUpdate || update.changeType !== 'patch')
|
|
92
|
+
return;
|
|
93
|
+
if ((this.deps.inCooldown ?? isUpgradeVersionInCooldown)(update.latest))
|
|
94
|
+
return;
|
|
95
|
+
let releasePolicy = DEFAULT_RELEASE_POLICY;
|
|
96
|
+
try {
|
|
97
|
+
releasePolicy = await (this.deps.fetchReleasePolicy ?? (() => fetchCliReleasePolicy(this.deps.serverUrl)))();
|
|
98
|
+
}
|
|
99
|
+
catch {
|
|
100
|
+
return; // fail closed: a missing control-plane policy never permits an automatic install
|
|
101
|
+
}
|
|
102
|
+
if (!isAutomaticPatchAllowed(releasePolicy, this.deps.machineId, update.current, update.latest))
|
|
103
|
+
return;
|
|
104
|
+
this.upgradeInFlight = true;
|
|
105
|
+
try {
|
|
106
|
+
await this.deps.startUpgrade(update.latest);
|
|
107
|
+
}
|
|
108
|
+
finally {
|
|
109
|
+
this.upgradeInFlight = false;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
arm(delayMs) {
|
|
113
|
+
if (!this.started || this.timer)
|
|
114
|
+
return;
|
|
115
|
+
const setTimer = this.deps.setTimeout ?? setTimeout;
|
|
116
|
+
this.timer = setTimer(() => {
|
|
117
|
+
this.timer = null;
|
|
118
|
+
void this.runOnce().catch(() => { }).finally(() => {
|
|
119
|
+
if (this.started && this.policy === 'patch') {
|
|
120
|
+
this.arm(this.deps.intervalMs ?? 5 * 60_000);
|
|
121
|
+
}
|
|
122
|
+
});
|
|
123
|
+
}, delayMs);
|
|
124
|
+
this.timer.unref?.();
|
|
125
|
+
}
|
|
126
|
+
}
|