@easynet/agent-tool-buildin 0.0.46 → 0.0.48
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"itermRunCommandInSession.d.ts","sourceRoot":"","sources":["../../../src/iterm/itermRunCommandInSession.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"itermRunCommandInSession.d.ts","sourceRoot":"","sources":["../../../src/iterm/itermRunCommandInSession.ts"],"names":[],"mappings":"AAeA;;;;;;;;;;GAUG;AACH,wBAAsB,wBAAwB,CAAC,IAAI,EAAE;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0FAA0F;IAC1F,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oDAAoD;IACpD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;;;;;;;;;;;;;;;;;GAoGA"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import { itermSendText } from "./itermSendText.js";
|
|
2
|
-
import { createTaggedError } from "./common.js";
|
|
2
|
+
import { createTaggedError, readSessionContents } from "./common.js";
|
|
3
3
|
import { itermListCurrentWindowSessions } from "./itermListCurrentWindowSessions.js";
|
|
4
4
|
const DEFAULT_WAIT_MS = 1000;
|
|
5
5
|
const DEFAULT_MAX_OUTPUT_LINES = 200;
|
|
6
|
+
/** Max extra time (ms) to spend polling for output stabilisation after the initial wait. */
|
|
7
|
+
const MAX_POLL_MS = 10_000;
|
|
8
|
+
/** Interval (ms) between buffer-stability polls. */
|
|
9
|
+
const POLL_INTERVAL_MS = 500;
|
|
6
10
|
function sleep(ms) {
|
|
7
11
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
8
12
|
}
|
|
@@ -57,13 +61,44 @@ export async function itermRunCommandInSession(args) {
|
|
|
57
61
|
// Wait briefly to give the command a chance to run before returning.
|
|
58
62
|
const waitMs = args.waitMs ?? DEFAULT_WAIT_MS;
|
|
59
63
|
await sleep(waitMs);
|
|
64
|
+
// Capture the terminal buffer after the command has had time to execute.
|
|
65
|
+
// We poll until the buffer stabilises (no new output for one interval) or
|
|
66
|
+
// until MAX_POLL_MS has elapsed, whichever comes first.
|
|
67
|
+
const resolvedSessionId = targetSessionId ?? result.sessionId;
|
|
68
|
+
const readArgs = {
|
|
69
|
+
windowId: args.windowId,
|
|
70
|
+
tabIndex: args.tabIndex,
|
|
71
|
+
sessionId: resolvedSessionId,
|
|
72
|
+
};
|
|
73
|
+
let output = "";
|
|
74
|
+
try {
|
|
75
|
+
let buffer = await readSessionContents(readArgs);
|
|
76
|
+
// Poll for stabilisation: if the buffer is still changing the command is
|
|
77
|
+
// probably still producing output.
|
|
78
|
+
const deadline = Date.now() + MAX_POLL_MS;
|
|
79
|
+
while (Date.now() < deadline) {
|
|
80
|
+
await sleep(POLL_INTERVAL_MS);
|
|
81
|
+
const fresh = await readSessionContents(readArgs);
|
|
82
|
+
if (fresh === buffer)
|
|
83
|
+
break; // stable
|
|
84
|
+
buffer = fresh;
|
|
85
|
+
}
|
|
86
|
+
// Extract only the tail of the buffer, respecting maxOutputLines.
|
|
87
|
+
const maxLines = args.maxOutputLines ?? DEFAULT_MAX_OUTPUT_LINES;
|
|
88
|
+
const bufferLines = buffer.split("\n");
|
|
89
|
+
output = bufferLines.slice(-maxLines).join("\n");
|
|
90
|
+
}
|
|
91
|
+
catch (err) {
|
|
92
|
+
// If reading fails, return empty output rather than failing the whole call.
|
|
93
|
+
console.error("[itermRunCommandInSession] readSessionContents failed:", err);
|
|
94
|
+
}
|
|
60
95
|
return {
|
|
61
96
|
result: {
|
|
62
97
|
...result,
|
|
63
98
|
command: cmd,
|
|
64
99
|
// Preserve the resolved session id explicitly so callers can rely on it.
|
|
65
|
-
sessionId:
|
|
66
|
-
output
|
|
100
|
+
sessionId: resolvedSessionId,
|
|
101
|
+
output,
|
|
67
102
|
},
|
|
68
103
|
evidence: [
|
|
69
104
|
...(evidence ?? []),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"itermRunCommandInSession.js","sourceRoot":"","sources":["../../../src/iterm/itermRunCommandInSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"itermRunCommandInSession.js","sourceRoot":"","sources":["../../../src/iterm/itermRunCommandInSession.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@easynet/agent-tool-buildin",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.48",
|
|
4
4
|
"description": "Tools extension for @easynet/agent-tool: FS, HTTP, util, security (sandbox, SSRF). Same contract as any other extension.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -37,10 +37,10 @@
|
|
|
37
37
|
"node-html-parser": "^6.1.13"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|
|
40
|
-
"@easynet/agent-tool": "
|
|
40
|
+
"@easynet/agent-tool": "*"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"@easynet/agent-tool": "
|
|
43
|
+
"@easynet/agent-tool": "*",
|
|
44
44
|
"@semantic-release/git": "^10.0.1",
|
|
45
45
|
"@semantic-release/npm": "^12.0.0",
|
|
46
46
|
"@types/jmespath": "^0.15.0",
|