@agents-ensemble/core 0.9.2 → 0.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/acp/index.d.ts +2 -2
- package/dist/acp/index.d.ts.map +1 -1
- package/dist/acp/index.js +2 -2
- package/dist/acp/index.js.map +1 -1
- package/dist/acp/resolve-acp-auth.d.ts +2 -0
- package/dist/acp/resolve-acp-auth.d.ts.map +1 -1
- package/dist/acp/resolve-acp-auth.js +13 -2
- package/dist/acp/resolve-acp-auth.js.map +1 -1
- package/dist/acp/resolve-acp-spawn.d.ts +15 -8
- package/dist/acp/resolve-acp-spawn.d.ts.map +1 -1
- package/dist/acp/resolve-acp-spawn.js +53 -108
- package/dist/acp/resolve-acp-spawn.js.map +1 -1
- package/dist/acp/validate-acp-preset-prerequisites.js +1 -1
- package/dist/acp/validate-acp-preset-prerequisites.js.map +1 -1
- package/dist/conductor/conductor-agent.d.ts +2 -0
- package/dist/conductor/conductor-agent.d.ts.map +1 -1
- package/dist/conductor/conductor-session-driver.d.ts +9 -1
- package/dist/conductor/conductor-session-driver.d.ts.map +1 -1
- package/dist/conductor/conductor-session-driver.js +19 -6
- package/dist/conductor/conductor-session-driver.js.map +1 -1
- package/dist/conductor/conductor-session.d.ts +1 -1
- package/dist/conductor/conductor-session.d.ts.map +1 -1
- package/dist/conductor/conductor-session.js +44 -7
- package/dist/conductor/conductor-session.js.map +1 -1
- package/dist/conductor/index.d.ts +2 -2
- package/dist/conductor/index.d.ts.map +1 -1
- package/dist/conductor/index.js.map +1 -1
- package/dist/conductor/pi-conductor-agent.d.ts +2 -1
- package/dist/conductor/pi-conductor-agent.d.ts.map +1 -1
- package/dist/conductor/pi-conductor-agent.js +22 -15
- package/dist/conductor/pi-conductor-agent.js.map +1 -1
- package/dist/conductor/pi-headless-settings.d.ts +2 -0
- package/dist/conductor/pi-headless-settings.d.ts.map +1 -1
- package/dist/conductor/pi-headless-settings.js +8 -0
- package/dist/conductor/pi-headless-settings.js.map +1 -1
- package/dist/conductor/pi-resource-loader.d.ts +5 -3
- package/dist/conductor/pi-resource-loader.d.ts.map +1 -1
- package/dist/conductor/pi-resource-loader.js +5 -27
- package/dist/conductor/pi-resource-loader.js.map +1 -1
- package/dist/conductor/session/dispatch-hold.d.ts +1 -1
- package/dist/conductor/session/dispatch-hold.d.ts.map +1 -1
- package/dist/conductor/session/events/index.d.ts +2 -2
- package/dist/conductor/session/events/index.d.ts.map +1 -1
- package/dist/conductor/session/events/index.js.map +1 -1
- package/dist/conductor/session/events/session-event.d.ts +11 -1
- package/dist/conductor/session/events/session-event.d.ts.map +1 -1
- package/dist/conductor/session/events/session-log-event-groups.d.ts +3 -3
- package/dist/conductor/session/events/session-log-event-groups.d.ts.map +1 -1
- package/dist/conductor/session/events/session-log-event-groups.js +4 -0
- package/dist/conductor/session/events/session-log-event-groups.js.map +1 -1
- package/dist/conductor/session/events/session-log-event.d.ts +22 -1
- package/dist/conductor/session/events/session-log-event.d.ts.map +1 -1
- package/dist/conductor/session/format-session-event.js +15 -0
- package/dist/conductor/session/format-session-event.js.map +1 -1
- package/dist/conductor/session/select-dispatch-batch.d.ts.map +1 -1
- package/dist/conductor/session/select-dispatch-batch.js +5 -0
- package/dist/conductor/session/select-dispatch-batch.js.map +1 -1
- package/dist/conductor/session/session-event.d.ts +1 -1
- package/dist/conductor/session/session-event.d.ts.map +1 -1
- package/dist/conductor/session/session-logger.d.ts.map +1 -1
- package/dist/conductor/session/session-logger.js +3 -0
- package/dist/conductor/session/session-logger.js.map +1 -1
- package/dist/conductor/session-policy.d.ts.map +1 -1
- package/dist/conductor/session-policy.js +2 -1
- package/dist/conductor/session-policy.js.map +1 -1
- package/dist/config/defaults.d.ts.map +1 -1
- package/dist/config/defaults.js +1 -0
- package/dist/config/defaults.js.map +1 -1
- package/dist/config/index.d.ts +2 -2
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +1 -1
- package/dist/config/index.js.map +1 -1
- package/dist/config/load-ensemble-config.d.ts.map +1 -1
- package/dist/config/load-ensemble-config.js.map +1 -1
- package/dist/config/parse-config.d.ts +2 -2
- package/dist/config/parse-config.d.ts.map +1 -1
- package/dist/config/parse-config.js +29 -3
- package/dist/config/parse-config.js.map +1 -1
- package/dist/config/resolve-settings.d.ts +8 -0
- package/dist/config/resolve-settings.d.ts.map +1 -1
- package/dist/config/resolve-settings.js +24 -0
- package/dist/config/resolve-settings.js.map +1 -1
- package/dist/config/types.d.ts +8 -0
- package/dist/config/types.d.ts.map +1 -1
- package/dist/dispatch/set-dispatch-hold-tool.d.ts.map +1 -1
- package/dist/dispatch/set-dispatch-hold-tool.js +4 -3
- package/dist/dispatch/set-dispatch-hold-tool.js.map +1 -1
- package/dist/permission/index.d.ts +1 -1
- package/dist/permission/index.d.ts.map +1 -1
- package/dist/permission/index.js.map +1 -1
- package/dist/permission/permission-deadlock-monitor.d.ts +13 -2
- package/dist/permission/permission-deadlock-monitor.d.ts.map +1 -1
- package/dist/permission/permission-deadlock-monitor.js +14 -5
- package/dist/permission/permission-deadlock-monitor.js.map +1 -1
- package/dist/profile/index.d.ts +1 -1
- package/dist/profile/index.d.ts.map +1 -1
- package/dist/profile/index.js.map +1 -1
- package/dist/profile/load-profile.d.ts.map +1 -1
- package/dist/profile/load-profile.js +9 -6
- package/dist/profile/load-profile.js.map +1 -1
- package/dist/profile/types.d.ts +6 -13
- package/dist/profile/types.d.ts.map +1 -1
- package/dist/profile/types.js +15 -21
- package/dist/profile/types.js.map +1 -1
- package/dist/prompt/modules/ensemble/conductor-base-module.d.ts.map +1 -1
- package/dist/prompt/modules/ensemble/conductor-base-module.js +26 -32
- package/dist/prompt/modules/ensemble/conductor-base-module.js.map +1 -1
- package/dist/session/session-sidecar.js +17 -0
- package/dist/session/session-sidecar.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/config/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,MAAM,WAAW,qBAAqB;IACpC,kDAAkD;IAClD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,IAAI,CAAC;AAE/C,MAAM,WAAW,yBAAyB;IACxC,wDAAwD;IACxD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,2DAA2D;IAC3D,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,uBAAuB;IACtC,gDAAgD;IAChD,KAAK,EAAE,MAAM,CAAC;IACd,6CAA6C;IAC7C,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,+CAA+C;IAC/C,EAAE,CAAC,EAAE,yBAAyB,CAAC;CAChC;AAED,MAAM,WAAW,iBAAiB;IAChC,oDAAoD;IACpD,aAAa,EAAE,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/config/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,MAAM,WAAW,qBAAqB;IACpC,kDAAkD;IAClD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,IAAI,CAAC;AAE/C,MAAM,WAAW,yBAAyB;IACxC,wDAAwD;IACxD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,2DAA2D;IAC3D,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,uBAAuB;IACtC,gDAAgD;IAChD,KAAK,EAAE,MAAM,CAAC;IACd,6CAA6C;IAC7C,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,2CAA2C;IAC3C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,+CAA+C;IAC/C,EAAE,CAAC,EAAE,yBAAyB,CAAC;CAChC;AAED,MAAM,WAAW,iBAAiB;IAChC,oDAAoD;IACpD,aAAa,EAAE,kBAAkB,CAAC;IAClC,kEAAkE;IAClE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,6BAA6B;IAC5C,iCAAiC;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,mCAAmC;IACnC,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,6BAA6B;IAC5C,uCAAuC;IACvC,IAAI,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,QAAQ,EAAE,6BAA6B,CAAC;IACxC,QAAQ,EAAE,6BAA6B,CAAC;CACzC;AAED,MAAM,WAAW,wBAAwB;IACvC,oEAAoE;IACpE,wBAAwB,EAAE,OAAO,CAAC;CACnC;AAED,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,OAAO,EAAE,2BAA2B,CAAC;CACtC;AAED,0EAA0E;AAC1E,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,QAAQ,CAAC;AAE9C,4CAA4C;AAC5C,MAAM,MAAM,qBAAqB,GAAG,MAAM,GAAG,IAAI,GAAG,KAAK,CAAC;AAE1D,MAAM,WAAW,iBAAiB;IAChC,2CAA2C;IAC3C,MAAM,EAAE,aAAa,CAAC;IACtB,uCAAuC;IACvC,cAAc,EAAE,qBAAqB,CAAC;CACvC;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,qBAAqB,CAAC;IAC/B,SAAS,EAAE,uBAAuB,CAAC;IACnC,GAAG,EAAE,iBAAiB,CAAC;IACvB,OAAO,EAAE,qBAAqB,CAAC;IAC/B,MAAM,EAAE,oBAAoB,CAAC;IAC7B,GAAG,EAAE,iBAAiB,CAAC;CACxB;AAED,sDAAsD;AACtD,MAAM,MAAM,mBAAmB,GAAG;KAC/B,CAAC,IAAI,MAAM,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;CACzD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-dispatch-hold-tool.d.ts","sourceRoot":"","sources":["../../src/dispatch/set-dispatch-hold-tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,uCAAuC,CAAC;AAG/C,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,iBAAiB,CAAC;IACzB,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,kBAAkB,KAAK,IAAI,CAAC;IACjD,sDAAsD;IACtD,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;CAC9B;AAED,uEAAuE;AACvE,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,0BAA0B,GAClC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"set-dispatch-hold-tool.d.ts","sourceRoot":"","sources":["../../src/dispatch/set-dispatch-hold-tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,uCAAuC,CAAC;AAG/C,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,iBAAiB,CAAC;IACzB,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,kBAAkB,KAAK,IAAI,CAAC;IACjD,sDAAsD;IACtD,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;CAC9B;AAED,uEAAuE;AACvE,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,0BAA0B,GAClC,gBAAgB,CA6DlB"}
|
|
@@ -7,16 +7,17 @@ export function createSetDispatchHoldTool(options) {
|
|
|
7
7
|
description: [
|
|
8
8
|
'Temporarily hold trigger SessionEvents before dispatching them to the conductor.',
|
|
9
9
|
'`hold: true` is useful while reading an Issue/PR or coordinating several workers; held events are kept in arrival order.',
|
|
10
|
-
'`operator.message` always bypasses the hold; `permission.pending` is held like other trigger events.',
|
|
10
|
+
'`operator.message` always bypasses the hold; `permission.pending` is held like other trigger events, and low-priority `permission.stall` is also a hold target.',
|
|
11
|
+
'Normal dispatch prioritizes `permission.pending` and other actionable operator input over `permission.stall`.',
|
|
11
12
|
'Events already queued before release are collected before the flush count is returned.',
|
|
12
|
-
'`hold: false` releases the held trigger events, including permission.pending, for dispatch. Normally they arrive as one combined conductor send; after max-turns, permission may be sent first while blocked worker events remain held.',
|
|
13
|
+
'`hold: false` releases the held trigger events, including permission.pending and permission.stall, for dispatch. Normally they arrive as one combined conductor send; after max-turns, permission may still be sent first for recovery while blocked worker events remain held.',
|
|
13
14
|
].join(' '),
|
|
14
15
|
inputSchema: {
|
|
15
16
|
type: 'object',
|
|
16
17
|
properties: {
|
|
17
18
|
hold: {
|
|
18
19
|
type: 'boolean',
|
|
19
|
-
description: 'true to hold worker/GitHub/permission trigger events, false to release and flush them',
|
|
20
|
+
description: 'true to hold worker/GitHub/permission.pending/permission.stall trigger events, false to release and flush them; permission.pending normally has priority over low-priority permission.stall, which may still arrive after max-turns for permission recovery',
|
|
20
21
|
},
|
|
21
22
|
},
|
|
22
23
|
required: ['hold'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-dispatch-hold-tool.js","sourceRoot":"","sources":["../../src/dispatch/set-dispatch-hold-tool.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AASvD,uEAAuE;AACvE,MAAM,UAAU,yBAAyB,CACvC,OAAmC;IAEnC,OAAO;QACL,iBAAiB,EAAE;YACjB,IAAI,EAAE,mBAAmB;YACzB,WAAW,EAAE;gBACX,kFAAkF;gBAClF,0HAA0H;gBAC1H,
|
|
1
|
+
{"version":3,"file":"set-dispatch-hold-tool.js","sourceRoot":"","sources":["../../src/dispatch/set-dispatch-hold-tool.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AASvD,uEAAuE;AACvE,MAAM,UAAU,yBAAyB,CACvC,OAAmC;IAEnC,OAAO;QACL,iBAAiB,EAAE;YACjB,IAAI,EAAE,mBAAmB;YACzB,WAAW,EAAE;gBACX,kFAAkF;gBAClF,0HAA0H;gBAC1H,iKAAiK;gBACjK,+GAA+G;gBAC/G,wFAAwF;gBACxF,iRAAiR;aAClR,CAAC,IAAI,CAAC,GAAG,CAAC;YACX,WAAW,EAAE;gBACX,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,IAAI,EAAE;wBACJ,IAAI,EAAE,SAAS;wBACf,WAAW,EACT,6PAA6P;qBAChQ;iBACF;gBACD,QAAQ,EAAE,CAAC,MAAM,CAAC;aACnB;YACD,KAAK,CAAC,OAAO,CAAC,IAAI;gBAChB,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBACnC,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;gBAC7D,CAAC;gBAED,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBACd,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;oBAClE,OAAO,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;oBAClC,MAAM,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC;oBACvD,OAAO,CAAC,SAAS,EAAE,CAAC;wBAClB,MAAM;wBACN,IAAI,EAAE,IAAI;wBACV,cAAc;qBACf,CAAC,CAAC;oBACH,OAAO,cAAc,CAAC,mBAAmB,EAAE;wBACzC,YAAY,EAAE,IAAI;wBAClB,cAAc;wBACd,aAAa,EAAE,KAAK;qBACrB,CAAC,CAAC;gBACL,CAAC;gBAED,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;gBAC5B,MAAM,iBAAiB,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC;gBAC1D,OAAO,CAAC,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC;gBACnC,OAAO,CAAC,SAAS,EAAE,CAAC;oBAClB,MAAM,EAAE,UAAU;oBAClB,IAAI,EAAE,KAAK;oBACX,cAAc,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM;oBAC/C,iBAAiB;iBAClB,CAAC,CAAC;gBACH,OAAO,cAAc,CAAC,mBAAmB,EAAE;oBACzC,YAAY,EAAE,KAAK;oBACnB,iBAAiB;oBACjB,aAAa,EAAE,iBAAiB,GAAG,CAAC;iBACrC,CAAC,CAAC;YACL,CAAC;SACF;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -7,7 +7,7 @@ export type { PermissionOption, PermissionRequest, } from './permission-request.
|
|
|
7
7
|
export { PermissionPipeline } from './permission-pipeline.js';
|
|
8
8
|
export type { PermissionPipelineOptions, PermissionPipelineOutcome, } from './permission-pipeline.js';
|
|
9
9
|
export { createPermissionDeadlockMonitor, DEFAULT_PERMISSION_DEADLOCK_POLL_MS, DEFAULT_PERMISSION_DEADLOCK_STALL_MS, formatPermissionDeadlockWarningMessage, isPermissionDeadlockRisk, } from './permission-deadlock-monitor.js';
|
|
10
|
-
export type { PermissionDeadlockActivitySnapshot, PermissionDeadlockMonitor, PermissionDeadlockMonitorOptions, } from './permission-deadlock-monitor.js';
|
|
10
|
+
export type { PermissionDeadlockActivitySnapshot, PermissionDeadlockStall, PermissionDeadlockMonitor, PermissionDeadlockMonitorOptions, } from './permission-deadlock-monitor.js';
|
|
11
11
|
export { PendingPermissionRegistry, } from './pending-permission.js';
|
|
12
12
|
export type { PendingPermission } from './pending-permission.js';
|
|
13
13
|
export { createResolvePermissionTool } from './resolve-permission-tool.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/permission/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,SAAS,EACT,IAAI,GACL,MAAM,wBAAwB,CAAC;AAChC,YAAY,EACV,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,wBAAwB,GACzB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EACV,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AACjC,YAAY,EACV,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,YAAY,EACV,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,+BAA+B,EAC/B,mCAAmC,EACnC,oCAAoC,EACpC,sCAAsC,EACtC,wBAAwB,GACzB,MAAM,kCAAkC,CAAC;AAC1C,YAAY,EACV,kCAAkC,EAClC,yBAAyB,EACzB,gCAAgC,GACjC,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,yBAAyB,GAC1B,MAAM,yBAAyB,CAAC;AACjC,YAAY,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,YAAY,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AACjF,OAAO,EAAE,gCAAgC,EAAE,MAAM,iCAAiC,CAAC;AACnF,OAAO,EACL,iCAAiC,EACjC,kCAAkC,GACnC,MAAM,6CAA6C,CAAC;AACrD,YAAY,EAAE,yCAAyC,EAAE,MAAM,6CAA6C,CAAC;AAC7G,YAAY,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/permission/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,SAAS,EACT,IAAI,GACL,MAAM,wBAAwB,CAAC;AAChC,YAAY,EACV,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,wBAAwB,GACzB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EACV,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AACjC,YAAY,EACV,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,YAAY,EACV,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,+BAA+B,EAC/B,mCAAmC,EACnC,oCAAoC,EACpC,sCAAsC,EACtC,wBAAwB,GACzB,MAAM,kCAAkC,CAAC;AAC1C,YAAY,EACV,kCAAkC,EAClC,uBAAuB,EACvB,yBAAyB,EACzB,gCAAgC,GACjC,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,yBAAyB,GAC1B,MAAM,yBAAyB,CAAC;AACjC,YAAY,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,YAAY,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AACjF,OAAO,EAAE,gCAAgC,EAAE,MAAM,iCAAiC,CAAC;AACnF,OAAO,EACL,iCAAiC,EACjC,kCAAkC,GACnC,MAAM,6CAA6C,CAAC;AACrD,YAAY,EAAE,yCAAyC,EAAE,MAAM,6CAA6C,CAAC;AAC7G,YAAY,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/permission/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,SAAS,EACT,IAAI,GACL,MAAM,wBAAwB,CAAC;AAKhC,OAAO,EACL,wBAAwB,GACzB,MAAM,wBAAwB,CAAC;AAKhC,OAAO,EACL,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AAMjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAK9D,OAAO,EACL,+BAA+B,EAC/B,mCAAmC,EACnC,oCAAoC,EACpC,sCAAsC,EACtC,wBAAwB,GACzB,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/permission/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,SAAS,EACT,IAAI,GACL,MAAM,wBAAwB,CAAC;AAKhC,OAAO,EACL,wBAAwB,GACzB,MAAM,wBAAwB,CAAC;AAKhC,OAAO,EACL,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AAMjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAK9D,OAAO,EACL,+BAA+B,EAC/B,mCAAmC,EACnC,oCAAoC,EACpC,sCAAsC,EACtC,wBAAwB,GACzB,MAAM,kCAAkC,CAAC;AAO1C,OAAO,EACL,yBAAyB,GAC1B,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAE3E,OAAO,EAAE,gCAAgC,EAAE,MAAM,iCAAiC,CAAC;AACnF,OAAO,EACL,iCAAiC,EACjC,kCAAkC,GACnC,MAAM,6CAA6C,CAAC"}
|
|
@@ -1,16 +1,27 @@
|
|
|
1
1
|
import type { PermissionPipeline } from './permission-pipeline.js';
|
|
2
|
-
/** pending permission が継続したとみなす閾値(ms)。Issue #
|
|
3
|
-
export declare const DEFAULT_PERMISSION_DEADLOCK_STALL_MS =
|
|
2
|
+
/** pending permission が継続したとみなす閾値(ms)。Issue #416 / harness-events.md §6。 */
|
|
3
|
+
export declare const DEFAULT_PERMISSION_DEADLOCK_STALL_MS = 300000;
|
|
4
4
|
/** デッドロック検知の poll 間隔(ms)。 */
|
|
5
5
|
export declare const DEFAULT_PERMISSION_DEADLOCK_POLL_MS = 5000;
|
|
6
6
|
export interface PermissionDeadlockActivitySnapshot {
|
|
7
7
|
attachInFlight: number;
|
|
8
8
|
hasProcessingWorker: boolean;
|
|
9
9
|
}
|
|
10
|
+
/** conductor に届ける permission 停滞通知の追加コンテキスト。 */
|
|
11
|
+
export interface PermissionDeadlockStall {
|
|
12
|
+
message: string;
|
|
13
|
+
pendingPermissionIds: string[];
|
|
14
|
+
pendingPermissionCount: number;
|
|
15
|
+
oldestPermissionCreatedAt: number;
|
|
16
|
+
stallAgeMs: number;
|
|
17
|
+
stallThresholdMs: number;
|
|
18
|
+
}
|
|
10
19
|
export interface PermissionDeadlockMonitorOptions {
|
|
11
20
|
pipeline: PermissionPipeline;
|
|
12
21
|
getActivitySnapshot: () => PermissionDeadlockActivitySnapshot;
|
|
13
22
|
onWarning: (message: string) => void;
|
|
23
|
+
/** `harness.warning` と同じ検知時に conductor 通知を受け取る。 */
|
|
24
|
+
onStall?: (stall: PermissionDeadlockStall) => void;
|
|
14
25
|
stallThresholdMs?: number;
|
|
15
26
|
pollIntervalMs?: number;
|
|
16
27
|
shutdownSignal?: AbortSignal;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permission-deadlock-monitor.d.ts","sourceRoot":"","sources":["../../src/permission/permission-deadlock-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,4EAA4E;AAC5E,eAAO,MAAM,oCAAoC,
|
|
1
|
+
{"version":3,"file":"permission-deadlock-monitor.d.ts","sourceRoot":"","sources":["../../src/permission/permission-deadlock-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,4EAA4E;AAC5E,eAAO,MAAM,oCAAoC,SAAU,CAAC;AAE5D,6BAA6B;AAC7B,eAAO,MAAM,mCAAmC,OAAQ,CAAC;AAEzD,MAAM,WAAW,kCAAkC;IACjD,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,OAAO,CAAC;CAC9B;AAED,+CAA+C;AAC/C,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,yBAAyB,EAAE,MAAM,CAAC;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;IAC9D,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,mDAAmD;IACnD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,IAAI,CAAC;IACnD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,WAAW,CAAC;IAC7B,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACxC,KAAK,IAAI,IAAI,CAAC;IACd,IAAI,IAAI,IAAI,CAAC;CACd;AAED,wBAAgB,sCAAsC,CACpD,gBAAgB,GAAE,MAA6C,GAC9D,MAAM,CAGR;AAED,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,kCAAkC,EAC5C,YAAY,EAAE,MAAM,GACnB,OAAO,CAKT;AAED,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,gCAAgC,GACxC,yBAAyB,CAwF3B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
/** pending permission が継続したとみなす閾値(ms)。Issue #
|
|
2
|
-
export const DEFAULT_PERMISSION_DEADLOCK_STALL_MS =
|
|
1
|
+
/** pending permission が継続したとみなす閾値(ms)。Issue #416 / harness-events.md §6。 */
|
|
2
|
+
export const DEFAULT_PERMISSION_DEADLOCK_STALL_MS = 300_000;
|
|
3
3
|
/** デッドロック検知の poll 間隔(ms)。 */
|
|
4
4
|
export const DEFAULT_PERMISSION_DEADLOCK_POLL_MS = 5_000;
|
|
5
5
|
export function formatPermissionDeadlockWarningMessage(stallThresholdMs = DEFAULT_PERMISSION_DEADLOCK_STALL_MS) {
|
|
@@ -43,8 +43,8 @@ export function createPermissionDeadlockMonitor(options) {
|
|
|
43
43
|
warnedForCurrentStall = false;
|
|
44
44
|
return;
|
|
45
45
|
}
|
|
46
|
-
const
|
|
47
|
-
const stallAgeMs = now() -
|
|
46
|
+
const oldestPermissionCreatedAt = Math.min(...pending.map((entry) => entry.createdAt));
|
|
47
|
+
const stallAgeMs = now() - oldestPermissionCreatedAt;
|
|
48
48
|
if (stallAgeMs < stallThresholdMs) {
|
|
49
49
|
return;
|
|
50
50
|
}
|
|
@@ -52,7 +52,16 @@ export function createPermissionDeadlockMonitor(options) {
|
|
|
52
52
|
return;
|
|
53
53
|
}
|
|
54
54
|
warnedForCurrentStall = true;
|
|
55
|
-
|
|
55
|
+
const message = formatPermissionDeadlockWarningMessage(stallThresholdMs);
|
|
56
|
+
options.onWarning(message);
|
|
57
|
+
options.onStall?.({
|
|
58
|
+
message,
|
|
59
|
+
pendingPermissionIds: pending.map((entry) => entry.id),
|
|
60
|
+
pendingPermissionCount: pending.length,
|
|
61
|
+
oldestPermissionCreatedAt,
|
|
62
|
+
stallAgeMs,
|
|
63
|
+
stallThresholdMs,
|
|
64
|
+
});
|
|
56
65
|
};
|
|
57
66
|
const stopMonitor = () => {
|
|
58
67
|
if (stopped)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permission-deadlock-monitor.js","sourceRoot":"","sources":["../../src/permission/permission-deadlock-monitor.ts"],"names":[],"mappings":"AAEA,4EAA4E;AAC5E,MAAM,CAAC,MAAM,oCAAoC,GAAG,
|
|
1
|
+
{"version":3,"file":"permission-deadlock-monitor.js","sourceRoot":"","sources":["../../src/permission/permission-deadlock-monitor.ts"],"names":[],"mappings":"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"}
|
package/dist/profile/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { loadProfile, loadProfileFromFile, parseProfile, resolveProfileRef, resolveProfilePath, resolveProfile, resolveProfileFilePath, resolveDefaultProfilePath, ENSEMBLE_DEFAULT_PROFILE_ENV, profileDirectoryPath, corePackageRoot, bundledProfilesRoot, bundledProfilePath, bundledDefaultProfilePath, PROFILES_DIR, PROFILE_FILE, DEFAULT_PROFILE_NAME, DEFAULT_PROFILE_ALIAS, ENSEMBLE_DIR, TEAMS_DIR, teamProfileRoots, resolveTeamProfilePath, listTeamProfiles, normalizeTeamProfileName, teamProfileId, } from './load-profile.js';
|
|
2
|
-
export type { Profile, ProfileConductorConfig, ProfileMaterial, ProfileMeta, ResolvedProfile, AgentDefinition, ProfileWorkerEntry, ProfileWorkerRef,
|
|
2
|
+
export type { Profile, ProfileConductorConfig, ProfileMaterial, ProfileMeta, ResolvedProfile, AgentDefinition, ProfileWorkerEntry, ProfileWorkerRef, SessionWorkerSpec, EnsembleSessionState, ResolvedProfileMaterial, } from './types.js';
|
|
3
3
|
export type { TeamProfileSource, TeamProfileMeta, TeamProfileListEntry, TeamProfileRoot, TeamProfileResolutionOptions, TeamProfileAvailability, TeamProfileValidationIssue, } from './team-profile-resolution.js';
|
|
4
4
|
export { validateTeamProfileWorkspaces, assertTeamProfileWorkspacesAvailable, formatTeamProfileActivationError, } from './validate-team-profile-workspaces.js';
|
|
5
5
|
export type { TeamProfileWorkspaceValidation } from './validate-team-profile-workspaces.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/profile/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,mBAAmB,EACnB,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,EACd,sBAAsB,EACtB,yBAAyB,EACzB,4BAA4B,EAC5B,oBAAoB,EACpB,eAAe,EACf,mBAAmB,EACnB,kBAAkB,EAClB,yBAAyB,EACzB,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,sBAAsB,EACtB,gBAAgB,EAChB,wBAAwB,EACxB,aAAa,GACd,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EACV,OAAO,EACP,sBAAsB,EACtB,eAAe,EACf,WAAW,EACX,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/profile/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,mBAAmB,EACnB,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,EACd,sBAAsB,EACtB,yBAAyB,EACzB,4BAA4B,EAC5B,oBAAoB,EACpB,eAAe,EACf,mBAAmB,EACnB,kBAAkB,EAClB,yBAAyB,EACzB,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,sBAAsB,EACtB,gBAAgB,EAChB,wBAAwB,EACxB,aAAa,GACd,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EACV,OAAO,EACP,sBAAsB,EACtB,eAAe,EACf,WAAW,EACX,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,YAAY,CAAC;AACpB,YAAY,EACV,iBAAiB,EACjB,eAAe,EACf,oBAAoB,EACpB,eAAe,EACf,4BAA4B,EAC5B,uBAAuB,EACvB,0BAA0B,GAC3B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,6BAA6B,EAC7B,oCAAoC,EACpC,gCAAgC,GACjC,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EAAE,8BAA8B,EAAE,MAAM,uCAAuC,CAAC;AAC5F,OAAO,EACL,4BAA4B,EAC5B,wBAAwB,EACxB,sBAAsB,EACtB,uBAAuB,EACvB,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,YAAY,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/profile/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,mBAAmB,EACnB,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,EACd,sBAAsB,EACtB,yBAAyB,EACzB,4BAA4B,EAC5B,oBAAoB,EACpB,eAAe,EACf,mBAAmB,EACnB,kBAAkB,EAClB,yBAAyB,EACzB,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,sBAAsB,EACtB,gBAAgB,EAChB,wBAAwB,EACxB,aAAa,GACd,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/profile/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,mBAAmB,EACnB,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,EACd,sBAAsB,EACtB,yBAAyB,EACzB,4BAA4B,EAC5B,oBAAoB,EACpB,eAAe,EACf,mBAAmB,EACnB,kBAAkB,EAClB,yBAAyB,EACzB,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,sBAAsB,EACtB,gBAAgB,EAChB,wBAAwB,EACxB,aAAa,GACd,MAAM,mBAAmB,CAAC;AAuB3B,OAAO,EACL,6BAA6B,EAC7B,oCAAoC,EACpC,gCAAgC,GACjC,MAAM,uCAAuC,CAAC;AAE/C,OAAO,EACL,4BAA4B,EAC5B,wBAAwB,EACxB,sBAAsB,EACtB,uBAAuB,EACvB,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,YAAY,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-profile.d.ts","sourceRoot":"","sources":["../../src/profile/load-profile.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEV,OAAO,EAIP,eAAe,EAChB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"load-profile.d.ts","sourceRoot":"","sources":["../../src/profile/load-profile.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEV,OAAO,EAIP,eAAe,EAChB,MAAM,YAAY,CAAC;AAKpB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAazD,OAAO,EACL,yBAAyB,EACzB,kBAAkB,EAClB,mBAAmB,EACnB,eAAe,EACf,qBAAqB,EACrB,oBAAoB,EACpB,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,YAAY,EACZ,SAAS,GACV,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,gBAAgB,EAChB,wBAAwB,EACxB,aAAa,GACd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,6BAA6B,EAC7B,oCAAoC,EACpC,gCAAgC,GACjC,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EACV,uBAAuB,EACvB,0BAA0B,EAC1B,8BAA8B,GAC/B,MAAM,uCAAuC,CAAC;AAe/C,wBAAgB,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAuFpE;AAwCD,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAKlF;AAqED,8CAA8C;AAC9C,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC,CAkB1B;AAED,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAC9B,OAAO,CAAC,eAAe,CAAC,CAO1B;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAExE;AAED,8DAA8D;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAC;AAE7E,8FAA8F;AAC9F,wBAAgB,iBAAiB,CAAC,OAAO,EAAE;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,MAAM,CAAC,EAAE,cAAc,CAAC;CACzB,GAAG,MAAM,GAAG,SAAS,CAMrB;AAED,0CAA0C;AAC1C,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,MAAM,CAAC,EAAE,cAAc,CAAC;CACzB,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,eAAe,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,CAkB7D"}
|
|
@@ -4,8 +4,7 @@ import yaml from 'js-yaml';
|
|
|
4
4
|
import { parsePromptModuleFromYaml } from './parse-prompt-module.js';
|
|
5
5
|
import { resolveWorkerWorkspacePath } from './resolve-worker-workspace.js';
|
|
6
6
|
import { assertTeamProfileWorkspacesAvailable } from './validate-team-profile-workspaces.js';
|
|
7
|
-
import { normalizeProfileWorkers } from './types.js';
|
|
8
|
-
import { parseProfileAcpConfig } from '../acp/resolve-acp-spawn.js';
|
|
7
|
+
import { normalizeProfileWorkers, PROFILE_ACP_REMOVED_ERROR } from './types.js';
|
|
9
8
|
import { resolveProfileDefaultRef } from '../config/resolve-settings.js';
|
|
10
9
|
import { normalizeTeamProfileName, resolveTeamProfilePath, } from './team-profile-resolution.js';
|
|
11
10
|
import { bundledDefaultProfilePath, PROFILE_FILE, } from './profile-paths.js';
|
|
@@ -28,13 +27,13 @@ export function parseProfile(source, label) {
|
|
|
28
27
|
const raw = source;
|
|
29
28
|
const workers = normalizeProfileWorkers(raw.workers, label);
|
|
30
29
|
const conductor = parseProfileConductorConfig(raw.conductor, label);
|
|
30
|
+
if (raw.acp !== undefined) {
|
|
31
|
+
throw new Error(`Invalid profile ${label}: ${PROFILE_ACP_REMOVED_ERROR}`);
|
|
32
|
+
}
|
|
31
33
|
const profile = {
|
|
32
34
|
...raw,
|
|
33
35
|
workers,
|
|
34
36
|
...(conductor !== undefined ? { conductor } : {}),
|
|
35
|
-
...(raw.acp !== undefined
|
|
36
|
-
? { acp: parseProfileAcpConfig(raw.acp, `${label} acp`) }
|
|
37
|
-
: {}),
|
|
38
37
|
};
|
|
39
38
|
for (const [name, agent] of Object.entries(profile.agents ?? {})) {
|
|
40
39
|
if (!agent || typeof agent !== 'object') {
|
|
@@ -99,9 +98,14 @@ function parseProfileConductorConfig(raw, label) {
|
|
|
99
98
|
if (builtinTools !== undefined && typeof builtinTools !== 'boolean') {
|
|
100
99
|
throw new Error(`Invalid profile conductor.builtinTools in ${label}: expected boolean`);
|
|
101
100
|
}
|
|
101
|
+
const piSkills = config.piSkills;
|
|
102
|
+
if (piSkills !== undefined && typeof piSkills !== 'boolean') {
|
|
103
|
+
throw new Error(`Invalid profile conductor.piSkills in ${label}: expected boolean`);
|
|
104
|
+
}
|
|
102
105
|
return {
|
|
103
106
|
...(backend !== undefined ? { backend } : {}),
|
|
104
107
|
...(builtinTools !== undefined ? { builtinTools } : {}),
|
|
108
|
+
...(piSkills !== undefined ? { piSkills } : {}),
|
|
105
109
|
};
|
|
106
110
|
}
|
|
107
111
|
export function resolveProfileFilePath(profileDir, fileRef) {
|
|
@@ -162,7 +166,6 @@ export async function resolveProfile(profile, profileDir, repoRoot) {
|
|
|
162
166
|
return {
|
|
163
167
|
workers: resolveProfileWorkers(profile.workers, profileDir, repoRoot),
|
|
164
168
|
...(profile.conductor ? { conductor: profile.conductor } : {}),
|
|
165
|
-
...(profile.acp ? { acp: profile.acp } : {}),
|
|
166
169
|
agents: Object.keys(agents).length > 0 ? agents : undefined,
|
|
167
170
|
materials: await Promise.all((profile.materials ?? []).map((material) => resolveMaterial(material, profileDir, label))),
|
|
168
171
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-profile.js","sourceRoot":"","sources":["../../src/profile/load-profile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAChE,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AASrE,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,oCAAoC,EAAE,MAAM,uCAAuC,CAAC;AAC7F,OAAO,EAAE,uBAAuB,EAAE,
|
|
1
|
+
{"version":3,"file":"load-profile.js","sourceRoot":"","sources":["../../src/profile/load-profile.ts"],"names":[],"mappings":"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"}
|
package/dist/profile/types.d.ts
CHANGED
|
@@ -2,14 +2,6 @@ import type { PromptModule } from '@modular-prompt/core';
|
|
|
2
2
|
import type { ConductorBackend } from '../config/types.js';
|
|
3
3
|
import type { AcpSpawnFingerprint, DefaultAcpResolutionOptions } from '../acp/resolve-acp-spawn.js';
|
|
4
4
|
import type { SpawnAcpProcessOptions } from '../acp/acp-process.js';
|
|
5
|
-
/** profile / worker の ACP spawn 定義。 */
|
|
6
|
-
export interface ProfileAcpConfig {
|
|
7
|
-
/** built-in: `cursor` | `claude` | `codex` | `pi`。`command` 明示時は `custom`。 */
|
|
8
|
-
preset?: string;
|
|
9
|
-
command?: string;
|
|
10
|
-
args?: string[];
|
|
11
|
-
env?: Record<string, string>;
|
|
12
|
-
}
|
|
13
5
|
/** kind ごとの agent 定義(modular-prompt 拡張)。`conductor` は暗黙起動の SDK agent、他は worker init prompt 用。 */
|
|
14
6
|
export interface AgentDefinition {
|
|
15
7
|
/** インライン modular-prompt YAML。`promptFile` と排他。 */
|
|
@@ -22,6 +14,11 @@ export interface ProfileConductorConfig {
|
|
|
22
14
|
backend?: ConductorBackend;
|
|
23
15
|
/** built-in coding tools の有効化。省略時は有効。 */
|
|
24
16
|
builtinTools?: boolean;
|
|
17
|
+
/**
|
|
18
|
+
* Pi backend のみ。Pi 標準の skill discovery(`DefaultResourceLoader` + `read` / `/skill:`)を使う。
|
|
19
|
+
* 省略時は有効。`false` で skill 索引・system prompt への載せを行わない。
|
|
20
|
+
*/
|
|
21
|
+
piSkills?: boolean;
|
|
25
22
|
}
|
|
26
23
|
/** プロファイル YAML の worker エントリ(文字列は name=kind のショートハンド)。 */
|
|
27
24
|
export type ProfileWorkerRef = string | ProfileWorkerRefObject;
|
|
@@ -34,8 +31,6 @@ export interface ProfileWorkerRefObject {
|
|
|
34
31
|
* profile ディレクトリまたは repo-root 基準の相対パス、または絶対パス。
|
|
35
32
|
*/
|
|
36
33
|
workspace?: string;
|
|
37
|
-
/** worker 単位の ACP spawn 設定(profile 全体 `acp` より優先)。 */
|
|
38
|
-
acp?: ProfileAcpConfig;
|
|
39
34
|
}
|
|
40
35
|
/** parse 後の worker 定義。 */
|
|
41
36
|
export interface ProfileWorkerEntry {
|
|
@@ -43,7 +38,6 @@ export interface ProfileWorkerEntry {
|
|
|
43
38
|
kind: string;
|
|
44
39
|
/** profile YAML の raw 値。 */
|
|
45
40
|
workspace?: string;
|
|
46
|
-
acp?: ProfileAcpConfig;
|
|
47
41
|
/** `loadProfile` 後に解決された絶対パス。 */
|
|
48
42
|
resolvedWorkspacePath?: string;
|
|
49
43
|
}
|
|
@@ -66,8 +60,6 @@ export interface Profile {
|
|
|
66
60
|
conductor?: ProfileConductorConfig;
|
|
67
61
|
/** セッション開始時に起動する worker(name + kind)。 */
|
|
68
62
|
workers: ProfileWorkerEntry[];
|
|
69
|
-
/** profile 全体の ACP spawn デフォルト(worker 未指定時に継承)。 */
|
|
70
|
-
acp?: ProfileAcpConfig;
|
|
71
63
|
/** profile 付属文書(team.md 等)。compile 時に Prepared Materials へ載せる。 */
|
|
72
64
|
materials?: ProfileMaterial[];
|
|
73
65
|
}
|
|
@@ -112,6 +104,7 @@ export interface EnsembleSessionState {
|
|
|
112
104
|
kinds: string[];
|
|
113
105
|
materials?: ResolvedProfileMaterial[];
|
|
114
106
|
}
|
|
107
|
+
export declare const PROFILE_ACP_REMOVED_ERROR = "\"acp\" is removed from team profile; use .ensemble/config.yaml acp.defaultPreset and acp.env";
|
|
115
108
|
export declare function resolvedProfileMaterials(materials?: ProfileMaterial[]): ResolvedProfileMaterial[] | undefined;
|
|
116
109
|
/** agent kind に応じて Prepared Materials を絞り込む。`kinds` 省略は全員向け。 */
|
|
117
110
|
export declare function filterMaterialsForKind(materials: ResolvedProfileMaterial[] | undefined, kind: string): ResolvedProfileMaterial[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/profile/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/profile/types.ts"],"names":[],"mappings":"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"}
|
package/dist/profile/types.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { parseProfileAcpConfig } from '../acp/resolve-acp-spawn.js';
|
|
2
1
|
import { acpSpawnFingerprint, resolveWorkerAcpSpawn, resolvedAcpSpawnToOptions, } from '../acp/resolve-acp-spawn.js';
|
|
2
|
+
export const PROFILE_ACP_REMOVED_ERROR = '"acp" is removed from team profile; use .ensemble/config.yaml acp.defaultPreset and acp.env';
|
|
3
3
|
export function resolvedProfileMaterials(materials) {
|
|
4
4
|
const resolved = (materials ?? []).flatMap((material, index) => {
|
|
5
5
|
const content = material.content?.trim();
|
|
@@ -44,15 +44,15 @@ export function normalizeProfileWorker(entry, label, index) {
|
|
|
44
44
|
if (!worker.kind) {
|
|
45
45
|
throw new Error(`Invalid profile worker[${index}] in ${label}: needs "kind"`);
|
|
46
46
|
}
|
|
47
|
+
if (worker.acp !== undefined) {
|
|
48
|
+
throw new Error(`Invalid profile worker[${index}] in ${label}: ${PROFILE_ACP_REMOVED_ERROR}`);
|
|
49
|
+
}
|
|
47
50
|
return {
|
|
48
51
|
name: worker.name ?? worker.kind,
|
|
49
52
|
kind: worker.kind,
|
|
50
53
|
...(typeof worker.workspace === 'string' && worker.workspace.length > 0
|
|
51
54
|
? { workspace: worker.workspace }
|
|
52
55
|
: {}),
|
|
53
|
-
...(worker.acp !== undefined
|
|
54
|
-
? { acp: parseProfileAcpConfig(worker.acp, `${label} workers[${index}]`) }
|
|
55
|
-
: {}),
|
|
56
56
|
};
|
|
57
57
|
}
|
|
58
58
|
throw new Error(`Invalid profile worker[${index}] in ${label}: expected kind string or { name?, kind, workspace? }`);
|
|
@@ -69,23 +69,17 @@ export function normalizeProfileWorkers(workers, label) {
|
|
|
69
69
|
return normalized;
|
|
70
70
|
}
|
|
71
71
|
export function profileWorkersToSessionSpecs(profile, options) {
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
? { resolvedWorkspacePath: worker.resolvedWorkspacePath }
|
|
84
|
-
: {}),
|
|
85
|
-
spawn: resolvedAcpSpawnToOptions(resolved, options?.spawnBase),
|
|
86
|
-
acpFingerprint: acpSpawnFingerprint(resolved),
|
|
87
|
-
};
|
|
88
|
-
});
|
|
72
|
+
const resolved = resolveWorkerAcpSpawn({ defaultOptions: options?.defaultAcp });
|
|
73
|
+
return profile.workers.map((worker) => ({
|
|
74
|
+
name: worker.name,
|
|
75
|
+
kind: worker.kind,
|
|
76
|
+
prompt: resolveAgentPromptModule(worker.kind, profile.agents),
|
|
77
|
+
...(worker.resolvedWorkspacePath
|
|
78
|
+
? { resolvedWorkspacePath: worker.resolvedWorkspacePath }
|
|
79
|
+
: {}),
|
|
80
|
+
spawn: resolvedAcpSpawnToOptions(resolved, options?.spawnBase),
|
|
81
|
+
acpFingerprint: acpSpawnFingerprint(resolved),
|
|
82
|
+
}));
|
|
89
83
|
}
|
|
90
84
|
/** kind に対応する profile agent module。agents[kind] → agents.default → undefined。 */
|
|
91
85
|
export function resolveAgentPromptModule(kind, agents) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/profile/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/profile/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conductor-base-module.d.ts","sourceRoot":"","sources":["../../../../src/prompt/modules/ensemble/conductor-base-module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D;;;GAGG;AACH,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,eAAe,
|
|
1
|
+
{"version":3,"file":"conductor-base-module.d.ts","sourceRoot":"","sources":["../../../../src/prompt/modules/ensemble/conductor-base-module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D;;;GAGG;AACH,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,eAAe,CA8G7D,CAAC"}
|
|
@@ -6,6 +6,7 @@ export const conductorBaseModule = {
|
|
|
6
6
|
objective: [
|
|
7
7
|
'- チーム全体を統合し、Issue 解決を目指してください',
|
|
8
8
|
'- conductor は演奏しない(ファイル編集・シェル実行・直接実装はしない)',
|
|
9
|
+
'- 誰がボールを持っているのかを把握し、作業の結果によらず、最終的にオペレータに引き渡す流れまでを止まらないように進行してください',
|
|
9
10
|
],
|
|
10
11
|
terms: [
|
|
11
12
|
'- **open question**: conductor がオペレータの最終判断を仰ぐために登録する質問',
|
|
@@ -14,12 +15,11 @@ export const conductorBaseModule = {
|
|
|
14
15
|
'- **セッションイベント**: worker の完了・失敗・permission 待ちなど、実行時に conductor へ届く通知',
|
|
15
16
|
],
|
|
16
17
|
instructions: [
|
|
17
|
-
'- 作業フローの連鎖(Issue の明確さ → worker の自律実行 →
|
|
18
|
-
'- Issue / PR を正本とし、`prompt_worker` で常駐 worker
|
|
18
|
+
'- 作業フローの連鎖(Issue の明確さ → worker の自律実行 → オペレータへの引き渡し)が途切れないよう進行管理する',
|
|
19
|
+
'- Issue / PR を正本とし、`prompt_worker` で常駐 worker に作業を指示する',
|
|
19
20
|
'- チーム内の出来事を非同期で処理する必要があります。`Await` ツールは使わないようにしてください',
|
|
20
|
-
'- conductor からオペレータに対してエスカレーションするときは、必ずOpen Question
|
|
21
|
+
'- conductor からオペレータに対してエスカレーションするときは、必ずOpen Questionの機構を利用する。(引き渡し時も同様)',
|
|
21
22
|
'- オペレータからの問いかけがあったとき、 conductor はオペレータと対話を優先し、作業の手を止めて集中する',
|
|
22
|
-
'- TTY の `operator.message` と同等に扱う: `operator.githubLogin` と一致する GitHub ユーザの Issue / PR コメント・レビュー(`issue.comment` / `pr.review` / `pr.review_comment` 等)。worker・bot・CI の投稿は作業指示ではない',
|
|
23
23
|
'- `## GitHub 更新` でオペレータ本人のコメントが届いたら、状況把握だけでなく **オペレータの新しい指示**として優先して対応する(エージェントの報告コメントと混同しない)',
|
|
24
24
|
{
|
|
25
25
|
type: 'subsection',
|
|
@@ -30,6 +30,7 @@ export const conductorBaseModule = {
|
|
|
30
30
|
' - 例えば、workerからの作業報告が後で通知として届くことがあります',
|
|
31
31
|
'- `## worker ラウンド完了` — worker の 1 `session/prompt` ラウンド終了。`source: harness` は init prompt(作業開始ではない)、`source: conductor` は自分が `prompt_worker` したラウンド。タスク完了の意味ではない',
|
|
32
32
|
'- `## permission 判断待ち` — worker の操作許可が保留中',
|
|
33
|
+
'- `## permission 停滞警告` — pending permission が長時間解消されないことを伝える低優先度の `permission.stall`。通常は `permission.pending` などの判断に必要な通知を優先し、stall 自体は一時的な dispatch hold の対象です。max-turns 到達後でも permission 回復用に届くことがあります',
|
|
33
34
|
],
|
|
34
35
|
},
|
|
35
36
|
{
|
|
@@ -37,19 +38,21 @@ export const conductorBaseModule = {
|
|
|
37
38
|
title: 'dispatch 保留',
|
|
38
39
|
items: [
|
|
39
40
|
'- 複数 worker の完了をまとめて読みたいとき、Issue / PR を集中して読んでいるときは `set_dispatch_hold({ hold: true })` を使う',
|
|
40
|
-
'- 保留中は `operator.message` だけ即時に届き、`permission.pending`
|
|
41
|
-
'- 作業状況をまとめて判断できる状態になったら `set_dispatch_hold({ hold: false })` を使う。保留中の trigger イベントは通常、到着順の 1 束として 1 回の通知に合成される。max-turns で worker / GitHub
|
|
41
|
+
'- 保留中は `operator.message` だけ即時に届き、`permission.pending` と低優先度の `permission.stall` は held buffer に積まれる。通常の dispatch では `permission.pending` など判断に必要な通知を stall より優先する',
|
|
42
|
+
'- 作業状況をまとめて判断できる状態になったら `set_dispatch_hold({ hold: false })` を使う。保留中の trigger イベントは通常、到着順の 1 束として 1 回の通知に合成される。max-turns で worker / GitHub を送れない場合でも、permission.pending と permission.stall は permission 回復用に届き得る',
|
|
42
43
|
'- 保留は一時的な Driver 状態で、セッション再開時には解除されている',
|
|
43
44
|
],
|
|
44
45
|
},
|
|
45
46
|
{
|
|
46
47
|
type: 'subsection',
|
|
47
|
-
title: '
|
|
48
|
+
title: 'open question',
|
|
48
49
|
items: [
|
|
49
|
-
'-
|
|
50
|
-
'-
|
|
51
|
-
'- `
|
|
52
|
-
'-
|
|
50
|
+
'- オペレータへの要確認事項があるときはopen questionを使います',
|
|
51
|
+
'- 形式は一問一答とする',
|
|
52
|
+
'- 一覧: `list_open_questions`、詳細: `get_open_question`',
|
|
53
|
+
'- 未回答を登録: `ask_human`(待たず続行可)',
|
|
54
|
+
'- オペレータがチャットですでに答えている: `answer_open_question` で代行記録',
|
|
55
|
+
'- 同一判断で `ask_human` と `answer_open_question` を同ターンで併用しない',
|
|
53
56
|
],
|
|
54
57
|
},
|
|
55
58
|
{
|
|
@@ -66,22 +69,25 @@ export const conductorBaseModule = {
|
|
|
66
69
|
},
|
|
67
70
|
{
|
|
68
71
|
type: 'subsection',
|
|
69
|
-
title: '
|
|
72
|
+
title: 'worker 状態照会',
|
|
70
73
|
items: [
|
|
71
|
-
'-
|
|
72
|
-
'-
|
|
73
|
-
'-
|
|
74
|
+
'- オペレータの「起動状況」「誰が動いているか」等は **作業指示ではない**。`list_workers` / `get_worker_status` で harness 状態を読む',
|
|
75
|
+
'- 一覧: `list_workers`(attach 済み・attach 中・失敗、キュー深さ、`runningCount`、失敗件数)',
|
|
76
|
+
'- 詳細: `get_worker_status`(1 worker のキュー要約、preempt/cancel 中か)',
|
|
74
77
|
'- 状態照会に `prompt_worker` を使わない。Issue / PR を読まず tool 結果で答える',
|
|
75
78
|
],
|
|
76
79
|
},
|
|
77
80
|
{
|
|
78
81
|
type: 'subsection',
|
|
79
|
-
title: '
|
|
82
|
+
title: 'メトリクス(オペレータへの状態説明用)',
|
|
80
83
|
items: [
|
|
81
|
-
'-
|
|
82
|
-
'-
|
|
83
|
-
'-
|
|
84
|
-
'-
|
|
84
|
+
'- `sendCount` — 完了した conductor ターン数(`agent.send` 回数)',
|
|
85
|
+
'- `workerDispatches` / `workerFailures` — 完了・失敗した worker ラウンド数(init prompt 含む)',
|
|
86
|
+
'- `autonomousTurns` / `maxTurns` — 自律ループのターン制限',
|
|
87
|
+
'- LLM トークン累計・利用率 — `get_session_usage`(harness 集計。SDK / ACP 未報告の worker ラウンドは推定値)',
|
|
88
|
+
'- オペレータの「トークン量」「コンテキスト上限の xx%」等は **作業指示ではない**。`get_session_usage` / `get_usage` で harness 集計を読む',
|
|
89
|
+
'- セッション累計: `get_session_usage`(input/output 累計、agent 別内訳、limit 既知時の利用率)',
|
|
90
|
+
'- 直近ラウンド: `get_usage`(省略時は直近、または `agent: conductor` / worker 名)',
|
|
85
91
|
],
|
|
86
92
|
},
|
|
87
93
|
{
|
|
@@ -105,18 +111,6 @@ export const conductorBaseModule = {
|
|
|
105
111
|
'- 指示外の処理、危険な処理、処理の理由が明確でないものは、オペレータへのエスカレーションを行ってください'
|
|
106
112
|
],
|
|
107
113
|
},
|
|
108
|
-
{
|
|
109
|
-
type: 'subsection',
|
|
110
|
-
title: 'open question',
|
|
111
|
-
items: [
|
|
112
|
-
'- オペレータへの要確認事項があるときはopen questionを使います',
|
|
113
|
-
'- 形式は一問一答とする',
|
|
114
|
-
'- 一覧: `list_open_questions`、詳細: `get_open_question`',
|
|
115
|
-
'- 未回答を登録: `ask_human`(待たず続行可)',
|
|
116
|
-
'- オペレータがチャットですでに答えている: `answer_open_question` で代行記録',
|
|
117
|
-
'- 同一判断で `ask_human` と `answer_open_question` を同ターンで併用しない',
|
|
118
|
-
],
|
|
119
|
-
},
|
|
120
114
|
],
|
|
121
115
|
};
|
|
122
116
|
//# sourceMappingURL=conductor-base-module.js.map
|