@alexnetrebskii/hive-agent 1.1.0 → 1.3.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/context-manager.d.ts +2 -1
- package/dist/context-manager.d.ts.map +1 -1
- package/dist/context-manager.js +51 -9
- package/dist/context-manager.js.map +1 -1
- package/dist/context-manager.test.d.ts +2 -0
- package/dist/context-manager.test.d.ts.map +1 -0
- package/dist/context-manager.test.js +183 -0
- package/dist/context-manager.test.js.map +1 -0
- package/dist/shell/shell.d.ts.map +1 -1
- package/dist/shell/shell.js +7 -3
- package/dist/shell/shell.js.map +1 -1
- package/package.json +1 -1
|
@@ -21,7 +21,8 @@ export declare function estimateContentBlockTokens(block: ContentBlock): number;
|
|
|
21
21
|
*/
|
|
22
22
|
export declare function estimateTotalTokens(messages: Message[]): number;
|
|
23
23
|
/**
|
|
24
|
-
* Truncate old messages to fit within token limit
|
|
24
|
+
* Truncate old messages to fit within token limit.
|
|
25
|
+
* Preserves tool_use/tool_result pairs as atomic units — never breaks them apart.
|
|
25
26
|
*/
|
|
26
27
|
export declare function truncateOldMessages(messages: Message[], maxTokens: number, preserveFirst?: number): Message[];
|
|
27
28
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-manager.d.ts","sourceRoot":"","sources":["../src/context-manager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAExE;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAQ9D;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,CAatE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAE/D;
|
|
1
|
+
{"version":3,"file":"context-manager.d.ts","sourceRoot":"","sources":["../src/context-manager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAExE;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAQ9D;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,CAatE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAE/D;AA2CD;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,OAAO,EAAE,EACnB,SAAS,EAAE,MAAM,EACjB,aAAa,GAAE,MAAU,GACxB,OAAO,EAAE,CA+BX;AAED;;GAEG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,aAAa,CAAY;gBAErB,SAAS,GAAE,MAAe,EAAE,QAAQ,GAAE,eAAgC;IAKlF;;OAEG;IACH,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI;IAI3C;;OAEG;IACH,kBAAkB,IAAI,MAAM;IAI5B;;OAEG;IACH,cAAc,IAAI,OAAO;IAIzB;;OAEG;IACH,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE;CAmB9C"}
|
package/dist/context-manager.js
CHANGED
|
@@ -44,7 +44,46 @@ export function estimateTotalTokens(messages) {
|
|
|
44
44
|
return messages.reduce((sum, msg) => sum + estimateMessageTokens(msg), 0);
|
|
45
45
|
}
|
|
46
46
|
/**
|
|
47
|
-
*
|
|
47
|
+
* Check if message contains tool_use blocks
|
|
48
|
+
*/
|
|
49
|
+
function hasToolUse(message) {
|
|
50
|
+
if (typeof message.content === 'string')
|
|
51
|
+
return false;
|
|
52
|
+
return message.content.some(b => b.type === 'tool_use');
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* Check if message contains tool_result blocks
|
|
56
|
+
*/
|
|
57
|
+
function hasToolResult(message) {
|
|
58
|
+
if (typeof message.content === 'string')
|
|
59
|
+
return false;
|
|
60
|
+
return message.content.some(b => b.type === 'tool_result');
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Group messages into atomic units that must be kept or removed together.
|
|
64
|
+
* A tool exchange (assistant with tool_use + user with tool_result) forms one group.
|
|
65
|
+
* Plain text messages form their own group.
|
|
66
|
+
*/
|
|
67
|
+
function groupMessages(messages) {
|
|
68
|
+
const groups = [];
|
|
69
|
+
let i = 0;
|
|
70
|
+
while (i < messages.length) {
|
|
71
|
+
const msg = messages[i];
|
|
72
|
+
// Assistant message with tool_use — group with following tool_result message
|
|
73
|
+
if (msg.role === 'assistant' && hasToolUse(msg) && i + 1 < messages.length && hasToolResult(messages[i + 1])) {
|
|
74
|
+
groups.push([msg, messages[i + 1]]);
|
|
75
|
+
i += 2;
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
groups.push([msg]);
|
|
79
|
+
i += 1;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
return groups;
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* Truncate old messages to fit within token limit.
|
|
86
|
+
* Preserves tool_use/tool_result pairs as atomic units — never breaks them apart.
|
|
48
87
|
*/
|
|
49
88
|
export function truncateOldMessages(messages, maxTokens, preserveFirst = 1) {
|
|
50
89
|
if (messages.length <= preserveFirst) {
|
|
@@ -57,19 +96,22 @@ export function truncateOldMessages(messages, maxTokens, preserveFirst = 1) {
|
|
|
57
96
|
result.push(messages[i]);
|
|
58
97
|
totalTokens += estimateMessageTokens(messages[i]);
|
|
59
98
|
}
|
|
60
|
-
//
|
|
61
|
-
const
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
99
|
+
// Group remaining messages to keep tool_use/tool_result pairs together
|
|
100
|
+
const remainingMessages = messages.slice(preserveFirst);
|
|
101
|
+
const groups = groupMessages(remainingMessages);
|
|
102
|
+
// Add groups from the end until we hit the limit
|
|
103
|
+
const kept = [];
|
|
104
|
+
for (let i = groups.length - 1; i >= 0; i--) {
|
|
105
|
+
const groupTokens = groups[i].reduce((sum, msg) => sum + estimateMessageTokens(msg), 0);
|
|
106
|
+
if (totalTokens + groupTokens <= maxTokens) {
|
|
107
|
+
kept.unshift(...groups[i]);
|
|
108
|
+
totalTokens += groupTokens;
|
|
67
109
|
}
|
|
68
110
|
else {
|
|
69
111
|
break;
|
|
70
112
|
}
|
|
71
113
|
}
|
|
72
|
-
return [...result, ...
|
|
114
|
+
return [...result, ...kept];
|
|
73
115
|
}
|
|
74
116
|
/**
|
|
75
117
|
* Context manager for tracking token usage during execution
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-manager.js","sourceRoot":"","sources":["../src/context-manager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;AACnC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAAgB;IACpD,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IACxC,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;QAC3C,OAAO,GAAG,GAAG,0BAA0B,CAAC,KAAK,CAAC,CAAA;IAChD,CAAC,EAAE,CAAC,CAAC,CAAA;AACP,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,0BAA0B,CAAC,KAAmB;IAC5D,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,MAAM;YACT,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACnC,KAAK,UAAU;YACb,OAAO,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QACvC,KAAK,UAAU;YACb,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;QACjF,KAAK,aAAa;YAChB,OAAO,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QACtC;YACE,OAAO,CAAC,CAAA;IACZ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,QAAmB;IACrD,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;AAC3E,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,mBAAmB,CACjC,QAAmB,EACnB,SAAiB,EACjB,gBAAwB,CAAC;IAEzB,IAAI,QAAQ,CAAC,MAAM,IAAI,aAAa,EAAE,CAAC;QACrC,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,MAAM,MAAM,GAAc,EAAE,CAAA;IAC5B,IAAI,WAAW,GAAG,CAAC,CAAA;IAEnB,4DAA4D;IAC5D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9D,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;QACxB,WAAW,IAAI,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;IACnD,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"context-manager.js","sourceRoot":"","sources":["../src/context-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"context-manager.test.d.ts","sourceRoot":"","sources":["../src/context-manager.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { truncateOldMessages, estimateMessageTokens, ContextManager } from './context-manager.js';
|
|
3
|
+
// Helpers to build messages concisely
|
|
4
|
+
function userText(text) {
|
|
5
|
+
return { role: 'user', content: text };
|
|
6
|
+
}
|
|
7
|
+
function assistantText(text) {
|
|
8
|
+
return { role: 'assistant', content: text };
|
|
9
|
+
}
|
|
10
|
+
function assistantToolUse(id, name = '__shell__') {
|
|
11
|
+
return {
|
|
12
|
+
role: 'assistant',
|
|
13
|
+
content: [{ type: 'tool_use', id, name, input: {} }],
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
function userToolResult(toolUseId, result = 'ok') {
|
|
17
|
+
return {
|
|
18
|
+
role: 'user',
|
|
19
|
+
content: [{ type: 'tool_result', tool_use_id: toolUseId, content: result }],
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
function assistantTextAndToolUse(text, id, name = '__shell__') {
|
|
23
|
+
return {
|
|
24
|
+
role: 'assistant',
|
|
25
|
+
content: [
|
|
26
|
+
{ type: 'text', text },
|
|
27
|
+
{ type: 'tool_use', id, name, input: {} },
|
|
28
|
+
],
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
describe('truncateOldMessages', () => {
|
|
32
|
+
it('returns all messages when within limit', () => {
|
|
33
|
+
const messages = [
|
|
34
|
+
userText('hello'),
|
|
35
|
+
assistantText('hi'),
|
|
36
|
+
];
|
|
37
|
+
const result = truncateOldMessages(messages, 100000);
|
|
38
|
+
expect(result).toEqual(messages);
|
|
39
|
+
});
|
|
40
|
+
it('preserves first message and keeps recent messages', () => {
|
|
41
|
+
const messages = [
|
|
42
|
+
userText('first'),
|
|
43
|
+
assistantText('a'.repeat(1000)),
|
|
44
|
+
userText('b'.repeat(1000)),
|
|
45
|
+
assistantText('c'.repeat(100)),
|
|
46
|
+
userText('last'),
|
|
47
|
+
];
|
|
48
|
+
const firstTokens = estimateMessageTokens(messages[0]);
|
|
49
|
+
const lastTwoTokens = estimateMessageTokens(messages[3]) + estimateMessageTokens(messages[4]);
|
|
50
|
+
const limit = firstTokens + lastTwoTokens + 10; // just enough for first + last two
|
|
51
|
+
const result = truncateOldMessages(messages, limit);
|
|
52
|
+
expect(result[0]).toEqual(messages[0]); // first preserved
|
|
53
|
+
expect(result[result.length - 1]).toEqual(messages[4]); // last preserved
|
|
54
|
+
expect(result.length).toBeLessThan(messages.length);
|
|
55
|
+
});
|
|
56
|
+
describe('tool_use/tool_result pair safety', () => {
|
|
57
|
+
it('never separates a tool_use from its tool_result', () => {
|
|
58
|
+
const messages = [
|
|
59
|
+
userText('start'), // [0] preserved
|
|
60
|
+
assistantToolUse('tool_1'), // [1] pair A
|
|
61
|
+
userToolResult('tool_1', 'x'.repeat(2000)), // [2] pair A
|
|
62
|
+
assistantToolUse('tool_2'), // [3] pair B
|
|
63
|
+
userToolResult('tool_2', 'y'.repeat(2000)), // [4] pair B
|
|
64
|
+
assistantText('final answer'), // [5]
|
|
65
|
+
userText('thanks'), // [6]
|
|
66
|
+
];
|
|
67
|
+
// Set limit so that only some messages fit after first
|
|
68
|
+
const firstTokens = estimateMessageTokens(messages[0]);
|
|
69
|
+
const lastTwoTokens = estimateMessageTokens(messages[5]) + estimateMessageTokens(messages[6]);
|
|
70
|
+
const pairBTokens = estimateMessageTokens(messages[3]) + estimateMessageTokens(messages[4]);
|
|
71
|
+
// Enough for first + pair B + last two, but NOT pair A
|
|
72
|
+
const limit = firstTokens + pairBTokens + lastTwoTokens + 10;
|
|
73
|
+
const result = truncateOldMessages(messages, limit);
|
|
74
|
+
// Verify no orphaned tool_use or tool_result
|
|
75
|
+
for (let i = 0; i < result.length; i++) {
|
|
76
|
+
const msg = result[i];
|
|
77
|
+
if (typeof msg.content === 'string')
|
|
78
|
+
continue;
|
|
79
|
+
for (const block of msg.content) {
|
|
80
|
+
if (block.type === 'tool_use') {
|
|
81
|
+
// Next message must have matching tool_result
|
|
82
|
+
const next = result[i + 1];
|
|
83
|
+
expect(next).toBeDefined();
|
|
84
|
+
expect(typeof next.content).not.toBe('string');
|
|
85
|
+
const resultBlock = next.content.find((b) => b.type === 'tool_result' && b.tool_use_id === block.id);
|
|
86
|
+
expect(resultBlock).toBeDefined();
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
});
|
|
91
|
+
it('removes both tool_use and tool_result when pair does not fit', () => {
|
|
92
|
+
const messages = [
|
|
93
|
+
userText('start'),
|
|
94
|
+
assistantToolUse('tool_1'),
|
|
95
|
+
userToolResult('tool_1', 'big_result'.repeat(500)),
|
|
96
|
+
assistantText('done'),
|
|
97
|
+
];
|
|
98
|
+
// Enough for first + last text, but not the tool pair
|
|
99
|
+
const firstTokens = estimateMessageTokens(messages[0]);
|
|
100
|
+
const lastTokens = estimateMessageTokens(messages[3]);
|
|
101
|
+
const limit = firstTokens + lastTokens + 10;
|
|
102
|
+
const result = truncateOldMessages(messages, limit);
|
|
103
|
+
expect(result).toEqual([messages[0], messages[3]]);
|
|
104
|
+
});
|
|
105
|
+
it('handles mixed text and tool_use in one assistant message', () => {
|
|
106
|
+
const messages = [
|
|
107
|
+
userText('start'),
|
|
108
|
+
assistantTextAndToolUse('let me check', 'tool_1'),
|
|
109
|
+
userToolResult('tool_1', 'result'),
|
|
110
|
+
assistantText('final'),
|
|
111
|
+
];
|
|
112
|
+
// Enough for everything
|
|
113
|
+
const result = truncateOldMessages(messages, 100000);
|
|
114
|
+
expect(result).toEqual(messages);
|
|
115
|
+
});
|
|
116
|
+
it('handles multiple sequential tool pairs correctly', () => {
|
|
117
|
+
const bigPayload = 'x'.repeat(4000); // ~1000 tokens
|
|
118
|
+
const messages = [
|
|
119
|
+
userText('start'),
|
|
120
|
+
assistantToolUse('t1'),
|
|
121
|
+
userToolResult('t1', bigPayload),
|
|
122
|
+
assistantToolUse('t2'),
|
|
123
|
+
userToolResult('t2', bigPayload),
|
|
124
|
+
assistantToolUse('t3'),
|
|
125
|
+
userToolResult('t3', bigPayload),
|
|
126
|
+
assistantText('summary'),
|
|
127
|
+
userText('ok'),
|
|
128
|
+
];
|
|
129
|
+
// Only enough for first + last pair + last two messages
|
|
130
|
+
const firstTokens = estimateMessageTokens(messages[0]);
|
|
131
|
+
const pair3Tokens = estimateMessageTokens(messages[5]) + estimateMessageTokens(messages[6]);
|
|
132
|
+
const lastTwoTokens = estimateMessageTokens(messages[7]) + estimateMessageTokens(messages[8]);
|
|
133
|
+
const limit = firstTokens + pair3Tokens + lastTwoTokens + 10;
|
|
134
|
+
const result = truncateOldMessages(messages, limit);
|
|
135
|
+
// Should have: first, pair3, last two
|
|
136
|
+
expect(result[0]).toEqual(messages[0]);
|
|
137
|
+
expect(result).toContain(messages[5]);
|
|
138
|
+
expect(result).toContain(messages[6]);
|
|
139
|
+
expect(result).toContain(messages[7]);
|
|
140
|
+
expect(result).toContain(messages[8]);
|
|
141
|
+
// Should NOT contain pair 1 or pair 2
|
|
142
|
+
expect(result).not.toContain(messages[1]);
|
|
143
|
+
expect(result).not.toContain(messages[2]);
|
|
144
|
+
expect(result).not.toContain(messages[3]);
|
|
145
|
+
expect(result).not.toContain(messages[4]);
|
|
146
|
+
});
|
|
147
|
+
});
|
|
148
|
+
});
|
|
149
|
+
describe('ContextManager', () => {
|
|
150
|
+
it('returns messages unchanged when within limit', () => {
|
|
151
|
+
const cm = new ContextManager(100000);
|
|
152
|
+
const messages = [userText('hello'), assistantText('hi')];
|
|
153
|
+
expect(cm.manageContext(messages)).toEqual(messages);
|
|
154
|
+
});
|
|
155
|
+
it('truncates while preserving tool pairs when over limit', () => {
|
|
156
|
+
const cm = new ContextManager(500); // small limit
|
|
157
|
+
const messages = [
|
|
158
|
+
userText('start'),
|
|
159
|
+
assistantToolUse('t1'),
|
|
160
|
+
userToolResult('t1', 'x'.repeat(2000)),
|
|
161
|
+
assistantText('end'),
|
|
162
|
+
];
|
|
163
|
+
const result = cm.manageContext(messages);
|
|
164
|
+
// Tool pair should be removed as a unit, not split
|
|
165
|
+
for (let i = 0; i < result.length; i++) {
|
|
166
|
+
const msg = result[i];
|
|
167
|
+
if (typeof msg.content === 'string')
|
|
168
|
+
continue;
|
|
169
|
+
for (const block of msg.content) {
|
|
170
|
+
if (block.type === 'tool_use') {
|
|
171
|
+
const next = result[i + 1];
|
|
172
|
+
expect(next).toBeDefined();
|
|
173
|
+
}
|
|
174
|
+
if (block.type === 'tool_result') {
|
|
175
|
+
const prev = result[i - 1];
|
|
176
|
+
expect(prev).toBeDefined();
|
|
177
|
+
expect(typeof prev.content).not.toBe('string');
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
});
|
|
182
|
+
});
|
|
183
|
+
//# sourceMappingURL=context-manager.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"context-manager.test.js","sourceRoot":"","sources":["../src/context-manager.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/shell/shell.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,cAAc,EAAiC,MAAM,YAAY,CAAA;AACzG,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAInC,MAAM,WAAW,YAAa,SAAQ,WAAW;IAC/C,oDAAoD;IACpD,EAAE,CAAC,EAAE,SAAS,CAAA;CACf;AAED,qBAAa,KAAK;IAChB,OAAO,CAAC,EAAE,CAAW;IACrB,OAAO,CAAC,GAAG,CAAwB;IACnC,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,aAAa,CAAe;gBAExB,OAAO,GAAE,YAAiB;IAgFtC,wCAAwC;IACxC,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;IAIvC;;;;OAIG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI;IAK7D,yCAAyC;IACzC,UAAU,IAAI,OAAO;IAIrB,yFAAyF;IACnF,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IA8BlD;;;;OAIG;IACH,OAAO,CAAC,cAAc;YASR,cAAc;
|
|
1
|
+
{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/shell/shell.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,cAAc,EAAiC,MAAM,YAAY,CAAA;AACzG,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAInC,MAAM,WAAW,YAAa,SAAQ,WAAW;IAC/C,oDAAoD;IACpD,EAAE,CAAC,EAAE,SAAS,CAAA;CACf;AAED,qBAAa,KAAK;IAChB,OAAO,CAAC,EAAE,CAAW;IACrB,OAAO,CAAC,GAAG,CAAwB;IACnC,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,aAAa,CAAe;gBAExB,OAAO,GAAE,YAAiB;IAgFtC,wCAAwC;IACxC,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;IAIvC;;;;OAIG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI;IAK7D,yCAAyC;IACzC,UAAU,IAAI,OAAO;IAIrB,yFAAyF;IACnF,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IA8BlD;;;;OAIG;IACH,OAAO,CAAC,cAAc;YASR,cAAc;IAiG5B,iCAAiC;IACjC,KAAK,IAAI,SAAS;IAIlB,gCAAgC;IAChC,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAIhC,+BAA+B;IAC/B,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAIxC;;;OAGG;IACH,OAAO,CAAC,UAAU;IAOlB;;OAEG;IACH,OAAO,CAAC,aAAa;IASrB,0BAA0B;IAC1B,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAGzC"}
|
package/dist/shell/shell.js
CHANGED
|
@@ -206,12 +206,16 @@ export class Shell {
|
|
|
206
206
|
let result = await handler.execute(cmd.args, ctx);
|
|
207
207
|
// Handle output redirection
|
|
208
208
|
if (cmd.outputFile) {
|
|
209
|
-
|
|
209
|
+
if (cmd.outputFile !== '/dev/null') {
|
|
210
|
+
this.fs.write(cmd.outputFile, result.stdout);
|
|
211
|
+
}
|
|
210
212
|
result = { ...result, stdout: '' };
|
|
211
213
|
}
|
|
212
214
|
else if (cmd.appendFile) {
|
|
213
|
-
|
|
214
|
-
|
|
215
|
+
if (cmd.appendFile !== '/dev/null') {
|
|
216
|
+
const existing = this.fs.read(cmd.appendFile) || '';
|
|
217
|
+
this.fs.write(cmd.appendFile, existing + result.stdout);
|
|
218
|
+
}
|
|
215
219
|
result = { ...result, stdout: '' };
|
|
216
220
|
}
|
|
217
221
|
// Handle pipe
|
package/dist/shell/shell.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/shell/shell.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/shell/shell.ts"],"names":[],"mappings":"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"}
|