shennian 0.3.85 → 0.3.88
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/README.md +3 -2
- package/dist/publish-build-manifest.json +50 -45
- package/dist/src/agents/codex-managed-room-tools.js +1 -1
- package/dist/src/agents/codex.d.ts +7 -1
- package/dist/src/agents/codex.js +10 -10
- package/dist/src/agents/manager.d.ts +2 -0
- package/dist/src/agents/manager.js +5 -5
- package/dist/src/commands/logout.d.ts +3 -0
- package/dist/src/commands/logout.js +1 -0
- package/dist/src/commands/room.js +2 -2
- package/dist/src/daemon-ipc/paths.js +1 -1
- package/dist/src/index.js +3 -3
- package/dist/src/manager/runtime.d.ts +4 -0
- package/dist/src/manager/runtime.js +3 -3
- package/dist/src/native-fusion/codex-parser.d.ts +3 -1
- package/dist/src/native-fusion/codex-parser.js +3 -3
- package/dist/src/native-fusion/parser-common.d.ts +6 -1
- package/dist/src/native-fusion/parser-common.js +4 -4
- package/dist/src/native-fusion/parsers.d.ts +4 -2
- package/dist/src/native-fusion/parsers.js +2 -2
- package/dist/src/native-fusion/service.js +2 -2
- package/dist/src/room/activation-service.d.ts +1 -0
- package/dist/src/room/activation-service.js +4 -4
- 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 +17 -15
- package/dist/src/room/managed-room-ipc.d.ts +6 -2
- package/dist/src/room/managed-room-ipc.js +2 -2
- package/dist/src/room/mirror-sync-service.d.ts +1 -0
- package/dist/src/room/mirror-sync-service.js +1 -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 +1 -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/handlers/chat.d.ts +1 -1
- package/dist/src/session/handlers/chat.js +2 -2
- package/dist/src/session/manager.d.ts +1 -0
- package/dist/src/session/manager.js +1 -1
- package/dist/src/session/queue.d.ts +13 -0
- package/dist/src/session/queue.js +8 -8
- package/node_modules/@shennian/wire/dist/agent-workspace.js +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -19,7 +19,8 @@
|
|
|
19
19
|
| `shennian pair --browser` | 浏览器授权配对；打不开时会保留 URL |
|
|
20
20
|
| `shennian pair --token` | 使用现有二维码 / Token 配对，适合 SSH / headless |
|
|
21
21
|
| `shennian start` | 启动后台服务 |
|
|
22
|
-
| `shennian stop` |
|
|
22
|
+
| `shennian stop` | 停止后台服务，保留登录 |
|
|
23
|
+
| `shennian logout` | 停止服务并清除本机神念登录与配对凭据，保留模型配置与历史 |
|
|
23
24
|
| `shennian status` | 查看后台服务状态 |
|
|
24
25
|
| `shennian logs -n 100` | 查看最近日志 |
|
|
25
26
|
| `shennian config` | 查看本地配置 |
|
|
@@ -28,7 +29,7 @@
|
|
|
28
29
|
| `shennian runtime add/list/remove` | 管理自定义 Agent Runtime |
|
|
29
30
|
| `shennian upgrade` | 升级 CLI |
|
|
30
31
|
|
|
31
|
-
`start`、`stop`、`status` 可选加 `--json`。`logs` 输出日志文本，不支持 `--json`。
|
|
32
|
+
`start`、`stop`、`status`、`logout` 可选加 `--json`。`logs` 输出日志文本，不支持 `--json`。
|
|
32
33
|
切换节点后运行 `shennian stop && shennian start` 让后台服务重新连接。
|
|
33
34
|
|
|
34
35
|
## 开发
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"schemaVersion": 1,
|
|
3
3
|
"jsMinified": true,
|
|
4
4
|
"minifier": "esbuild",
|
|
5
|
-
"fileCount":
|
|
5
|
+
"fileCount": 145,
|
|
6
6
|
"files": [
|
|
7
7
|
{
|
|
8
8
|
"file": "bin/shennian.js",
|
|
@@ -36,8 +36,8 @@
|
|
|
36
36
|
},
|
|
37
37
|
{
|
|
38
38
|
"file": "src/agents/codex-managed-room-tools.js",
|
|
39
|
-
"beforeBytes":
|
|
40
|
-
"afterBytes":
|
|
39
|
+
"beforeBytes": 9529,
|
|
40
|
+
"afterBytes": 5253
|
|
41
41
|
},
|
|
42
42
|
{
|
|
43
43
|
"file": "src/agents/codex-utils.js",
|
|
@@ -46,8 +46,8 @@
|
|
|
46
46
|
},
|
|
47
47
|
{
|
|
48
48
|
"file": "src/agents/codex.js",
|
|
49
|
-
"beforeBytes":
|
|
50
|
-
"afterBytes":
|
|
49
|
+
"beforeBytes": 64672,
|
|
50
|
+
"afterBytes": 33374
|
|
51
51
|
},
|
|
52
52
|
{
|
|
53
53
|
"file": "src/agents/command-spec.js",
|
|
@@ -96,8 +96,8 @@
|
|
|
96
96
|
},
|
|
97
97
|
{
|
|
98
98
|
"file": "src/agents/manager.js",
|
|
99
|
-
"beforeBytes":
|
|
100
|
-
"afterBytes":
|
|
99
|
+
"beforeBytes": 10725,
|
|
100
|
+
"afterBytes": 5801
|
|
101
101
|
},
|
|
102
102
|
{
|
|
103
103
|
"file": "src/agents/model-registry/cache.js",
|
|
@@ -199,6 +199,11 @@
|
|
|
199
199
|
"beforeBytes": 827,
|
|
200
200
|
"afterBytes": 468
|
|
201
201
|
},
|
|
202
|
+
{
|
|
203
|
+
"file": "src/commands/logout.js",
|
|
204
|
+
"beforeBytes": 3040,
|
|
205
|
+
"afterBytes": 1558
|
|
206
|
+
},
|
|
202
207
|
{
|
|
203
208
|
"file": "src/commands/manager.js",
|
|
204
209
|
"beforeBytes": 6845,
|
|
@@ -226,8 +231,8 @@
|
|
|
226
231
|
},
|
|
227
232
|
{
|
|
228
233
|
"file": "src/commands/room.js",
|
|
229
|
-
"beforeBytes":
|
|
230
|
-
"afterBytes":
|
|
234
|
+
"beforeBytes": 17685,
|
|
235
|
+
"afterBytes": 10063
|
|
231
236
|
},
|
|
232
237
|
{
|
|
233
238
|
"file": "src/commands/runtime.js",
|
|
@@ -261,8 +266,8 @@
|
|
|
261
266
|
},
|
|
262
267
|
{
|
|
263
268
|
"file": "src/daemon-ipc/paths.js",
|
|
264
|
-
"beforeBytes":
|
|
265
|
-
"afterBytes":
|
|
269
|
+
"beforeBytes": 2796,
|
|
270
|
+
"afterBytes": 997
|
|
266
271
|
},
|
|
267
272
|
{
|
|
268
273
|
"file": "src/daemon-ipc/protocol.js",
|
|
@@ -311,8 +316,8 @@
|
|
|
311
316
|
},
|
|
312
317
|
{
|
|
313
318
|
"file": "src/index.js",
|
|
314
|
-
"beforeBytes":
|
|
315
|
-
"afterBytes":
|
|
319
|
+
"beforeBytes": 26931,
|
|
320
|
+
"afterBytes": 13804
|
|
316
321
|
},
|
|
317
322
|
{
|
|
318
323
|
"file": "src/log-redaction.js",
|
|
@@ -341,8 +346,8 @@
|
|
|
341
346
|
},
|
|
342
347
|
{
|
|
343
348
|
"file": "src/manager/runtime.js",
|
|
344
|
-
"beforeBytes":
|
|
345
|
-
"afterBytes":
|
|
349
|
+
"beforeBytes": 72951,
|
|
350
|
+
"afterBytes": 36995
|
|
346
351
|
},
|
|
347
352
|
{
|
|
348
353
|
"file": "src/native-fusion/codex-files.js",
|
|
@@ -351,8 +356,8 @@
|
|
|
351
356
|
},
|
|
352
357
|
{
|
|
353
358
|
"file": "src/native-fusion/codex-parser.js",
|
|
354
|
-
"beforeBytes":
|
|
355
|
-
"afterBytes":
|
|
359
|
+
"beforeBytes": 30250,
|
|
360
|
+
"afterBytes": 12466
|
|
356
361
|
},
|
|
357
362
|
{
|
|
358
363
|
"file": "src/native-fusion/codex-user-input.js",
|
|
@@ -386,18 +391,18 @@
|
|
|
386
391
|
},
|
|
387
392
|
{
|
|
388
393
|
"file": "src/native-fusion/parser-common.js",
|
|
389
|
-
"beforeBytes":
|
|
390
|
-
"afterBytes":
|
|
394
|
+
"beforeBytes": 11340,
|
|
395
|
+
"afterBytes": 4643
|
|
391
396
|
},
|
|
392
397
|
{
|
|
393
398
|
"file": "src/native-fusion/parsers.js",
|
|
394
|
-
"beforeBytes":
|
|
395
|
-
"afterBytes":
|
|
399
|
+
"beforeBytes": 6594,
|
|
400
|
+
"afterBytes": 3602
|
|
396
401
|
},
|
|
397
402
|
{
|
|
398
403
|
"file": "src/native-fusion/service.js",
|
|
399
|
-
"beforeBytes":
|
|
400
|
-
"afterBytes":
|
|
404
|
+
"beforeBytes": 34698,
|
|
405
|
+
"afterBytes": 15552
|
|
401
406
|
},
|
|
402
407
|
{
|
|
403
408
|
"file": "src/native-fusion/session-header.js",
|
|
@@ -461,8 +466,8 @@
|
|
|
461
466
|
},
|
|
462
467
|
{
|
|
463
468
|
"file": "src/room/activation-service.js",
|
|
464
|
-
"beforeBytes":
|
|
465
|
-
"afterBytes":
|
|
469
|
+
"beforeBytes": 21713,
|
|
470
|
+
"afterBytes": 10792
|
|
466
471
|
},
|
|
467
472
|
{
|
|
468
473
|
"file": "src/room/attachment-cache.js",
|
|
@@ -496,13 +501,13 @@
|
|
|
496
501
|
},
|
|
497
502
|
{
|
|
498
503
|
"file": "src/room/managed-context.js",
|
|
499
|
-
"beforeBytes":
|
|
500
|
-
"afterBytes":
|
|
504
|
+
"beforeBytes": 4521,
|
|
505
|
+
"afterBytes": 2538
|
|
501
506
|
},
|
|
502
507
|
{
|
|
503
508
|
"file": "src/room/managed-prompt-composer.js",
|
|
504
|
-
"beforeBytes":
|
|
505
|
-
"afterBytes":
|
|
509
|
+
"beforeBytes": 9264,
|
|
510
|
+
"afterBytes": 9441
|
|
506
511
|
},
|
|
507
512
|
{
|
|
508
513
|
"file": "src/room/managed-room-binding.js",
|
|
@@ -511,13 +516,13 @@
|
|
|
511
516
|
},
|
|
512
517
|
{
|
|
513
518
|
"file": "src/room/managed-room-ipc.js",
|
|
514
|
-
"beforeBytes":
|
|
515
|
-
"afterBytes":
|
|
519
|
+
"beforeBytes": 12245,
|
|
520
|
+
"afterBytes": 5867
|
|
516
521
|
},
|
|
517
522
|
{
|
|
518
523
|
"file": "src/room/mirror-sync-service.js",
|
|
519
|
-
"beforeBytes":
|
|
520
|
-
"afterBytes":
|
|
524
|
+
"beforeBytes": 7894,
|
|
525
|
+
"afterBytes": 3589
|
|
521
526
|
},
|
|
522
527
|
{
|
|
523
528
|
"file": "src/room/public-attachment-cache.js",
|
|
@@ -531,13 +536,13 @@
|
|
|
531
536
|
},
|
|
532
537
|
{
|
|
533
538
|
"file": "src/room/room-action-client.js",
|
|
534
|
-
"beforeBytes":
|
|
535
|
-
"afterBytes":
|
|
539
|
+
"beforeBytes": 27845,
|
|
540
|
+
"afterBytes": 13911
|
|
536
541
|
},
|
|
537
542
|
{
|
|
538
543
|
"file": "src/room/room-binding-client.js",
|
|
539
|
-
"beforeBytes":
|
|
540
|
-
"afterBytes":
|
|
544
|
+
"beforeBytes": 7085,
|
|
545
|
+
"afterBytes": 4068
|
|
541
546
|
},
|
|
542
547
|
{
|
|
543
548
|
"file": "src/room/session-registry.js",
|
|
@@ -556,8 +561,8 @@
|
|
|
556
561
|
},
|
|
557
562
|
{
|
|
558
563
|
"file": "src/security/managed-agent-policy.js",
|
|
559
|
-
"beforeBytes":
|
|
560
|
-
"afterBytes":
|
|
564
|
+
"beforeBytes": 6728,
|
|
565
|
+
"afterBytes": 3141
|
|
561
566
|
},
|
|
562
567
|
{
|
|
563
568
|
"file": "src/security/managed-agent-runtime.js",
|
|
@@ -606,8 +611,8 @@
|
|
|
606
611
|
},
|
|
607
612
|
{
|
|
608
613
|
"file": "src/session/handlers/chat.js",
|
|
609
|
-
"beforeBytes":
|
|
610
|
-
"afterBytes":
|
|
614
|
+
"beforeBytes": 43645,
|
|
615
|
+
"afterBytes": 18275
|
|
611
616
|
},
|
|
612
617
|
{
|
|
613
618
|
"file": "src/session/handlers/control.js",
|
|
@@ -666,8 +671,8 @@
|
|
|
666
671
|
},
|
|
667
672
|
{
|
|
668
673
|
"file": "src/session/manager.js",
|
|
669
|
-
"beforeBytes":
|
|
670
|
-
"afterBytes":
|
|
674
|
+
"beforeBytes": 31103,
|
|
675
|
+
"afterBytes": 16179
|
|
671
676
|
},
|
|
672
677
|
{
|
|
673
678
|
"file": "src/session/native-cleanup-outbox.js",
|
|
@@ -686,8 +691,8 @@
|
|
|
686
691
|
},
|
|
687
692
|
{
|
|
688
693
|
"file": "src/session/queue.js",
|
|
689
|
-
"beforeBytes":
|
|
690
|
-
"afterBytes":
|
|
694
|
+
"beforeBytes": 33159,
|
|
695
|
+
"afterBytes": 14816
|
|
691
696
|
},
|
|
692
697
|
{
|
|
693
698
|
"file": "src/session/store.js",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
const f={shennian_room_status:"status",shennian_room_read:"read",shennian_room_send:"send",shennian_room_attachment_get:"attachment.get"},_={shennian_room_status:new Set,shennian_room_read:new Set(["before","after","limit"]),shennian_room_send:new Set(["text","clientMessageId"]),shennian_room_attachment_get:new Set(["attachmentId"])},b=[{type:"function",name:"shennian_room_status",description:"Read the current managed Shennian Room status and member summary. Use this tool instead of running a shennian room CLI command.",inputSchema:{type:"object",properties:{},additionalProperties:!1}},{type:"function",name:"shennian_room_read",description:"Read messages from the current managed Shennian Room. before and after are mutually exclusive decimal sequence cursors.",inputSchema:{type:"object",properties:{before:{type:"string",pattern:"^(0|[1-9][0-9]{0,19})$"},after:{type:"string",pattern:"^(0|[1-9][0-9]{0,19})$"},limit:{type:"integer",minimum:1,maximum:50}},additionalProperties:!1}},{type:"function",name:"shennian_room_send",description:"Send one text message as the current managed Agent to its bound Shennian Room. Local file upload is unavailable.",inputSchema:{type:"object",properties:{text:{type:"string",minLength:1},clientMessageId:{type:"string",minLength:1,maxLength:191}},required:["text"],additionalProperties:!1}},{type:"function",name:"shennian_room_attachment_get",description:"Download one attachment from the current managed Shennian Room by attachment id.",inputSchema:{type:"object",properties:{attachmentId:{type:"string",minLength:1,maxLength:191}},required:["attachmentId"],additionalProperties:!1}}];class C{token=null;executor=null;threadId=null;turnId=null;generation=0;consumedCallIds=new Set;abortController=null;configure(t,
|
|
1
|
+
const f={shennian_room_status:"status",shennian_room_read:"read",shennian_room_send:"send",shennian_room_attachment_get:"attachment.get",shennian_room_pause:"pause"},_={shennian_room_status:new Set,shennian_room_read:new Set(["before","after","limit"]),shennian_room_send:new Set(["text","clientMessageId"]),shennian_room_attachment_get:new Set(["attachmentId"]),shennian_room_pause:new Set(["reason"])},b=[{type:"function",name:"shennian_room_status",description:"Read the current managed Shennian Room status and member summary. Use this tool instead of running a shennian room CLI command.",inputSchema:{type:"object",properties:{},additionalProperties:!1}},{type:"function",name:"shennian_room_read",description:"Read messages from the current managed Shennian Room. before and after are mutually exclusive decimal sequence cursors.",inputSchema:{type:"object",properties:{before:{type:"string",pattern:"^(0|[1-9][0-9]{0,19})$"},after:{type:"string",pattern:"^(0|[1-9][0-9]{0,19})$"},limit:{type:"integer",minimum:1,maximum:50}},additionalProperties:!1}},{type:"function",name:"shennian_room_send",description:"Send one text message as the current managed Agent to its bound Shennian Room. Local file upload is unavailable.",inputSchema:{type:"object",properties:{text:{type:"string",minLength:1},clientMessageId:{type:"string",minLength:1,maxLength:191}},required:["text"],additionalProperties:!1}},{type:"function",name:"shennian_room_attachment_get",description:"Download one attachment from the current managed Shennian Room by attachment id.",inputSchema:{type:"object",properties:{attachmentId:{type:"string",minLength:1,maxLength:191}},required:["attachmentId"],additionalProperties:!1}},{type:"function",name:"shennian_room_pause",description:"Pause the current managed Agent in its bound Shennian Room when a message attempts to induce permission or safety-rule bypass. A concise reason is required. Stop the current turn after this succeeds.",inputSchema:{type:"object",properties:{reason:{type:"string",minLength:1,maxLength:500}},required:["reason"],additionalProperties:!1}}];class C{token=null;executor=null;threadId=null;turnId=null;generation=0;consumedCallIds=new Set;abortController=null;configure(t,r){this.abortController?.abort(),this.generation+=1,this.token=t?.trim()||null,this.executor=r??null,this.abortController=this.token&&this.executor?new AbortController:null,this.turnId=null,this.consumedCallIds.clear()}isConfigured(){return!!(this.token&&this.executor)}bindThread(t){this.threadId=t,this.turnId=null,this.consumedCallIds.clear()}bindTurn(t,r){return!this.isConfigured()||!this.threadId||t!==this.threadId?!1:(this.turnId===r||(this.turnId=r,this.consumedCallIds.clear()),!0)}deactivateTurn(){this.abortController?.abort(),this.generation+=1,this.token=null,this.executor=null,this.abortController=null,this.turnId=null,this.consumedCallIds.clear()}reset(){this.deactivateTurn(),this.threadId=null}async execute(t){const r=c(t.threadId),o=c(t.turnId),n=c(t.callId),h=c(t.tool),a=f[h],d=this.token,l=this.executor,m=this.abortController,g=this.generation;if(!r||!o||!n||!a||t.namespace!==null||!d||!l||!m||r!==this.threadId||o!==this.turnId||this.consumedCallIds.has(n))return u("managed_room_tool_context_unavailable");const p=I(h,t.arguments);if(!p)return u("invalid_params");this.consumedCallIds.add(n);try{const s=await l({...p,context:d,action:a},{signal:m.signal,...a==="attachment.get"?{attachmentOutput:"codex-inline"}:{}});if(a==="pause"){const i=[{type:"inputText",text:JSON.stringify(s)}];return this.deactivateTurn(),{success:!0,contentItems:i}}if(g!==this.generation||d!==this.token||l!==this.executor||r!==this.threadId||o!==this.turnId)return u("managed_room_tool_context_revoked");if(a==="attachment.get"){const i=y(s);return i?{success:!0,contentItems:i}:u("managed_room_attachment_presentation_invalid")}return{success:!0,contentItems:[{type:"inputText",text:JSON.stringify(s)}]}}catch(s){const i=x(s);return u(i)}}}function y(e){if(!e||typeof e!="object"||Array.isArray(e))return null;const t=e.codexContentItems;if(!Array.isArray(t)||t.length<1||t.length>2)return null;const r=[];for(const o of t){if(!o||typeof o!="object"||Array.isArray(o))return null;const n=o;if(n.type==="inputText"&&typeof n.text=="string"){r.push({type:"inputText",text:n.text});continue}if(n.type==="inputImage"&&typeof n.imageUrl=="string"&&/^data:image\/(?:jpeg|png|webp|gif);base64,[A-Za-z0-9+/]*={0,2}$/.test(n.imageUrl)){r.push({type:"inputImage",imageUrl:n.imageUrl});continue}if(n.type==="inputAudio"&&typeof n.audioUrl=="string"&&/^data:audio\/(?:mpeg|mp4|ogg|wav|webm|x-wav);base64,[A-Za-z0-9+/]*={0,2}$/.test(n.audioUrl)){r.push({type:"inputAudio",audioUrl:n.audioUrl});continue}return null}return r}function c(e){return typeof e=="string"&&e.trim()?e.trim():""}function I(e,t){if(t==null)return{};if(typeof t!="object"||Array.isArray(t))return null;const r=t,o=_[e];return Object.keys(r).some(n=>!o.has(n))?null:r}function x(e){const t=e&&typeof e=="object"?e.code:void 0;return typeof t=="string"&&/^[a-z0-9_]{1,80}$/.test(t)?t:"managed_room_tool_failed"}function u(e){return{success:!1,contentItems:[{type:"inputText",text:e}]}}export{b as CODEX_MANAGED_ROOM_DYNAMIC_TOOLS,C as CodexManagedRoomToolBinding};
|
|
@@ -47,6 +47,8 @@ export declare class CodexAdapter extends AgentAdapter {
|
|
|
47
47
|
private configuredManagedRoomExecutor;
|
|
48
48
|
private managedRoomToolThreadId;
|
|
49
49
|
private preparedExternalOwnerThreadId;
|
|
50
|
+
private managedTurnReplay;
|
|
51
|
+
private managedAsyncRecovery;
|
|
50
52
|
constructor(options?: {
|
|
51
53
|
modelInstructionsFile?: string;
|
|
52
54
|
hidden?: boolean;
|
|
@@ -66,7 +68,7 @@ export declare class CodexAdapter extends AgentAdapter {
|
|
|
66
68
|
private configurationFingerprint;
|
|
67
69
|
private buildProcessEnv;
|
|
68
70
|
start(_sessionId: string, workDir: string, agentSessionId?: string | null): Promise<void>;
|
|
69
|
-
prepareSend(_text: string, modelId?: string, _reasoningEffort?: string, _attachments?: ChatAttachmentMeta[],
|
|
71
|
+
prepareSend(_text: string, modelId?: string, _reasoningEffort?: string, _attachments?: ChatAttachmentMeta[], agentSystemPrompt?: string | null, context?: AgentSendContext): Promise<void>;
|
|
70
72
|
send(text: string, modelId?: string, reasoningEffort?: string, attachments?: ChatAttachmentMeta[], agentSystemPrompt?: string | null, context?: AgentSendContext): Promise<void | AgentSendResult>;
|
|
71
73
|
private isThreadTailInterrupted;
|
|
72
74
|
private enqueueForExternalOwner;
|
|
@@ -86,10 +88,14 @@ export declare class CodexAdapter extends AgentAdapter {
|
|
|
86
88
|
private buildManagedPermissionConfig;
|
|
87
89
|
private resolveCodexProjectId;
|
|
88
90
|
private startTurnWithRecovery;
|
|
91
|
+
private startFreshManagedTurnWithReadinessRetry;
|
|
92
|
+
private logManagedThreadLifecycle;
|
|
89
93
|
private startTurn;
|
|
90
94
|
private interruptActiveTurn;
|
|
91
95
|
private sendRpc;
|
|
92
96
|
private handleAppServerMessage;
|
|
97
|
+
private scheduleManagedAsyncRolloutRecovery;
|
|
98
|
+
private recoverManagedTurnAfterAsyncRolloutFailure;
|
|
93
99
|
private handleManagedRoomToolCall;
|
|
94
100
|
private writeAppServerResponse;
|
|
95
101
|
private mapThreadStatusToRunPhase;
|
package/dist/src/agents/codex.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import{spawnSync as
|
|
2
|
-
`)}function
|
|
3
|
-
`)}function me(o,e,t){return["queue","--thread",o,"--message",
|
|
4
|
-
${
|
|
5
|
-
`,
|
|
6
|
-
`)}mapThreadStatusToRunPhase(e){const t=e?.type==="active"&&Array.isArray(e.activeFlags)?e.activeFlags:[];return t.includes("waitingOnApproval")?"waiting_approval":t.includes("waitingOnUserInput")?"waiting_user_input":"thinking"}handleAppServerNonJsonStdout(e){const t=se(e);ee(t)&&this.failAppServerStartup(new Error("Codex \u672A\u767B\u5F55\u3002\u8BF7\u5148\u5728\u8FD9\u53F0\u7535\u8111\u7684\u7EC8\u7AEF\u8FD0\u884C `codex`\uFF0C\u6309\u63D0\u793A\u5B8C\u6210 ChatGPT \u767B\u5F55\u6216\u914D\u7F6E API key\uFF0C\u7136\u540E\u518D\u56DE\u5230\u795E\u5FF5\u53D1\u9001\u6D88\u606F\u3002"))}failAppServerStartup(e){this.appServerStartupError||(this.appServerStartupError=e,this.rejectAllPending(e),this.process?.kill("SIGTERM"))}handleAppServerCompletedItem(e){const t=typeof e.item=="object"&&e.item!==null?e.item:null;if(!(!t||typeof t.type!="string")&&!
|
|
7
|
-
(exit ${t.exitCode})`:""].join("").trim()});break}case"mcpToolCall":case"dynamicToolCall":{const r=typeof t.tool=="string"?t.tool:t.type;if(
|
|
8
|
-
(exit ${t.exit_code})`:""];this.emitEvent({state:"tool-result",name:"command_execution",result:r.join("").trim()||String(t.status??"")})}break}case"mcp_tool_call":{if(t.tool&&
|
|
9
|
-
`);this.emitText(r,"block")}break}case"approval_request":case"approvalRequest":case"permission_request":case"permissionRequest":case"user_input_required":case"userInputRequired":{(e.type==="item.started"||e.type==="item.completed")&&this.emitApprovalPending(t);break}case"error":{e.type==="item.completed"&&t.message&&this.emitEvent({state:"error",message:t.message});break}default:break}}handleStreamEvent(e){const t=e.type??e.event;switch(t?.startsWith("item.")&&this.handleCodexItemLine(e),t){case"turn.completed":{const s=e.usage;if(s){const i=s.input_tokens??s.prompt_tokens,n=s.output_tokens??s.completion_tokens;(i!=null||n!=null)&&(this.pendingUsage={inputTokens:i??0,outputTokens:n??0})}this.emitFinalIfOpen();return}case"turn.failed":{const s=typeof e.error=="object"&&e.error?.message?e.error.message:typeof e.error=="string"?e.error:"turn failed";this.emitErrorIfOpen(s);return}case"error":{const s=typeof e.message=="string"?e.message:"";if(s.includes("Reconnecting"))return;this.emitErrorIfOpen(s||(typeof e.error=="string"?e.error:"stream error"));return}case"thread.started":{const s=e.thread_id??e.session_id??e.id;typeof s=="string"&&s&&(this.agentSessionId=s,this.emitEvent({state:"start",agentSessionId:this.agentSessionId}));return}case"turn.started":return}if(t?.startsWith("item."))return;switch(e.type??e.event){case"message":case"text":case"content":{const s=e.content??e.text;s&&this.emitText(s);break}case"function_call":case"tool_call":{if(this.isApprovalLikeName(e.name)){this.emitApprovalPending(e);break}if(e.name&&
|
|
1
|
+
import{spawnSync as O}from"node:child_process";import{createInterface as w}from"node:readline";import{createHash as S,randomUUID as b}from"node:crypto";import p from"node:path";import{AgentAdapter as q,registerAgent as D}from"./adapter.js";import{resolveBuiltinCommand as v,spawnAgentCommand as x}from"./command-spec.js";import{buildAgentProcessEnv as L,buildManagedAgentProcessEnv as N}from"../agent-env.js";import{ensurePlatformInstructionsFile as F}from"./platform-instructions.js";import{CODEX_DESKTOP_SEND_UNAVAILABLE as C}from"@shennian/wire";import{isCodexThreadTailInterrupted as $}from"../native-fusion/codex-files.js";import{resolveManagedAgentAdapterEnforcement as U}from"../security/managed-agent-policy.js";import{registerManagedAgentRuntimeSecurity as W}from"../security/managed-agent-runtime.js";import{CODEX_MANAGED_ROOM_DYNAMIC_TOOLS as z,CodexManagedRoomToolBinding as B}from"./codex-managed-room-tools.js";import{assertCodexManagedPermissionProfile as E,CODEX_MANAGED_RUNTIME_SECURITY as G,compileCodexManagedPermissions as J,extractCodexMcpServerNames as H}from"./codex-managed-permissions.js";import{CODEX_APP_SERVER_CLIENT_INFO as V,extractAppServerErrorMessage as R,formatCodexErrorMessage as X,formatTransientCodexStatus as K,isCodexCollabAgentItem as Q,isCodexCollabAgentToolName as y,isCodexLegacyCollabAgentItem as Y,isCodexUnsupportedEffortError as j,isMissingCodexRolloutError as T,isTransientCodexErrorMessage as Z,looksLikeCodexInteractiveAuthPrompt as ee,looksLikeFatalCodexStderr as te,normalizeCodexModelId as I,normalizeCodexReasoningEffort as re,normalizeCodexStderr as _,normalizeTerminalText as se,safeStringify as k,stripGitDirectiveArtifacts as ne}from"./codex-utils.js";import{isCodexUnsupportedEffortError as be,isMissingCodexRolloutError as qe,normalizeCodexModelId as De,normalizeCodexReasoningEffort as Le}from"./codex-utils.js";W("codex",G);function P(o){const e=o instanceof Error?o.message:String(o);return/already has an active writer|thread-store conflict/i.test(e)}function ie(o){const e=o instanceof Error?o.message:String(o);return/paginated(?:_threads|\s+(?:thread\s+)?history)?.*(?:not supported|unsupported|unavailable)/i.test(e)||/(?:not supported|unsupported|unavailable).*paginated(?:_threads|\s+(?:thread\s+)?history)?/i.test(e)}function oe(o){const e=o instanceof Error?o.message:String(o);return/unknown field [`'"]?excludeTurns/i.test(e)||/excludeTurns.*(?:not supported|unsupported|unavailable)/i.test(e)}function ae(o){const e=o instanceof Error?o.message:String(o);return/(?:method not found|unknown method).*(?:project\/list|project\/create)/i.test(e)||/(?:project\/list|project\/create).*(?:not supported|unsupported|unavailable)/i.test(e)}function de(o,e){const t=p.resolve(e);let r;for(const s of o)if(s.id)for(const i of s.roots??[]){if(!i.path)continue;const n=p.resolve(i.path),a=p.relative(n,t);!(a===""||!a.startsWith("..")&&!p.isAbsolute(a))||n.length<=(r?.rootLength??-1)||(r={id:s.id,rootLength:n.length})}return r?.id}function le(o,e){const t=e?.flatMap(s=>ce(s)).filter(s=>!/^https?:\/\//i.test(s.path)).filter(s=>s.path);return{type:"text",text:he(o,e),text_elements:[],...t?.length?{local_images:t}:{}}}function ce(o){if(o.kind==="image")return o.previewData?[{path:o.path,data:o.previewData,mimeType:o.mimeType}]:[{path:o.path}];if(o.mimeType.startsWith("video/")){const e=ue(o.path);return e?[{path:e}]:[]}return[]}function ue(o){if(!o||/^https?:\/\//i.test(o))return null;const e=p.extname(o),r=`${e?o.slice(0,-e.length):o}.preview.png`;return O("ffmpeg",["-y","-ss","0","-i",o,"-frames:v","1","-vf","scale=320:-1",r],{stdio:"ignore",timeout:15e3}).status===0?r:null}function he(o,e){const t=e?.filter(i=>i.kind!=="image").filter(i=>i.path&&!/^https?:\/\//i.test(i.path));if(!t?.length||t.every(i=>o.includes(i.path)))return o;const s=t.map((i,n)=>{const a=i.name||`attachment-${n+1}`,d=i.mimeType?` (${i.mimeType})`:"";return`[${A(a)}${d}](<${i.path}>)`});return[o,"",...s].join(`
|
|
2
|
+
`)}function pe(o,e){const t=e?.filter(s=>s.path&&!/^https?:\/\//i.test(s.path)&&!o.includes(s.path));if(!t?.length)return o;const r=t.map((s,i)=>{const n=A(s.name||`attachment-${i+1}`);return s.kind==="image"?``:`[${n}](<${s.path}>)`});return[o,"",...r].join(`
|
|
3
|
+
`)}function me(o,e,t){return["queue","--thread",o,"--message",pe(e,t)]}function A(o){return o.replace(/[[\]\\]/g,"\\$&")}class ge extends q{options;type="codex";process=null;workDir=null;seq=0;runId="";pendingUsage;agentSessionId=null;hasEmittedText=!1;textTail="";terminalState="open";forceCloseTimer=null;stderrBuf="";rpcSeq=1;pendingRequests=new Map;appServerReady=null;appServerStartupError=null;activeTurnId=null;deltaItemIds=new Set;lastTransientStatus="";agentSystemPrompt="";managedAgentPolicy=null;managedPermissionConfig=null;configurationRestartRequired=!1;managedRoomTools=new B;configuredManagedRoomContextToken=null;configuredManagedRoomExecutor=null;managedRoomToolThreadId=null;preparedExternalOwnerThreadId=null;managedTurnReplay=null;managedAsyncRecovery=null;constructor(e={}){super(),this.options=e}externalChannel=null;shennianSessionId=null;extraEnv={};configure(e){const t=this.configurationFingerprint();this.shennianSessionId=e.sessionId??null,this.externalChannel=e.externalChannel??null,this.extraEnv=e.env??{},"managedAgentPolicy"in e&&(this.managedAgentPolicy=e.managedAgentPolicy??null),("managedRoomContextToken"in e||"managedRoomExecutor"in e)&&(this.managedRoomTools.deactivateTurn(),this.configuredManagedRoomContextToken=e.managedRoomContextToken?.trim()||null,this.configuredManagedRoomExecutor=e.managedRoomExecutor??null),this.managedAgentPolicy&&(this.workDir=this.managedAgentPolicy.adapterPolicy.workDir);const r=this.configurationFingerprint();t!==r&&this.process&&(this.configurationRestartRequired=!0)}configurationFingerprint(){const e=Object.keys(this.extraEnv).sort().map(t=>[t,this.extraEnv[t]??null]);return S("sha256").update(JSON.stringify({sessionId:this.shennianSessionId,externalChannel:this.externalChannel,env:e,managedAgentPolicy:this.managedAgentPolicy})).digest("hex")}buildProcessEnv(e={}){if(!this.managedAgentPolicy)return L({...e,...this.extraEnv});const t=Object.fromEntries(Object.entries(this.extraEnv).filter(([r])=>r!=="SHENNIAN_MANAGED_ROOM_CONTEXT"&&r!=="SHENNIAN_MANAGED_ROOM_IPC_ROOT"));return N({agentType:"codex",providerEnv:t,sessionEnv:t,runtimeEnv:e})}async start(e,t,r){this.workDir=this.managedAgentPolicy?.adapterPolicy.workDir??t,this.seq=0,r&&(this.agentSessionId=r)}async prepareSend(e,t,r,s,i,n){const a=i?.trim()??"";if(a!==this.agentSystemPrompt&&(this.agentSystemPrompt=a,this.process&&await this.killProcess(!0)),!(!this.agentSessionId||this.activeTurnId)){this.preparedExternalOwnerThreadId=null;try{await this.ensureAppServer(I(t))}catch(d){if(!P(d))throw d;if(n?.source==="room_activation")throw new Error("codex_managed_thread_owned_externally",{cause:d});if(this.isThreadTailInterrupted(this.agentSessionId))throw new Error(C,{cause:d});this.preparedExternalOwnerThreadId=this.agentSessionId}}}async send(e,t,r,s,i,n){if(n?.source==="room_activation"&&!this.managedAgentPolicy)throw new Error("managed_agent_policy_missing");if(n?.source==="room_activation"&&(!this.configuredManagedRoomContextToken||!this.configuredManagedRoomExecutor))throw new Error("codex_managed_room_tool_context_unavailable");this.activeTurnId&&(await this.interruptActiveTurn().catch(()=>{}),await this.killProcess(!0)),this.configurationRestartRequired&&this.process&&await this.killProcess(!0),this.configurationRestartRequired=!1;const a=I(t),d=re(r),c=i?.trim()??"";if(c!==this.agentSystemPrompt&&(this.agentSystemPrompt=c,this.process&&await this.killProcess(!0)),n?.source==="room_activation"&&this.managedRoomTools.configure(this.configuredManagedRoomContextToken,this.configuredManagedRoomExecutor),this.runId=b(),this.seq=0,this.resetRunState(),this.agentSessionId&&this.preparedExternalOwnerThreadId===this.agentSessionId)return this.preparedExternalOwnerThreadId=null,{deliveryMode:"external_owner_queue",queuedSubmissionId:await this.enqueueForExternalOwner(this.agentSessionId,e,s)};try{await this.ensureAppServer(a)}catch(h){if(!this.agentSessionId||!P(h))throw h;if(n?.source==="room_activation")throw new Error("codex_managed_thread_owned_externally",{cause:h});if(this.isThreadTailInterrupted(this.agentSessionId))throw new Error(C,{cause:h});return{deliveryMode:"external_owner_queue",queuedSubmissionId:await this.enqueueForExternalOwner(this.agentSessionId,e,s)}}const l=this.agentSessionId;if(!l)throw new Error("codex app-server did not create a thread");this.emitEvent({state:"start",agentSessionId:l}),this.managedTurnReplay=this.managedPermissionConfig?{text:e,modelId:a,reasoningEffort:d,attachments:s,recoveryCount:0}:null;const g=await this.startTurnWithRecovery(l,e,a,d,s),m=this.agentSessionId??l;if(this.activeTurnId=g.turn?.id??null,this.managedPermissionConfig&&this.activeTurnId&&!this.managedRoomTools.bindTurn(m,this.activeTurnId))throw await this.killProcess(),new Error("codex_managed_room_turn_binding_failed");return{deliveryMode:"direct"}}isThreadTailInterrupted(e){return this.options.isThreadTailInterrupted?.(e)??$(e)}async enqueueForExternalOwner(e,t,r){const s=v("codex");if(!s)throw new Error('Command "codex" not found. Is OpenAI Codex CLI installed?');const i=me(e,t,r),n=x(s,i,{cwd:this.workDir??void 0,stdio:["ignore","pipe","pipe"],env:this.buildProcessEnv({NO_COLOR:"1"})});return await new Promise((a,d)=>{let c="",l="",g=!1;const m=(u,f)=>{g||(g=!0,clearTimeout(h),u?d(u):a(f))},h=setTimeout(()=>{n.kill("SIGTERM"),m(new Error("Codex Desktop message queue timed out"))},6e4);h.unref?.(),n.stdout?.on("data",u=>{c+=u.toString()}),n.stderr?.on("data",u=>{l+=u.toString()}),n.once("error",u=>m(u)),n.once("close",u=>{const f=`${c}
|
|
4
|
+
${l}`.trim();if(u!==0){m(new Error(f||`codex queue exited with code ${u??"unknown"}`));return}const M=f.match(/Queued message\s+([^\s]+)\s+for thread/i)?.[1];m(void 0,M)})})}async resume(e){await this.killProcess(),this.agentSessionId=e,this.resetTextState()}async setTitle(e,t,r){const s=e.trim(),i=t.replace(/\s+/g," ").trim();!s||!i||(this.agentSessionId=s,r?.trim()&&(this.workDir=r),await this.ensureAppServer(),await this.sendRpc("thread/name/set",{threadId:s,name:i}))}async stop(){this.managedRoomTools.deactivateTurn(),await this.interruptActiveTurn().catch(()=>{}),await this.killProcess()}async getStatus(){const e=this.agentSessionId,t=this.activeTurnId;if(!e||!this.process)return{active:!1,runId:t,runPhase:null,canStop:!1};let r=null;try{r=(await this.sendRpc("thread/read",{threadId:e,includeTurns:!1},5e3)).thread?.status??null}catch{}const s=r?.type==="active"||!!t;return{active:s,runId:t,runPhase:s?this.mapThreadStatusToRunPhase(r):null,canStop:!!(s&&t&&this.process)}}spawnCodex(e){const t=v("codex");if(!t){this.emit("error",new Error('Command "codex" not found. Is OpenAI Codex CLI installed?'));return}const r=x(t,e,{cwd:this.workDir??void 0,stdio:["ignore","pipe","pipe"],env:this.buildProcessEnv()});this.process=r,w({input:r.stdout}).on("line",n=>{if(n.trim())try{const a=JSON.parse(n);this.handleStreamEvent(a)}catch{this.emitEvent({state:"delta",text:n})}});let i="";r.stderr?.on("data",n=>{i+=n.toString()}),r.on("close",n=>{this.process===r&&(this.process=null,this.clearForceCloseTimer(),this.handleProcessClose(n,i))}),r.on("error",n=>{this.process===r&&(this.process=null,n.code==="ENOENT"?this.emit("error",new Error('Command "codex" not found. Is OpenAI Codex CLI installed?')):this.emit("error",n))})}spawnAppServer(){const e=v("codex");if(!e){this.emit("error",new Error('Command "codex" not found. Is OpenAI Codex CLI installed?'));return}const t=["app-server","--listen","stdio://"],r=this.options.modelInstructionsFile??F(this.workDir??process.cwd(),this.externalChannel,this.shennianSessionId??void 0,this.agentSystemPrompt);r&&t.push("-c",`model_instructions_file=${JSON.stringify(r)}`);const s=x(e,t,{cwd:this.workDir??void 0,stdio:["pipe","pipe","pipe"],env:this.buildProcessEnv({NO_COLOR:"1"})});this.process=s,this.stderrBuf="",this.appServerStartupError=null,w({input:s.stdout}).on("line",n=>{if(!n.trim())return;let a;try{a=JSON.parse(n)}catch{this.handleAppServerNonJsonStdout(n);return}this.handleAppServerMessage(a)}),s.stderr?.on("data",n=>{this.stderrBuf+=n.toString()}),s.on("close",n=>{if(this.process!==s)return;const a=this.activeTurnId!=null;this.process=null,this.appServerReady=null,this.activeTurnId=null,this.managedRoomTools.reset(),this.clearConfiguredManagedRoomContext(),this.rejectAllPending(new Error(_(this.stderrBuf)||`codex app-server exited with code ${n}`)),this.terminalState==="open"&&a&&this.handleProcessClose(n,this.stderrBuf)}),s.on("error",n=>{this.process===s&&(this.process=null,this.managedRoomTools.reset(),this.clearConfiguredManagedRoomContext(),this.rejectAllPending(n),n.code==="ENOENT"?this.emit("error",new Error('Command "codex" not found. Is OpenAI Codex CLI installed?')):this.emit("error",n))})}async ensureAppServer(e){return this.appServerReady?this.appServerReady:(this.spawnAppServer(),this.appServerReady=this.initializeAppServer(e).catch(async t=>{throw this.appServerReady=null,await this.killProcess(),t}),this.appServerReady)}async initializeAppServer(e){const t=I(e);if(await this.sendRpc("initialize",{clientInfo:V,capabilities:{experimentalApi:!0}}),this.managedPermissionConfig=this.managedAgentPolicy?await this.buildManagedPermissionConfig():null,this.managedPermissionConfig&&!this.managedRoomTools.isConfigured()&&(this.managedRoomTools.configure(this.configuredManagedRoomContextToken,this.configuredManagedRoomExecutor),!this.managedRoomTools.isConfigured()))throw new Error("codex_managed_room_tool_context_unavailable");if(this.agentSessionId&&this.managedPermissionConfig&&this.agentSessionId!==this.managedRoomToolThreadId){if(!this.managedRoomTools.isConfigured())throw new Error("codex_managed_room_tool_context_unavailable");this.agentSessionId=null}if(this.agentSessionId){const a={threadId:this.agentSessionId,cwd:this.workDir,approvalPolicy:"never",...this.managedPermissionConfig?{config:this.managedPermissionConfig.threadConfig}:{sandbox:"danger-full-access"},persistExtendedHistory:!0,...this.options.hidden?{threadSource:"subagent"}:{},...t?{model:t}:{}};let d;try{d=await this.sendRpc("thread/resume",{...a,excludeTurns:!0})}catch(c){if(!oe(c))throw c;d=await this.sendRpc("thread/resume",a)}this.agentSessionId=d.thread?.id??this.agentSessionId,this.managedPermissionConfig&&(E(d,this.managedPermissionConfig.profileId),this.managedRoomTools.bindThread(this.agentSessionId),this.managedRoomToolThreadId=this.agentSessionId);return}const r=this.options.hidden?void 0:await this.resolveCodexProjectId(),s={cwd:this.workDir,approvalPolicy:"never",...this.managedPermissionConfig?{config:this.managedPermissionConfig.threadConfig}:{sandbox:"danger-full-access"},serviceName:"Shennian",threadSource:this.options.hidden?"subagent":"user",experimentalRawEvents:!1,persistExtendedHistory:!0,...this.managedPermissionConfig?{dynamicTools:z}:{},...r?{projectId:r}:{},...t?{model:t}:{}};let i;if(this.options.hidden&&!this.managedPermissionConfig)i=await this.sendRpc("thread/start",s);else try{i=await this.sendRpc("thread/start",{...s,historyMode:"paginated"})}catch(a){throw ie(a)?new Error("\u5F53\u524D Codex CLI \u4E0D\u652F\u6301\u521B\u5EFA\u53EF\u5728 Codex Desktop \u4E2D\u7EE7\u7EED\u7684\u65B0\u4F1A\u8BDD\uFF0C\u8BF7\u624B\u52A8\u5347\u7EA7 Codex CLI \u540E\u91CD\u8BD5\u3002\u795E\u5FF5\u4E0D\u4F1A\u81EA\u52A8\u5347\u7EA7\uFF0C\u4E5F\u4E0D\u4F1A\u964D\u7EA7\u521B\u5EFA\u4E0D\u53EF\u89C1\u7684 legacy \u4F1A\u8BDD\u3002",{cause:a}):a}const n=i.thread?.id;if(!n)throw new Error("codex app-server thread/start returned no thread id");this.managedPermissionConfig&&(E(i,this.managedPermissionConfig.profileId),this.managedRoomTools.bindThread(n),this.managedRoomToolThreadId=n),this.agentSessionId=n}async buildManagedPermissionConfig(){const e=this.managedAgentPolicy;if(!e)throw new Error("managed_agent_policy_missing");const t=e.adapterPolicy.externalCapabilities.mcp?[]:H(await this.sendRpc("config/read",{cwd:e.adapterPolicy.workDir}));return J(U(e),e.adapterPolicy.workDir,{configuredMcpServerNames:t,shellSubprocessPolicy:e.environmentPolicy.shellSubprocess})}async resolveCodexProjectId(){const e=this.workDir?.trim();if(e)try{const t=[];let r;do{const c=await this.sendRpc("project/list",{limit:100,...r?{cursor:r}:{}});t.push(...c.data??[]),r=c.nextCursor}while(r);const s=de(t,e);if(s)return s;const i=p.resolve(e),n=`shennian-project-${S("sha256").update(i).digest("hex")}`,d=(await this.sendRpc("project/create",{idempotencyKey:n,name:p.basename(i)||i,roots:[{path:i}],metadata:{createdBy:"Shennian"}})).project?.id;if(!d)throw new Error("codex app-server project/create returned no project id");return d}catch(t){throw ae(t)?new Error("\u5F53\u524D Codex CLI \u4E0D\u652F\u6301\u521B\u5EFA\u53EF\u5F52\u5C5E\u5230 Codex Desktop \u9879\u76EE\u7684\u65B0\u4F1A\u8BDD\uFF0C\u8BF7\u624B\u52A8\u5347\u7EA7 Codex CLI \u540E\u91CD\u8BD5\u3002\u795E\u5FF5\u4E0D\u4F1A\u81EA\u52A8\u5347\u7EA7\uFF0C\u4E5F\u4E0D\u4F1A\u76F4\u63A5\u4FEE\u6539 Codex Desktop \u7684\u79C1\u6709\u4FA7\u680F\u7D22\u5F15\u3002",{cause:t}):t}}async startTurnWithRecovery(e,t,r,s,i){try{return await this.startTurn(e,t,r,s,i)}catch(n){if(!T(n))throw n;if(this.managedPermissionConfig){this.logManagedThreadLifecycle("rollout.missing",{threadId:e,recovery:"recreate"}),await this.killProcess(!0),this.agentSessionId=null,this.managedRoomToolThreadId=null,await this.ensureAppServer(r);const a=this.agentSessionId;if(!a)throw new Error("codex app-server did not recreate the managed thread",{cause:n});return this.logManagedThreadLifecycle("thread.recreated",{previousThreadId:e,threadId:a}),this.emitEvent({state:"start",agentSessionId:a}),await this.startFreshManagedTurnWithReadinessRetry(a,t,r,s,i)}return await this.killProcess(),await this.ensureAppServer(r),await this.startTurn(e,t,r,s,i)}}async startFreshManagedTurnWithReadinessRetry(e,t,r,s,i){const n=[0,100,300,1e3];let a;for(let d=0;d<n.length;d+=1){const c=n[d];c>0&&await new Promise(l=>setTimeout(l,c));try{const l=await this.startTurn(e,t,r,s,i);return d>0&&this.logManagedThreadLifecycle("rollout.ready",{threadId:e,attempt:d+1}),l}catch(l){if(a=l,!T(l)||d===n.length-1)throw l;this.logManagedThreadLifecycle("rollout.retry",{threadId:e,attempt:d+2,delayMs:n[d+1]})}}throw a}logManagedThreadLifecycle(e,t){console.error(`[codex.managed] ${JSON.stringify({event:e,...t})}`)}async startTurn(e,t,r,s,i){try{return await this.sendRpc("turn/start",{threadId:e,input:[le(t,i)],approvalPolicy:"never",...this.managedPermissionConfig?{}:{sandboxPolicy:{type:"dangerFullAccess"}},...r?{model:r}:{},...s?{effort:s}:{}})}catch(n){throw s&&j(n)?new Error(`Codex app-server does not accept reasoning effort "${s}" for this turn. Refresh models or upgrade Codex CLI, then retry.`,{cause:n}):n}}async interruptActiveTurn(){const e=this.agentSessionId,t=this.activeTurnId;this.activeTurnId=null,this.managedRoomTools.deactivateTurn(),!(!e||!t||!this.process)&&await this.sendRpc("turn/interrupt",{threadId:e,turnId:t},5e3)}sendRpc(e,t,r=6e4){if(this.appServerStartupError)return Promise.reject(this.appServerStartupError);const s=this.process;if(!s?.stdin)return Promise.reject(new Error("codex app-server is not running"));const i=this.rpcSeq++,n=JSON.stringify({id:i,method:e,params:t});return new Promise((a,d)=>{const c=setTimeout(()=>{this.pendingRequests.delete(i),d(new Error(`codex app-server request timed out: ${e}`))},r);this.pendingRequests.set(i,{resolve:a,reject:d,timer:c}),s.stdin.write(`${n}
|
|
5
|
+
`,l=>{l&&(clearTimeout(c),this.pendingRequests.delete(i),d(l))})})}handleAppServerMessage(e){if(e.method==="item/tool/call"&&e.id!=null){this.handleManagedRoomToolCall(e.id,e.params??{});return}if(e.id!=null){const r=typeof e.id=="number"?this.pendingRequests.get(e.id):void 0;r&&(clearTimeout(r.timer),this.pendingRequests.delete(e.id),e.error?r.reject(new Error(e.error.message||`codex app-server error ${e.error.code??""}`.trim())):r.resolve(e.result))}if(!e.method)return;const t=e.params??{};switch(e.method){case"turn/started":{const r=typeof t.turn=="object"&&t.turn!==null?t.turn:null,s=typeof r?.id=="string"?r.id:null,i=typeof t.threadId=="string"?t.threadId:"";s&&(this.activeTurnId=s,this.managedPermissionConfig&&!this.managedRoomTools.bindTurn(i,s)&&this.emitErrorIfOpen("codex_managed_room_turn_binding_failed"));break}case"thread/status/changed":{const r=typeof t.threadId=="string"?t.threadId:"";if(r&&this.agentSessionId&&r!==this.agentSessionId)break;const s=typeof t.status=="object"&&t.status!==null?t.status:null;s?.type==="active"&&this.emitEvent({state:"heartbeat",runPhase:this.mapThreadStatusToRunPhase(s)});break}case"item/agentMessage/delta":{const r=typeof t.itemId=="string"?t.itemId:"";r&&this.deltaItemIds.add(r),typeof t.delta=="string"&&this.emitText(t.delta);break}case"item/completed":this.handleAppServerCompletedItem(t);break;case"thread/tokenUsage/updated":this.handleAppServerUsage(t);break;case"turn/completed":{const r=typeof t.turn=="object"&&t.turn!==null?t.turn:null,s=typeof r?.id=="string"?r.id:null;(!this.activeTurnId||s===this.activeTurnId)&&(this.activeTurnId=null,this.managedRoomTools.deactivateTurn(),this.emitFinalIfOpen());break}case"turn/failed":{const r=R(t);if(this.scheduleManagedAsyncRolloutRecovery(r))return;this.emitErrorIfOpen(r||"turn failed");break}case"error":{const r=R(t);if(Z(r)){this.emitTransientStatus(r);return}if(this.scheduleManagedAsyncRolloutRecovery(r))return;this.emitErrorIfOpen(r);break}}}scheduleManagedAsyncRolloutRecovery(e){if(!this.managedPermissionConfig||!this.managedTurnReplay||!T(new Error(e)))return!1;if(this.managedAsyncRecovery)return!0;if(this.managedTurnReplay.recoveryCount>=2)return!1;this.managedTurnReplay.recoveryCount+=1;const t=this.managedTurnReplay.recoveryCount;return this.logManagedThreadLifecycle("rollout.failed-async",{threadId:this.agentSessionId,recoveryCount:t}),this.managedAsyncRecovery=this.recoverManagedTurnAfterAsyncRolloutFailure().catch(r=>{const s=T(r)?"no rollout found after managed thread recovery":r instanceof Error?r.message:"managed thread recovery failed";this.emitErrorIfOpen(s)}).finally(()=>{this.managedAsyncRecovery=null}),!0}async recoverManagedTurnAfterAsyncRolloutFailure(){const e=this.managedTurnReplay,t=this.agentSessionId;if(!e||!t||this.terminalState!=="open")return;this.activeTurnId=null,this.managedRoomTools.deactivateTurn(),await this.killProcess(!0),this.agentSessionId=null,this.managedRoomToolThreadId=null,await this.ensureAppServer(e.modelId);const r=this.agentSessionId;if(!r)throw new Error("codex app-server did not recreate the managed thread");this.logManagedThreadLifecycle("thread.recreated-async",{previousThreadId:t,threadId:r,recoveryCount:e.recoveryCount}),this.emitEvent({state:"start",agentSessionId:r});const s=await this.startFreshManagedTurnWithReadinessRetry(r,e.text,e.modelId,e.reasoningEffort,e.attachments);if(this.activeTurnId=s.turn?.id??null,this.activeTurnId&&!this.managedRoomTools.bindTurn(r,this.activeTurnId))throw new Error("codex_managed_room_turn_binding_failed")}async handleManagedRoomToolCall(e,t){const r=await this.managedRoomTools.execute(t);if(this.writeAppServerResponse(e,r),r.success&&t.tool==="shennian_room_send"){const s=typeof t.arguments=="object"&&t.arguments!==null?t.arguments:null,i=typeof s?.text=="string"?s.text.trim():"";i&&this.emitText(i,"block")}}writeAppServerResponse(e,t){const r=this.process;r?.stdin&&r.stdin.write(`${JSON.stringify({id:e,result:t})}
|
|
6
|
+
`)}mapThreadStatusToRunPhase(e){const t=e?.type==="active"&&Array.isArray(e.activeFlags)?e.activeFlags:[];return t.includes("waitingOnApproval")?"waiting_approval":t.includes("waitingOnUserInput")?"waiting_user_input":"thinking"}handleAppServerNonJsonStdout(e){const t=se(e);ee(t)&&this.failAppServerStartup(new Error("Codex \u672A\u767B\u5F55\u3002\u8BF7\u5148\u5728\u8FD9\u53F0\u7535\u8111\u7684\u7EC8\u7AEF\u8FD0\u884C `codex`\uFF0C\u6309\u63D0\u793A\u5B8C\u6210 ChatGPT \u767B\u5F55\u6216\u914D\u7F6E API key\uFF0C\u7136\u540E\u518D\u56DE\u5230\u795E\u5FF5\u53D1\u9001\u6D88\u606F\u3002"))}failAppServerStartup(e){this.appServerStartupError||(this.appServerStartupError=e,this.rejectAllPending(e),this.process?.kill("SIGTERM"))}handleAppServerCompletedItem(e){const t=typeof e.item=="object"&&e.item!==null?e.item:null;if(!(!t||typeof t.type!="string")&&!Q(t))switch(t.type){case"agentMessage":{const r=typeof t.id=="string"?t.id:"";if(r&&this.deltaItemIds.has(r))return;typeof t.text=="string"&&this.emitText(t.text,"block");break}case"commandExecution":{const r=typeof t.command=="string"?t.command:"",s=typeof t.aggregatedOutput=="string"?t.aggregatedOutput:"";r&&this.emitEvent({state:"tool-call",name:"command_execution",args:{command:r}}),this.emitEvent({state:"tool-result",name:"command_execution",result:[s,t.exitCode!=null?`
|
|
7
|
+
(exit ${t.exitCode})`:""].join("").trim()});break}case"mcpToolCall":case"dynamicToolCall":{const r=typeof t.tool=="string"?t.tool:t.type;if(y(r))return;const s=typeof t.arguments=="object"&&t.arguments!==null?t.arguments:{};this.emitEvent({state:"tool-call",name:r,args:s}),this.emitEvent({state:"tool-result",name:r,result:k(t.error??t.result??t.contentItems??"")});break}case"fileChange":break;case"approvalRequest":case"approval_request":case"permissionRequest":case"permission_request":case"userInputRequired":case"user_input_required":{this.emitApprovalPending(t);break}}}handleAppServerUsage(e){const t=typeof e.tokenUsage=="object"&&e.tokenUsage!==null?e.tokenUsage:null,r=typeof t?.last=="object"&&t.last!==null?t.last:null,s=typeof t?.total=="object"&&t.total!==null?t.total:null,i=r??s;if(!i)return;const n=typeof i.inputTokens=="number"?i.inputTokens:void 0,a=typeof i.outputTokens=="number"?i.outputTokens:void 0;(n!=null||a!=null)&&(this.pendingUsage={inputTokens:n??0,outputTokens:a??0})}handleCodexItemLine(e){const t=e.item;if(t?.type&&!Y(t))switch(t.type){case"agent_message":case"reasoning":{e.type==="item.completed"&&t.text&&this.emitText(t.text,"block");break}case"command_execution":{if(e.type==="item.started"&&t.command&&this.emitEvent({state:"tool-call",name:"command_execution",args:{command:t.command}}),e.type==="item.completed"){const r=[t.aggregated_output??"",t.exit_code!=null?`
|
|
8
|
+
(exit ${t.exit_code})`:""];this.emitEvent({state:"tool-result",name:"command_execution",result:r.join("").trim()||String(t.status??"")})}break}case"mcp_tool_call":{if(t.tool&&y(t.tool))return;if(e.type==="item.started"&&this.emitEvent({state:"tool-call",name:t.tool??"mcp_tool",args:{server:t.server,...t.arguments&&typeof t.arguments=="object"?t.arguments:{}}}),e.type==="item.completed"){const r=t.error&&typeof t.error=="object"?t.error.message:void 0;this.emitEvent({state:"tool-result",name:t.tool??"mcp_tool",result:r??k(t.result)})}break}case"file_change":break;case"web_search":{e.type==="item.completed"&&t.query&&this.emitText(`[web_search] ${t.query}`,"block");break}case"todo_list":{if(e.type==="item.completed"&&t.items?.length){const r=t.items.map(s=>`- [${s.completed?"x":" "}] ${s.text}`).join(`
|
|
9
|
+
`);this.emitText(r,"block")}break}case"approval_request":case"approvalRequest":case"permission_request":case"permissionRequest":case"user_input_required":case"userInputRequired":{(e.type==="item.started"||e.type==="item.completed")&&this.emitApprovalPending(t);break}case"error":{e.type==="item.completed"&&t.message&&this.emitEvent({state:"error",message:t.message});break}default:break}}handleStreamEvent(e){const t=e.type??e.event;switch(t?.startsWith("item.")&&this.handleCodexItemLine(e),t){case"turn.completed":{const s=e.usage;if(s){const i=s.input_tokens??s.prompt_tokens,n=s.output_tokens??s.completion_tokens;(i!=null||n!=null)&&(this.pendingUsage={inputTokens:i??0,outputTokens:n??0})}this.emitFinalIfOpen();return}case"turn.failed":{const s=typeof e.error=="object"&&e.error?.message?e.error.message:typeof e.error=="string"?e.error:"turn failed";this.emitErrorIfOpen(s);return}case"error":{const s=typeof e.message=="string"?e.message:"";if(s.includes("Reconnecting"))return;this.emitErrorIfOpen(s||(typeof e.error=="string"?e.error:"stream error"));return}case"thread.started":{const s=e.thread_id??e.session_id??e.id;typeof s=="string"&&s&&(this.agentSessionId=s,this.emitEvent({state:"start",agentSessionId:this.agentSessionId}));return}case"turn.started":return}if(t?.startsWith("item."))return;switch(e.type??e.event){case"message":case"text":case"content":{const s=e.content??e.text;s&&this.emitText(s);break}case"function_call":case"tool_call":{if(this.isApprovalLikeName(e.name)){this.emitApprovalPending(e);break}if(e.name&&y(e.name))return;this.emitEvent({state:"tool-call",name:e.name,args:e.arguments??e.input});break}case"function_call_output":case"tool_result":{if(e.name&&y(e.name))return;this.emitEvent({state:"tool-result",name:e.name,result:e.output??e.result});break}case"approval_request":case"approvalRequest":case"permission_request":case"permissionRequest":case"user_input_required":case"userInputRequired":{this.emitApprovalPending(e);break}case"error":break;case"done":case"completed":{e.usage&&(this.pendingUsage={inputTokens:e.usage.prompt_tokens??e.usage.input_tokens??0,outputTokens:e.usage.completion_tokens??e.usage.output_tokens??0}),this.emitFinalIfOpen();break}}}emitEvent(e){if(this.terminalState!=="open"&&e.state!=="final"&&e.state!=="error"&&e.state!=="aborted")return;const t={...e,runId:this.runId,seq:this.seq++};this.emit("agentEvent",t)}isApprovalLikeName(e){return typeof e!="string"?!1:/approval|permission|confirm|user[_-]?input|request[_-]?user/i.test(e)}emitApprovalPending(e){const t=typeof e.command=="string"?e.command:"",r=typeof e.title=="string"&&e.title.trim()?e.title:"\u9700\u8981\u7528\u6237\u786E\u8BA4",s=typeof e.prompt=="string"?e.prompt:typeof e.reason=="string"?e.reason:typeof e.message=="string"?e.message:t?`Codex \u8BF7\u6C42\u6267\u884C\u547D\u4EE4\uFF1A${t}`:"Codex \u6B63\u5728\u7B49\u5F85\u7528\u6237\u786E\u8BA4\u540E\u7EE7\u7EED\u3002";this.emitEvent({state:"approval-pending",approval:{title:r,content:s,source:"codex",actionHint:"\u5F53\u524D\u795E\u5FF5\u6682\u4E0D\u652F\u6301\u8FDC\u7A0B\u786E\u8BA4\uFF0C\u8BF7\u56DE\u5230\u8FD0\u884C Codex \u7684\u7535\u8111/\u7EC8\u7AEF\u5B8C\u6210\u786E\u8BA4\u3002"}})}async killProcess(e=!1){const t=this.process;if(this.appServerReady=null,this.activeTurnId=null,this.managedRoomTools.reset(),e||this.clearConfiguredManagedRoomContext(),!t){this.rejectAllPending(new Error("codex app-server stopped"));return}this.process=null,this.clearForceCloseTimer(),t.kill("SIGTERM"),await new Promise(r=>{t.on("close",r),setTimeout(()=>{t.kill("SIGKILL"),r()},3e3)}),this.rejectAllPending(new Error("codex app-server stopped"))}rejectAllPending(e){for(const[t,r]of this.pendingRequests.entries())clearTimeout(r.timer),r.reject(e),this.pendingRequests.delete(t)}handleProcessClose(e,t){const r=_(t);if(e!==0&&e!==null){const s=r||`codex exited with code ${e}`;this.emitErrorIfOpen(s)}else te(r)?this.emitErrorIfOpen(r):this.emitFinalIfOpen();this.pendingUsage=void 0}emitFinalIfOpen(){this.terminalState==="open"&&(this.terminalState="final",this.managedTurnReplay=null,this.managedRoomTools.deactivateTurn(),this.clearConfiguredManagedRoomContext(),this.emitEvent({state:"final",usage:this.pendingUsage,agentSessionId:this.agentSessionId??void 0}),this.killProcess().catch(()=>{}))}emitErrorIfOpen(e){this.terminalState==="open"&&(this.terminalState="error",this.managedTurnReplay=null,this.managedRoomTools.deactivateTurn(),this.clearConfiguredManagedRoomContext(),this.emitEvent({state:"error",message:X(e)}),this.scheduleProcessClose())}resetRunState(){this.pendingUsage=void 0,this.terminalState="open",this.deltaItemIds.clear(),this.lastTransientStatus="",this.clearForceCloseTimer(),this.resetTextState()}clearConfiguredManagedRoomContext(){this.configuredManagedRoomContextToken=null,this.configuredManagedRoomExecutor=null}emitTransientStatus(e){const t=K(e);!t||t===this.lastTransientStatus||this.terminalState!=="open"||(this.lastTransientStatus=t,this.emitEvent({state:"delta",text:`${t}
|
|
10
10
|
`,thinking:!0}))}resetTextState(){this.hasEmittedText=!1,this.textTail=""}emitText(e,t="delta"){if(!e)return;let r=ne(e);r&&(t==="block"&&this.hasEmittedText&&!r.startsWith(`
|
|
11
11
|
`)&&(this.textTail.endsWith(`
|
|
12
12
|
`)?r=`
|
|
@@ -14,4 +14,4 @@ ${r}`:this.textTail.endsWith(`
|
|
|
14
14
|
|
|
15
15
|
`)||(r=`
|
|
16
16
|
|
|
17
|
-
${r}`)),this.hasEmittedText=!0,this.textTail=(this.textTail+r).slice(-4),this.emitEvent({state:"delta",text:r}))}scheduleProcessClose(){const e=this.process;!e||this.forceCloseTimer||(this.forceCloseTimer=setTimeout(()=>{this.forceCloseTimer=null,this.process===e&&(e.kill("SIGTERM"),setTimeout(()=>{this.process===e&&e.kill("SIGKILL")},1e3))},250))}clearForceCloseTimer(){this.forceCloseTimer&&(clearTimeout(this.forceCloseTimer),this.forceCloseTimer=null)}}
|
|
17
|
+
${r}`)),this.hasEmittedText=!0,this.textTail=(this.textTail+r).slice(-4),this.emitEvent({state:"delta",text:r}))}scheduleProcessClose(){const e=this.process;!e||this.forceCloseTimer||(this.forceCloseTimer=setTimeout(()=>{this.forceCloseTimer=null,this.process===e&&(e.kill("SIGTERM"),setTimeout(()=>{this.process===e&&e.kill("SIGKILL")},1e3))},250))}clearForceCloseTimer(){this.forceCloseTimer&&(clearTimeout(this.forceCloseTimer),this.forceCloseTimer=null)}}D("codex",()=>new ge);export{ge as CodexAdapter,me as buildCodexQueueArgs,pe as buildCodexQueuedText,P as isCodexActiveWriterError,oe as isCodexExcludeTurnsUnsupportedError,ie as isCodexPaginatedHistoryUnsupportedError,ae as isCodexProjectApiUnsupportedError,be as isCodexUnsupportedEffortError,qe as isMissingCodexRolloutError,De as normalizeCodexModelId,Le as normalizeCodexReasoningEffort,de as selectCodexProjectIdForWorkDir};
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { AgentSendContext, AgentSendResult } from './adapter.js';
|
|
2
2
|
import { AgentAdapter } from './adapter.js';
|
|
3
3
|
import type { ChatAttachmentMeta, ExternalChannelSessionStatus } from '@shennian/wire';
|
|
4
|
+
import type { CompiledManagedAgentPolicy } from '../security/managed-agent-policy.js';
|
|
4
5
|
type ManagerModelId = 'codex' | 'claude';
|
|
5
6
|
/** Decorates a real provider Adapter with Manager session capabilities. New
|
|
6
7
|
* sessions use this class and keep their real agentType/modelId. */
|
|
@@ -17,6 +18,7 @@ export declare class ManagerModeAdapter extends AgentAdapter {
|
|
|
17
18
|
sessionId?: string;
|
|
18
19
|
externalChannel?: ExternalChannelSessionStatus | null;
|
|
19
20
|
env?: NodeJS.ProcessEnv;
|
|
21
|
+
managedAgentPolicy?: CompiledManagedAgentPolicy | null;
|
|
20
22
|
}): void;
|
|
21
23
|
start(sessionId: string, workDir: string, agentSessionId?: string | null): Promise<void>;
|
|
22
24
|
send(text: string, modelId?: string, reasoningEffort?: string, attachments?: ChatAttachmentMeta[], agentSystemPrompt?: string | null, context?: AgentSendContext): Promise<void | AgentSendResult>;
|
|
@@ -1,18 +1,18 @@
|
|
|
1
|
-
import{AgentAdapter as g,registerAgent as I}from"./adapter.js";import{CodexAdapter as p}from"./codex.js";import{ClaudeAdapter as f}from"./claude.js";import{MANAGER_SYSTEM_PROMPT as y,buildManagerPrompt as l}from"../manager/prompt.js";import{getManagerRuntimeService as
|
|
1
|
+
import{AgentAdapter as g,registerAgent as I}from"./adapter.js";import{CodexAdapter as p}from"./codex.js";import{ClaudeAdapter as f}from"./claude.js";import{MANAGER_SYSTEM_PROMPT as y,buildManagerPrompt as l}from"../manager/prompt.js";import{getManagerRuntimeService as a}from"../manager/runtime.js";import d from"node:fs";import c from"node:path";import{PLATFORM_OUTPUT_INSTRUCTIONS as S}from"./platform-instructions.js";function M(i){return i==="claude"?"claude":"codex"}function w(i){return i.replace(/[^a-zA-Z0-9_.-]/g,"_")}function v(i){const e=c.join(i,"AGENTS.md");try{return d.readFileSync(e,"utf8").trim()}catch{return""}}function A(i,e){return c.join(i,".shennian","runtime","manager",w(e),"instructions.md")}function u(i,e){const n=v(i),t=a(),r=t?.getManagerExternalChannelSystemPrompt(e)??"",s=typeof t?.getManagerWorkerDefaults=="function"?t.getManagerWorkerDefaults(e):void 0,o=s?.agentType?`\u9ED8\u8BA4 worker Agent\uFF1A${s.agentType}${s.modelId?`
|
|
2
2
|
\u9ED8\u8BA4 worker \u6A21\u578B\uFF1A${s.modelId}`:""}\u3002\u9664\u975E\u7528\u6237\u660E\u786E\u8981\u6C42\u6216\u4EFB\u52A1\u660E\u663E\u9700\u8981\u5176\u4ED6 Agent/\u6A21\u578B\uFF0C\u521B\u5EFA worker \u65F6\u4F18\u5148\u4F7F\u7528\u8FD9\u4E2A\u9ED8\u8BA4\u7EC4\u5408\u3002`:"";return`${["# Shennian Manager Instructions","This file is generated by Shennian for a Manager Agent substrate session. Do not edit it by hand.",n?`## Project Instructions
|
|
3
3
|
|
|
4
4
|
${n}`:"",`## Manager Instructions
|
|
5
5
|
|
|
6
|
-
${y}`,
|
|
6
|
+
${y}`,o?`## Worker Defaults
|
|
7
7
|
|
|
8
|
-
${
|
|
8
|
+
${o}`:"",r?`## External Message Channel Instructions
|
|
9
9
|
|
|
10
10
|
${r}`:"",S].filter(Boolean).join(`
|
|
11
11
|
|
|
12
12
|
`)}
|
|
13
|
-
`}function
|
|
13
|
+
`}function k(i,e){const n=A(i,e),t=u(i,e);d.mkdirSync(c.dirname(n),{recursive:!0});try{if(d.readFileSync(n,"utf8")===t)return n}catch{}return d.writeFileSync(n,t),n}class R extends g{inner;substrate;type;sessionId="";workDir="";agentSessionId=null;configured={};constructor(e,n){super(),this.inner=e,this.substrate=n,this.type=e.type,e.on("agentEvent",t=>{t.agentSessionId&&(this.agentSessionId=t.agentSessionId),this.emit("agentEvent",{...t,source:t.source??n})}),e.on("error",t=>this.emit("error",t))}configure(e){this.configured=e,e.sessionId&&a()?.setManagedAgentPolicy(e.sessionId,e.managedAgentPolicy??null),this.applyEnvironment()}async start(e,n,t){this.sessionId=e,this.workDir=n,this.agentSessionId=t??null,this.applyEnvironment(),await this.inner.start(e,n,t),a()?.registerManager({sessionId:e,agentSessionId:this.agentSessionId,workDir:n,modelId:this.substrate,agentType:this.type==="claude"?"claude":"codex",status:"idle"}),a()?.bindManagerAdapterEvents(e,this.inner)}async send(e,n,t,r,s,o){a()?.registerManager({sessionId:this.sessionId,agentSessionId:this.agentSessionId,workDir:this.workDir,modelId:this.substrate,agentType:this.type==="claude"?"claude":"codex",providerModelId:n??null,status:"running"}),await a()?.ready(),this.applyEnvironment();const h=u(this.workDir,this.sessionId),m=E(h,s);return this.inner.send(l(e),n,t,r,m,o)}async resume(e){this.agentSessionId=e,await this.inner.resume(e)}async stop(){a()?.setManagedAgentPolicy(this.sessionId,null),await this.inner.stop()}getStatus(){return this.inner.getStatus?.()??Promise.resolve({active:!1})}setTitle(e,n,t){return this.inner.setTitle?.(e,n,t)??Promise.resolve()}applyEnvironment(){const e=this.sessionId?a()?.getInjectedEnv(this.sessionId,this.agentSessionId,this.workDir,this.substrate)??{}:{};this.inner.configure?.({...this.configured,sessionId:this.configured.sessionId??this.sessionId,env:{...this.configured.env??{},...e},managedAgentPolicy:this.configured.managedAgentPolicy??null})}}function E(i,e){const n=e?.trim()??"";if(!n)return i;const r=["[\u667A\u80FD\u4F53\u79C1\u6709\u7CFB\u7EDF\u63D0\u793A\u8BCD]","[\u667A\u80FD\u4F53\u8EAB\u4EFD]"].map(s=>n.indexOf(s)).filter(s=>s>=0).sort((s,o)=>s-o)[0]??-1;return n.startsWith("[\u795E\u5FF5\u53D7\u7BA1\u4F1A\u8BDD\u89C4\u5219]")&&r>=0?`${n.slice(0,r)}[\u4F1A\u8BDD\u6A21\u5F0F]
|
|
14
14
|
${i.trim()}
|
|
15
15
|
|
|
16
16
|
${n.slice(r)}`:`${i.trim()}
|
|
17
17
|
|
|
18
|
-
${n}`}class
|
|
18
|
+
${n}`}class P extends g{type="manager";inner=null;sessionId="";workDir="";agentSessionId=null;modelId="codex";async start(e,n,t){this.sessionId=e,this.workDir=n,this.agentSessionId=t??null,a()?.registerManager({sessionId:e,agentSessionId:this.agentSessionId,workDir:n,modelId:this.modelId,agentType:"manager",status:"idle"})}async send(e,n){const t=M(n);if(!this.inner||t!==this.modelId){await this.inner?.stop().catch(()=>{}),this.inner?.removeAllListeners(),this.modelId=t;const r=k(this.workDir,this.sessionId),s=u(this.workDir,this.sessionId);this.inner=t==="claude"?new f({systemPrompt:s,hidden:!0}):new p({modelInstructionsFile:r,hidden:!0}),this.bindInner(this.inner),await this.inner.start(this.sessionId,this.workDir,this.agentSessionId),a()?.bindManagerAdapterEvents(this.sessionId,this.inner)}a()?.registerManager({sessionId:this.sessionId,agentSessionId:this.agentSessionId,workDir:this.workDir,modelId:this.modelId,agentType:"manager",status:"running"}),await a()?.ready(),await this.withManagerEnv(()=>this.inner.send(l(e)))}async resume(e){this.agentSessionId=e,this.inner&&await this.inner.resume(e)}async stop(){await this.inner?.stop()}bindInner(e){e.on("agentEvent",n=>{n.agentSessionId&&(this.agentSessionId=n.agentSessionId),this.emit("agentEvent",this.wrapEvent(n))}),e.on("error",n=>this.emit("error",n))}wrapEvent(e){return{...e,source:e.source??this.modelId,agentSessionId:e.agentSessionId??this.agentSessionId??void 0}}async withManagerEnv(e){const n=a()?.getInjectedEnv(this.sessionId,this.agentSessionId,this.workDir,this.modelId)??{},t=new Map;for(const[r,s]of Object.entries(n))t.set(r,process.env[r]),process.env[r]=s;try{return await e()}finally{for(const[r,s]of t)s===void 0?delete process.env[r]:process.env[r]=s}}}I("manager",()=>new P);export{P as ManagerAdapter,R as ManagerModeAdapter,E as combineManagerInstructions};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
import{execFile as c}from"node:child_process";import s from"node:fs";import{fileURLToPath as l}from"node:url";import{promisify as u}from"node:util";import{getConfigPath as f,saveConfig as d}from"../config/index.js";const g=u(c);async function m(){const r=l(new URL("../../bin/shennian.js",import.meta.url)),n=async t=>{const{stdout:a}=await g(process.execPath,[r,t,"--json"],{timeout:3e4,windowsHide:!0});return JSON.parse(a)},e=await n("status");if(e.error||e.running!==!1||e.remoteAccessDisabled!==!0){const t=await n("stop");if(t.error||t.running!==!1||t.remoteAccessDisabled!==!0)throw new Error("Background service did not stop completely")}const i=f();if(!s.existsSync(i))return;const o=JSON.parse(s.readFileSync(i,"utf8").replace(/^\uFEFF/,""));if(!o||typeof o!="object"||Array.isArray(o))throw new Error("Invalid configuration");delete o.machineId,delete o.machineToken,delete o.accountNamespaceId,delete o.accessToken,delete o.refreshToken,d(o)}function k(r){r.command("logout").description("Stop the background service and clear local Shennian login credentials").option("--json","Print machine-readable result JSON").action(async n=>{try{await m();const e="Logged out of Shennian. Run shennian pair to sign in again.";console.log(n.json?JSON.stringify({ok:!0,message:e}):e)}catch{const e="Logout incomplete. Check shennian status and retry shennian logout.";n.json?console.log(JSON.stringify({ok:!1,error:"logout_failed",message:e,nextAction:"retry_logout"})):console.error(e),process.exitCode=1}})}export{m as logout,k as registerLogoutCommand};
|