@qduc/term2 0.1.6 → 0.1.8
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/cli.js +5 -0
- package/dist/cli.js.map +1 -1
- package/dist/components/BottomArea.d.ts +1 -8
- package/dist/components/BottomArea.d.ts.map +1 -1
- package/dist/components/BottomArea.js.map +1 -1
- package/dist/components/InputBox.d.ts +6 -0
- package/dist/components/InputBox.d.ts.map +1 -1
- package/dist/components/InputBox.js +25 -3
- package/dist/components/InputBox.js.map +1 -1
- package/dist/components/InputBox.test.js +10 -1
- package/dist/components/InputBox.test.js.map +1 -1
- package/dist/contracts/conversation.d.ts +27 -0
- package/dist/contracts/conversation.d.ts.map +1 -0
- package/dist/contracts/conversation.js +2 -0
- package/dist/contracts/conversation.js.map +1 -0
- package/dist/hooks/use-conversation.d.ts +3 -14
- package/dist/hooks/use-conversation.d.ts.map +1 -1
- package/dist/hooks/use-conversation.js +15 -87
- package/dist/hooks/use-conversation.js.map +1 -1
- package/dist/lib/openai-agent-client.d.ts.map +1 -1
- package/dist/lib/openai-agent-client.js +2 -1
- package/dist/lib/openai-agent-client.js.map +1 -1
- package/dist/lib/openai-strict-tool-schema.d.ts +10 -0
- package/dist/lib/openai-strict-tool-schema.d.ts.map +1 -0
- package/dist/lib/openai-strict-tool-schema.js +39 -0
- package/dist/lib/openai-strict-tool-schema.js.map +1 -0
- package/dist/lib/openai-strict-tool-schema.test.d.ts +2 -0
- package/dist/lib/openai-strict-tool-schema.test.d.ts.map +1 -0
- package/dist/lib/openai-strict-tool-schema.test.js +26 -0
- package/dist/lib/openai-strict-tool-schema.test.js.map +1 -0
- package/dist/lib/tool-invoke.d.ts +13 -0
- package/dist/lib/tool-invoke.d.ts.map +1 -1
- package/dist/lib/tool-invoke.js +61 -3
- package/dist/lib/tool-invoke.js.map +1 -1
- package/dist/lib/tool-invoke.test.js +139 -1
- package/dist/lib/tool-invoke.test.js.map +1 -1
- package/dist/prompts/simple.md +4 -0
- package/dist/providers/openai-compatible/model.js +3 -3
- package/dist/providers/openai-compatible/model.js.map +1 -1
- package/dist/providers/openai-compatible/reasoning-content.test.js +70 -0
- package/dist/providers/openai-compatible/reasoning-content.test.js.map +1 -1
- package/dist/providers/openrouter/model.js +3 -3
- package/dist/providers/openrouter/model.js.map +1 -1
- package/dist/providers/openrouter/utils.d.ts +1 -0
- package/dist/providers/openrouter/utils.d.ts.map +1 -1
- package/dist/providers/openrouter/utils.js +3 -0
- package/dist/providers/openrouter/utils.js.map +1 -1
- package/dist/providers/openrouter.test.js +64 -0
- package/dist/providers/openrouter.test.js.map +1 -1
- package/dist/services/approval-presentation-policy.d.ts +17 -0
- package/dist/services/approval-presentation-policy.d.ts.map +1 -0
- package/dist/services/approval-presentation-policy.js +44 -0
- package/dist/services/approval-presentation-policy.js.map +1 -0
- package/dist/services/approval-presentation-policy.test.d.ts +2 -0
- package/dist/services/approval-presentation-policy.test.d.ts.map +1 -0
- package/dist/services/approval-presentation-policy.test.js +74 -0
- package/dist/services/approval-presentation-policy.test.js.map +1 -0
- package/dist/services/approval-state.d.ts +4 -4
- package/dist/services/approval-state.d.ts.map +1 -1
- package/dist/services/conversation-events.d.ts +12 -9
- package/dist/services/conversation-events.d.ts.map +1 -1
- package/dist/services/conversation-service.d.ts +7 -5
- package/dist/services/conversation-service.d.ts.map +1 -1
- package/dist/services/conversation-service.js +1 -1
- package/dist/services/conversation-service.js.map +1 -1
- package/dist/services/conversation-session.d.ts +4 -24
- package/dist/services/conversation-session.d.ts.map +1 -1
- package/dist/services/conversation-session.js +172 -229
- package/dist/services/conversation-session.js.map +1 -1
- package/dist/services/conversation-store.d.ts +6 -0
- package/dist/services/conversation-store.d.ts.map +1 -1
- package/dist/services/conversation-store.js +13 -0
- package/dist/services/conversation-store.js.map +1 -1
- package/dist/tools/ask-mentor.d.ts +1 -1
- package/dist/tools/ask-mentor.js +1 -1
- package/dist/tools/ask-mentor.js.map +1 -1
- package/dist/tools/ask-mentor.test.js +9 -3
- package/dist/tools/ask-mentor.test.js.map +1 -1
- package/dist/tools/find-files.d.ts +2 -2
- package/dist/tools/find-files.d.ts.map +1 -1
- package/dist/tools/find-files.js +2 -4
- package/dist/tools/find-files.js.map +1 -1
- package/dist/tools/find-files.test.js +7 -19
- package/dist/tools/find-files.test.js.map +1 -1
- package/dist/tools/grep.d.ts +1 -1
- package/dist/tools/grep.d.ts.map +1 -1
- package/dist/tools/grep.js +1 -5
- package/dist/tools/grep.js.map +1 -1
- package/dist/tools/read-file.d.ts +2 -2
- package/dist/tools/read-file.d.ts.map +1 -1
- package/dist/tools/read-file.js +2 -4
- package/dist/tools/read-file.js.map +1 -1
- package/dist/tools/read-file.test.js +22 -13
- package/dist/tools/read-file.test.js.map +1 -1
- package/dist/tools/search-replace.d.ts +1 -1
- package/dist/tools/search-replace.d.ts.map +1 -1
- package/dist/tools/search-replace.js +158 -1
- package/dist/tools/search-replace.js.map +1 -1
- package/dist/tools/search-replace.test.js +177 -0
- package/dist/tools/search-replace.test.js.map +1 -1
- package/dist/tools/search.d.ts +4 -4
- package/dist/tools/search.d.ts.map +1 -1
- package/dist/tools/search.js +5 -14
- package/dist/tools/search.js.map +1 -1
- package/dist/tools/shell.d.ts +2 -2
- package/dist/tools/shell.d.ts.map +1 -1
- package/dist/tools/shell.js +2 -4
- package/dist/tools/shell.js.map +1 -1
- package/dist/tools/tool-capabilities.d.ts +6 -0
- package/dist/tools/tool-capabilities.d.ts.map +1 -0
- package/dist/tools/tool-capabilities.js +17 -0
- package/dist/tools/tool-capabilities.js.map +1 -0
- package/dist/tools/tool-parameter-schema.test.d.ts +2 -0
- package/dist/tools/tool-parameter-schema.test.d.ts.map +1 -0
- package/dist/tools/tool-parameter-schema.test.js +88 -0
- package/dist/tools/tool-parameter-schema.test.js.map +1 -0
- package/dist/tools/types.d.ts +4 -2
- package/dist/tools/types.d.ts.map +1 -1
- package/dist/tools/utils.d.ts.map +1 -1
- package/dist/tools/utils.js +4 -1
- package/dist/tools/utils.js.map +1 -1
- package/dist/tools/utils.test.d.ts +2 -0
- package/dist/tools/utils.test.d.ts.map +1 -0
- package/dist/tools/utils.test.js +26 -0
- package/dist/tools/utils.test.js.map +1 -0
- package/dist/tools/web-fetch.d.ts +3 -3
- package/dist/tools/web-fetch.d.ts.map +1 -1
- package/dist/tools/web-fetch.js +3 -2
- package/dist/tools/web-fetch.js.map +1 -1
- package/dist/utils/conversation-event-handler.d.ts +16 -10
- package/dist/utils/conversation-event-handler.d.ts.map +1 -1
- package/dist/utils/conversation-event-handler.js +4 -0
- package/dist/utils/conversation-event-handler.js.map +1 -1
- package/dist/utils/streaming-session-factory.d.ts +9 -9
- package/dist/utils/streaming-session-factory.d.ts.map +1 -1
- package/dist/utils/streaming-session-factory.js +7 -2
- package/dist/utils/streaming-session-factory.js.map +1 -1
- package/dist/utils/synchronized-output.d.ts +35 -0
- package/dist/utils/synchronized-output.d.ts.map +1 -0
- package/dist/utils/synchronized-output.js +66 -0
- package/dist/utils/synchronized-output.js.map +1 -0
- package/dist/utils/synchronized-output.test.d.ts +2 -0
- package/dist/utils/synchronized-output.test.d.ts.map +1 -0
- package/dist/utils/synchronized-output.test.js +70 -0
- package/dist/utils/synchronized-output.test.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import test from 'ava';
|
|
2
|
+
import { annotateApprovedCommandMessage, filterPendingCommandMessagesForApproval, } from './approval-presentation-policy.js';
|
|
3
|
+
const allowAllCapabilities = () => ({
|
|
4
|
+
annotateCommandMessage: true,
|
|
5
|
+
hidePendingDuringPrompt: true,
|
|
6
|
+
});
|
|
7
|
+
test('filterPendingCommandMessagesForApproval prioritizes callId over toolName', (t) => {
|
|
8
|
+
const messages = [
|
|
9
|
+
{
|
|
10
|
+
id: 'call-1-running',
|
|
11
|
+
sender: 'command',
|
|
12
|
+
status: 'running',
|
|
13
|
+
command: 'echo one',
|
|
14
|
+
output: '',
|
|
15
|
+
callId: 'call-1',
|
|
16
|
+
toolName: 'shell',
|
|
17
|
+
},
|
|
18
|
+
{
|
|
19
|
+
id: 'call-2-running',
|
|
20
|
+
sender: 'command',
|
|
21
|
+
status: 'running',
|
|
22
|
+
command: 'echo two',
|
|
23
|
+
output: '',
|
|
24
|
+
callId: 'call-2',
|
|
25
|
+
toolName: 'shell',
|
|
26
|
+
},
|
|
27
|
+
];
|
|
28
|
+
const out = filterPendingCommandMessagesForApproval(messages, { callId: 'call-2', toolName: 'shell' }, allowAllCapabilities);
|
|
29
|
+
t.is(out.length, 1);
|
|
30
|
+
t.is(out[0].callId, 'call-1');
|
|
31
|
+
});
|
|
32
|
+
test('filterPendingCommandMessagesForApproval falls back to toolName when callId missing', (t) => {
|
|
33
|
+
const messages = [
|
|
34
|
+
{
|
|
35
|
+
id: 'apply-running',
|
|
36
|
+
sender: 'command',
|
|
37
|
+
status: 'running',
|
|
38
|
+
command: 'apply patch',
|
|
39
|
+
output: '',
|
|
40
|
+
toolName: 'apply_patch',
|
|
41
|
+
},
|
|
42
|
+
{
|
|
43
|
+
id: 'grep-running',
|
|
44
|
+
sender: 'command',
|
|
45
|
+
status: 'running',
|
|
46
|
+
command: 'grep foo',
|
|
47
|
+
output: '',
|
|
48
|
+
toolName: 'grep',
|
|
49
|
+
},
|
|
50
|
+
];
|
|
51
|
+
const out = filterPendingCommandMessagesForApproval(messages, { toolName: 'apply_patch' }, allowAllCapabilities);
|
|
52
|
+
t.is(out.length, 1);
|
|
53
|
+
t.is(out[0].toolName, 'grep');
|
|
54
|
+
});
|
|
55
|
+
test('annotateApprovedCommandMessage uses capability metadata instead of tool-name checks', (t) => {
|
|
56
|
+
const context = {
|
|
57
|
+
callId: 'call-annotate-1',
|
|
58
|
+
toolName: 'custom_tool',
|
|
59
|
+
};
|
|
60
|
+
const output = annotateApprovedCommandMessage({
|
|
61
|
+
id: 'msg-1',
|
|
62
|
+
sender: 'command',
|
|
63
|
+
status: 'completed',
|
|
64
|
+
command: 'custom',
|
|
65
|
+
output: 'ok',
|
|
66
|
+
callId: 'call-annotate-1',
|
|
67
|
+
toolName: 'custom_tool',
|
|
68
|
+
}, context, (toolName) => toolName === 'custom_tool'
|
|
69
|
+
? { annotateCommandMessage: true, hidePendingDuringPrompt: false }
|
|
70
|
+
: { annotateCommandMessage: false, hidePendingDuringPrompt: false });
|
|
71
|
+
t.truthy(output);
|
|
72
|
+
t.true(output.hadApproval === true);
|
|
73
|
+
});
|
|
74
|
+
//# sourceMappingURL=approval-presentation-policy.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"approval-presentation-policy.test.js","sourceRoot":"","sources":["../../source/services/approval-presentation-policy.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EACL,8BAA8B,EAC9B,uCAAuC,GAExC,MAAM,mCAAmC,CAAC;AAE3C,MAAM,oBAAoB,GAAG,GAAG,EAAE,CAAC,CAAC;IAClC,sBAAsB,EAAE,IAAI;IAC5B,uBAAuB,EAAE,IAAI;CAC9B,CAAC,CAAC;AAEH,IAAI,CAAC,0EAA0E,EAAE,CAAC,CAAC,EAAE,EAAE;IACrF,MAAM,QAAQ,GAAG;QACf;YACE,EAAE,EAAE,gBAAgB;YACpB,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS;YACjB,OAAO,EAAE,UAAU;YACnB,MAAM,EAAE,EAAE;YACV,MAAM,EAAE,QAAQ;YAChB,QAAQ,EAAE,OAAO;SAClB;QACD;YACE,EAAE,EAAE,gBAAgB;YACpB,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS;YACjB,OAAO,EAAE,UAAU;YACnB,MAAM,EAAE,EAAE;YACV,MAAM,EAAE,QAAQ;YAChB,QAAQ,EAAE,OAAO;SAClB;KACF,CAAC;IAEF,MAAM,GAAG,GAAG,uCAAuC,CACjD,QAAQ,EACR,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,EACvC,oBAAoB,CACrB,CAAC;IAEF,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACpB,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAChC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oFAAoF,EAAE,CAAC,CAAC,EAAE,EAAE;IAC/F,MAAM,QAAQ,GAAG;QACf;YACE,EAAE,EAAE,eAAe;YACnB,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS;YACjB,OAAO,EAAE,aAAa;YACtB,MAAM,EAAE,EAAE;YACV,QAAQ,EAAE,aAAa;SACxB;QACD;YACE,EAAE,EAAE,cAAc;YAClB,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS;YACjB,OAAO,EAAE,UAAU;YACnB,MAAM,EAAE,EAAE;YACV,QAAQ,EAAE,MAAM;SACjB;KACF,CAAC;IAEF,MAAM,GAAG,GAAG,uCAAuC,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,oBAAoB,CAAC,CAAC;IAEjH,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACpB,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAChC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qFAAqF,EAAE,CAAC,CAAC,EAAE,EAAE;IAChG,MAAM,OAAO,GAAwB;QACnC,MAAM,EAAE,iBAAiB;QACzB,QAAQ,EAAE,aAAa;KACxB,CAAC;IAEF,MAAM,MAAM,GAAG,8BAA8B,CAC3C;QACE,EAAE,EAAE,OAAO;QACX,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,WAAW;QACnB,OAAO,EAAE,QAAQ;QACjB,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,iBAAiB;QACzB,QAAQ,EAAE,aAAa;KACxB,EACD,OAAO,EACP,CAAC,QAAQ,EAAE,EAAE,CACX,QAAQ,KAAK,aAAa;QACxB,CAAC,CAAC,EAAE,sBAAsB,EAAE,IAAI,EAAE,uBAAuB,EAAE,KAAK,EAAE;QAClE,CAAC,CAAC,EAAE,sBAAsB,EAAE,KAAK,EAAE,uBAAuB,EAAE,KAAK,EAAE,CACxE,CAAC;IAEF,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACjB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,KAAK,IAAI,CAAC,CAAC;AACtC,CAAC,CAAC,CAAC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
export type PendingApprovalContext = {
|
|
2
|
-
state:
|
|
3
|
-
interruption:
|
|
2
|
+
state: unknown;
|
|
3
|
+
interruption: unknown;
|
|
4
4
|
emittedCommandIds: Set<string>;
|
|
5
5
|
toolCallArgumentsById: Map<string, unknown>;
|
|
6
6
|
removeInterceptor?: () => void;
|
|
7
7
|
};
|
|
8
8
|
export type AbortedApprovalContext = {
|
|
9
|
-
state:
|
|
10
|
-
interruption:
|
|
9
|
+
state: unknown;
|
|
10
|
+
interruption: unknown;
|
|
11
11
|
emittedCommandIds: Set<string>;
|
|
12
12
|
toolCallArgumentsById: Map<string, unknown>;
|
|
13
13
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"approval-state.d.ts","sourceRoot":"","sources":["../../source/services/approval-state.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"approval-state.d.ts","sourceRoot":"","sources":["../../source/services/approval-state.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC7C,CAAC;AAEF,qBAAa,aAAa;IACxB,OAAO,CAAC,OAAO,CAAuC;IACtD,OAAO,CAAC,OAAO,CAAuC;IAEtD,UAAU,IAAI,sBAAsB,GAAG,IAAI;IAI3C,UAAU,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI;IAIjD,YAAY,IAAI,IAAI;IAIpB,2BAA2B,CAAC,iBAAiB,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI;IAWzE,YAAY,IAAI,OAAO;IAevB,cAAc,IAAI,sBAAsB,GAAG,IAAI;CAKhD"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { CommandMessage } from '../tools/types.js';
|
|
2
2
|
import type { NormalizedUsage } from '../utils/token-usage.js';
|
|
3
|
-
|
|
3
|
+
import type { ApprovalDescriptor } from '../contracts/conversation.js';
|
|
4
|
+
export type ConversationEvent = TextDeltaEvent | ReasoningDeltaEvent | ToolStartedEvent | CommandMessageEvent | ApprovalRequiredEvent | UsageUpdateEvent | FinalResponseEvent | ErrorEvent | RetryEvent;
|
|
4
5
|
export interface RetryEvent {
|
|
5
6
|
type: 'retry';
|
|
6
7
|
toolName: string;
|
|
@@ -35,17 +36,19 @@ export interface ToolStartedEvent {
|
|
|
35
36
|
type: 'tool_started';
|
|
36
37
|
toolCallId: string;
|
|
37
38
|
toolName: string;
|
|
38
|
-
arguments:
|
|
39
|
+
arguments: unknown;
|
|
39
40
|
}
|
|
40
41
|
export interface ApprovalRequiredEvent {
|
|
41
42
|
type: 'approval_required';
|
|
42
|
-
approval:
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
43
|
+
approval: Omit<ApprovalDescriptor, 'rawInterruption'>;
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* Emitted when token usage information is received during streaming.
|
|
47
|
+
* Allows UI to display token usage in real-time rather than waiting for final response.
|
|
48
|
+
*/
|
|
49
|
+
export interface UsageUpdateEvent {
|
|
50
|
+
type: 'usage_update';
|
|
51
|
+
usage: NormalizedUsage;
|
|
49
52
|
}
|
|
50
53
|
export interface CommandMessageEvent {
|
|
51
54
|
type: 'command_message';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-events.d.ts","sourceRoot":"","sources":["../../source/services/conversation-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"conversation-events.d.ts","sourceRoot":"","sources":["../../source/services/conversation-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,MAAM,MAAM,iBAAiB,GACzB,cAAc,GACd,mBAAmB,GACnB,gBAAgB,GAChB,mBAAmB,GACnB,qBAAqB,GACrB,gBAAgB,GAChB,kBAAkB,GAClB,UAAU,GACV,UAAU,CAAC;AAEf,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,iBAAiB,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,cAAc,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC;CACvD;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,eAAe,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,iBAAiB,CAAC;IACxB,OAAO,EAAE,cAAc,CAAC;CACzB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,4DAA4D;IAC5D,eAAe,CAAC,EAAE,mBAAmB,CAAC,SAAS,CAAC,EAAE,CAAC;IACnD,iCAAiC;IACjC,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import type { OpenAIAgentClient } from '../lib/openai-agent-client.js';
|
|
2
2
|
import type { ILoggingService } from './service-interfaces.js';
|
|
3
3
|
import { ConversationSession } from './conversation-session.js';
|
|
4
|
-
|
|
4
|
+
import type { ConversationTerminal, ReasoningEffortSetting } from '../contracts/conversation.js';
|
|
5
|
+
export type { ConversationTerminal, ApprovalDescriptor, PendingApproval } from '../contracts/conversation.js';
|
|
6
|
+
export type { CommandMessage } from './conversation-session.js';
|
|
5
7
|
/**
|
|
6
8
|
* Backward-compatible facade for the CLI.
|
|
7
9
|
*
|
|
@@ -19,13 +21,13 @@ export declare class ConversationService {
|
|
|
19
21
|
get sessionId(): string;
|
|
20
22
|
reset(): void;
|
|
21
23
|
setModel(model: string): void;
|
|
22
|
-
setReasoningEffort(effort:
|
|
23
|
-
setTemperature(temperature
|
|
24
|
+
setReasoningEffort(effort: ReasoningEffortSetting): void;
|
|
25
|
+
setTemperature(temperature?: number): void;
|
|
24
26
|
setProvider(provider: string): void;
|
|
25
27
|
setRetryCallback(callback: () => void): void;
|
|
26
28
|
addShellContext(historyText: string): void;
|
|
27
29
|
abort(): void;
|
|
28
|
-
sendMessage(...args: Parameters<ConversationSession['sendMessage']>): Promise<
|
|
29
|
-
handleApprovalDecision(...args: Parameters<ConversationSession['handleApprovalDecision']>): Promise<
|
|
30
|
+
sendMessage(...args: Parameters<ConversationSession['sendMessage']>): Promise<ConversationTerminal>;
|
|
31
|
+
handleApprovalDecision(...args: Parameters<ConversationSession['handleApprovalDecision']>): Promise<ConversationTerminal | null>;
|
|
30
32
|
}
|
|
31
33
|
//# sourceMappingURL=conversation-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-service.d.ts","sourceRoot":"","sources":["../../source/services/conversation-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"conversation-service.d.ts","sourceRoot":"","sources":["../../source/services/conversation-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEjG,YAAY,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC9G,YAAY,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE;;;;GAIG;AACH,qBAAa,mBAAmB;;gBAGlB,EACV,WAAW,EACX,IAAI,EACJ,SAAqB,GACtB,EAAE;QACD,WAAW,EAAE,iBAAiB,CAAC;QAC/B,IAAI,EAAE;YAAE,MAAM,EAAE,eAAe,CAAA;SAAE,CAAC;QAClC,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;IAID,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,KAAK,IAAI,IAAI;IAIb,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAI7B,kBAAkB,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI;IAIxD,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI;IAI1C,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAInC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI;IAI5C,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAI1C,KAAK,IAAI,IAAI;IAIb,WAAW,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAInG,sBAAsB,CACpB,GAAG,IAAI,EAAE,UAAU,CAAC,mBAAmB,CAAC,wBAAwB,CAAC,CAAC,GACjE,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;CAGxC"}
|
|
@@ -22,7 +22,7 @@ export class ConversationService {
|
|
|
22
22
|
this.#session.setReasoningEffort(effort);
|
|
23
23
|
}
|
|
24
24
|
setTemperature(temperature) {
|
|
25
|
-
this.#session.setTemperature
|
|
25
|
+
this.#session.setTemperature(temperature);
|
|
26
26
|
}
|
|
27
27
|
setProvider(provider) {
|
|
28
28
|
this.#session.setProvider(provider);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-service.js","sourceRoot":"","sources":["../../source/services/conversation-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"conversation-service.js","sourceRoot":"","sources":["../../source/services/conversation-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAMhE;;;;GAIG;AACH,MAAM,OAAO,mBAAmB;IACrB,QAAQ,CAAsB;IAEvC,YAAY,EACV,WAAW,EACX,IAAI,EACJ,SAAS,GAAG,SAAS,GAKtB;QACC,IAAI,CAAC,QAAQ,GAAG,IAAI,mBAAmB,CAAC,SAAS,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,kBAAkB,CAAC,MAA8B;QAC/C,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED,cAAc,CAAC,WAAoB;QACjC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IAC5C,CAAC;IAED,WAAW,CAAC,QAAgB;QAC1B,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,gBAAgB,CAAC,QAAoB;QACnC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED,eAAe,CAAC,WAAmB;QACjC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,WAAW,CAAC,GAAG,IAAoD;QACjE,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,sBAAsB,CACpB,GAAG,IAA+D;QAElE,OAAO,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,GAAG,IAAI,CAAC,CAAC;IACvD,CAAC;CACF"}
|
|
@@ -2,26 +2,9 @@ import type { OpenAIAgentClient } from '../lib/openai-agent-client.js';
|
|
|
2
2
|
import type { ILoggingService } from './service-interfaces.js';
|
|
3
3
|
import type { ConversationEvent } from './conversation-events.js';
|
|
4
4
|
import type { CommandMessage } from '../tools/types.js';
|
|
5
|
-
import {
|
|
5
|
+
import type { ConversationTerminal, ReasoningEffortSetting } from '../contracts/conversation.js';
|
|
6
6
|
export type { CommandMessage };
|
|
7
|
-
|
|
8
|
-
type: 'approval_required';
|
|
9
|
-
approval: {
|
|
10
|
-
agentName: string;
|
|
11
|
-
toolName: string;
|
|
12
|
-
argumentsText: string;
|
|
13
|
-
rawInterruption: any;
|
|
14
|
-
callId?: string;
|
|
15
|
-
};
|
|
16
|
-
}
|
|
17
|
-
interface ResponseResult {
|
|
18
|
-
type: 'response';
|
|
19
|
-
commandMessages: CommandMessage[];
|
|
20
|
-
finalText: string;
|
|
21
|
-
reasoningText?: string;
|
|
22
|
-
usage?: NormalizedUsage;
|
|
23
|
-
}
|
|
24
|
-
export type ConversationResult = ApprovalResult | ResponseResult;
|
|
7
|
+
export type ConversationResult = ConversationTerminal;
|
|
25
8
|
export declare class ConversationSession {
|
|
26
9
|
#private;
|
|
27
10
|
readonly id: string;
|
|
@@ -33,10 +16,7 @@ export declare class ConversationSession {
|
|
|
33
16
|
private textDeltaCount;
|
|
34
17
|
private reasoningDeltaCount;
|
|
35
18
|
private toolCallArgumentsById;
|
|
36
|
-
private lastEventType;
|
|
37
|
-
private eventTypeCount;
|
|
38
19
|
private emittedInvalidToolCallPackets;
|
|
39
|
-
private flushStreamEventLog;
|
|
40
20
|
constructor(id: string, { agentClient, deps }: {
|
|
41
21
|
agentClient: OpenAIAgentClient;
|
|
42
22
|
deps: {
|
|
@@ -45,8 +25,8 @@ export declare class ConversationSession {
|
|
|
45
25
|
});
|
|
46
26
|
reset(): void;
|
|
47
27
|
setModel(model: string): void;
|
|
48
|
-
setReasoningEffort(effort:
|
|
49
|
-
setTemperature(temperature
|
|
28
|
+
setReasoningEffort(effort: ReasoningEffortSetting): void;
|
|
29
|
+
setTemperature(temperature?: number): void;
|
|
50
30
|
setProvider(provider: string): void;
|
|
51
31
|
setRetryCallback(callback: () => void): void;
|
|
52
32
|
addShellContext(historyText: string): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-session.d.ts","sourceRoot":"","sources":["../../source/services/conversation-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"conversation-session.d.ts","sourceRoot":"","sources":["../../source/services/conversation-session.ts"],"names":[],"mappings":"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"}
|