ysagc-agent 0.9.14 → 0.9.16
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/agent.d.ts +1 -1
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +39 -1
- package/dist/agent.js.map +1 -1
- package/dist/browser.d.ts +69 -0
- package/dist/browser.d.ts.map +1 -1
- package/dist/browser.js +318 -64
- package/dist/browser.js.map +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +47 -0
- package/dist/cli.js.map +1 -1
- package/dist/computer.d.ts +16 -0
- package/dist/computer.d.ts.map +1 -0
- package/dist/computer.js +722 -0
- package/dist/computer.js.map +1 -0
- package/dist/executor.d.ts +14 -0
- package/dist/executor.d.ts.map +1 -1
- package/dist/executor.js +25 -0
- package/dist/executor.js.map +1 -1
- package/dist/mcp.d.ts.map +1 -1
- package/dist/mcp.js +6 -2
- package/dist/mcp.js.map +1 -1
- package/dist/protocol.d.ts +48 -2
- package/dist/protocol.d.ts.map +1 -1
- package/dist/protocol.js +1 -1
- package/dist/protocol.js.map +1 -1
- package/dist/screenshot.d.ts.map +1 -1
- package/dist/screenshot.js +4 -0
- package/dist/screenshot.js.map +1 -1
- package/dist/security.d.ts.map +1 -1
- package/dist/security.js +57 -7
- package/dist/security.js.map +1 -1
- package/dist/tools.d.ts.map +1 -1
- package/dist/tools.js +54 -7
- package/dist/tools.js.map +1 -1
- package/package.json +52 -52
package/dist/security.js
CHANGED
|
@@ -310,6 +310,52 @@ function isSensitivePath(p) {
|
|
|
310
310
|
}
|
|
311
311
|
/** Emitted value when any secret has been redacted. */
|
|
312
312
|
exports.MASK = '***';
|
|
313
|
+
/**
|
|
314
|
+
* Does a `key = value` value actually look like a credential literal?
|
|
315
|
+
*
|
|
316
|
+
* Tightened because the old rule ("anything that is not whitespace or a quote")
|
|
317
|
+
* corrupted ordinary source files:
|
|
318
|
+
* - a Chinese comment `只存 token 数字` became `只存 *** 数字`;
|
|
319
|
+
* - `import { auth } from 'path'` became `import { *** from 'path'` (`auth }` read as a pair);
|
|
320
|
+
* - `const token = String(req.headers.authorization).replace(...)` lost the whole expression;
|
|
321
|
+
* - `password: process.env.DB_PASSWORD` had the env reference treated as a secret.
|
|
322
|
+
* Two costs, both expensive: (1) the model reads mangled source and cannot edit it,
|
|
323
|
+
* (2) the platform's pre-change snapshot is judged "contains secrets" and the user loses
|
|
324
|
+
* the one-click revert for that file entirely.
|
|
325
|
+
*
|
|
326
|
+
* So the test is "does the value look like a credential literal": long enough, visible
|
|
327
|
+
* ASCII only (so prose never qualifies), carries a digit or a base64/hex symbol, and is
|
|
328
|
+
* not a code reference such as `process.env.X` / `req.session` / `SOME_CONST_NAME`.
|
|
329
|
+
*/
|
|
330
|
+
function looksLikeSecretValue(value) {
|
|
331
|
+
if (value.length < 6)
|
|
332
|
+
return false;
|
|
333
|
+
if (!/^[\x21-\x7e]+$/.test(value))
|
|
334
|
+
return false;
|
|
335
|
+
if (!/[0-9+/=_-]/.test(value))
|
|
336
|
+
return false;
|
|
337
|
+
// Dotted identifier chains (process.env.DB_PASSWORD, req.session) are references.
|
|
338
|
+
if (/^[A-Za-z_$][\w$]*(\.[A-Za-z_$][\w$]*)+$/.test(value))
|
|
339
|
+
return false;
|
|
340
|
+
// SCREAMING_SNAKE constants (WX_MOBILE_APPSECRET, DB_PASSWORD) are references too:
|
|
341
|
+
// `secret: WX_MOBILE_APPSECRET` is a common shape and masking it only breaks the code.
|
|
342
|
+
// The cost is that a purely uppercase, symbol-free secret escapes this generic rule —
|
|
343
|
+
// real credentials almost always carry a symbol or lowercase characters.
|
|
344
|
+
if (/^[A-Z][A-Z0-9_]*$/.test(value))
|
|
345
|
+
return false;
|
|
346
|
+
return true;
|
|
347
|
+
}
|
|
348
|
+
/**
|
|
349
|
+
* Named secret pairs. The key name is kept (`password=***`) — the name is not the
|
|
350
|
+
* secret, and keeping it is what lets the model still understand the structure.
|
|
351
|
+
*
|
|
352
|
+
* Two details exist to avoid hitting ordinary code:
|
|
353
|
+
* - the key must be preceded by a non-alphanumeric (`(^|[^A-Za-z0-9])`), otherwise the
|
|
354
|
+
* `token` inside `app_push_token (user_id...)` counts as a key and swallows the SQL;
|
|
355
|
+
* - the value charset excludes brackets/quotes, so `const token = String(...)` breaks at
|
|
356
|
+
* `(` and the leftover `String` never passes looksLikeSecretValue.
|
|
357
|
+
*/
|
|
358
|
+
const SECRET_KEY_VALUE_RE = /(^|[^A-Za-z0-9])(password|passwd|secret|token|api[_-]?key|access[_-]?key|auth(?:orization)?|session|refresh[_-]?token|private[_-]?key|cookie|client[_-]?secret)\s*([:=]\s*|["']?\s+)(["']?)([A-Za-z0-9+/=_.:@!$%^*~-]+)\4/gi;
|
|
313
359
|
/**
|
|
314
360
|
* Redact secrets from a string: provider keys, bearer tokens, JWTs, private
|
|
315
361
|
* keys, and `key=value` / `key: value` pairs for obvious secret names. Used
|
|
@@ -320,16 +366,18 @@ function maskSecrets(text) {
|
|
|
320
366
|
return text;
|
|
321
367
|
let out = text;
|
|
322
368
|
// Named secret pairs: password=..., token=..., api_key=..., authorization: ...
|
|
323
|
-
out = out.replace(
|
|
369
|
+
out = out.replace(SECRET_KEY_VALUE_RE, (m, pre, key, sep, q, value) => {
|
|
324
370
|
// Never redact a placeholder already present.
|
|
325
371
|
if (value === exports.MASK)
|
|
326
|
-
return
|
|
372
|
+
return m;
|
|
327
373
|
// `Authorization: Basic ...` / `Bearer ...` carry a two-part credential;
|
|
328
|
-
// capture only grabs `Basic`/`Bearer`, so let the dedicated rule below
|
|
374
|
+
// the capture only grabs `Basic`/`Bearer`, so let the dedicated rule below
|
|
329
375
|
// mask the whole `<scheme> <token>` instead of just the scheme word.
|
|
330
376
|
if (/^(?:basic|bearer)$/i.test(value))
|
|
331
|
-
return
|
|
332
|
-
|
|
377
|
+
return m;
|
|
378
|
+
if (!looksLikeSecretValue(value))
|
|
379
|
+
return m;
|
|
380
|
+
return `${pre}${key}${sep}${q}${exports.MASK}${q}`;
|
|
333
381
|
});
|
|
334
382
|
// Bearer / Basic auth headers.
|
|
335
383
|
out = out.replace(/\b(Bearer|Basic)\s+[A-Za-z0-9+/=_-]{8,}/gi, `$1 ${exports.MASK}`);
|
|
@@ -347,8 +395,10 @@ function maskSecrets(text) {
|
|
|
347
395
|
out = out.replace(/\b(AKIA|ASIA)[0-9A-Z]{16}\b/g, `$1${exports.MASK}`);
|
|
348
396
|
// JWT.
|
|
349
397
|
out = out.replace(/\beyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}\b/g, `eyJ${exports.MASK}`);
|
|
350
|
-
// PEM / OpenSSH private-key blocks.
|
|
351
|
-
|
|
398
|
+
// PEM / OpenSSH private-key blocks. Require real base64 body between BEGIN and END:
|
|
399
|
+
// matching just the two marker lines treats source code that assembles a PEM string
|
|
400
|
+
// as a key block and replaces the whole thing.
|
|
401
|
+
out = out.replace(/-----BEGIN ([A-Z ]*)?PRIVATE KEY-----[\r\n]+[A-Za-z0-9+/=\r\n]{32,}?[\r\n]+-----END ([A-Z ]*)?PRIVATE KEY-----/g, '-----BEGIN PRIVATE KEY-----\n' + exports.MASK + '\n-----END PRIVATE KEY-----');
|
|
352
402
|
return out;
|
|
353
403
|
}
|
|
354
404
|
//# sourceMappingURL=security.js.map
|
package/dist/security.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.js","sourceRoot":"","sources":["../src/security.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAiQH,0CAeC;AAsCD,0CAOC;
|
|
1
|
+
{"version":3,"file":"security.js","sourceRoot":"","sources":["../src/security.ts"],"names":[],"mappings":"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"}
|
package/dist/tools.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"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"}
|
package/dist/tools.js
CHANGED
|
@@ -52,6 +52,7 @@ const skills_1 = require("./skills");
|
|
|
52
52
|
const executor_1 = require("./executor");
|
|
53
53
|
const screenshot_1 = require("./screenshot");
|
|
54
54
|
const browser_1 = require("./browser");
|
|
55
|
+
const computer_1 = require("./computer");
|
|
55
56
|
const memory_1 = require("./memory");
|
|
56
57
|
const hooks_1 = require("./hooks");
|
|
57
58
|
const mcp_1 = require("./mcp");
|
|
@@ -369,6 +370,19 @@ const WRITE_OR_COMMAND_TOOLS = new Set([
|
|
|
369
370
|
'screenshot',
|
|
370
371
|
// 浏览器操作会驱动真实页面(点按 / 输入 / 提交表单),同样按写操作对待
|
|
371
372
|
'browser',
|
|
373
|
+
// 电脑操作会接管真实鼠标键盘:只读模式下一律拒绝
|
|
374
|
+
'computer_start',
|
|
375
|
+
'computer_stop',
|
|
376
|
+
'computer_screenshot',
|
|
377
|
+
'computer_move',
|
|
378
|
+
'computer_click',
|
|
379
|
+
'computer_double_click',
|
|
380
|
+
'computer_drag',
|
|
381
|
+
'computer_scroll',
|
|
382
|
+
'computer_type',
|
|
383
|
+
'computer_key',
|
|
384
|
+
'computer_clipboard_read',
|
|
385
|
+
'computer_clipboard_write',
|
|
372
386
|
// 写项目记忆文件(.ysagc/memory.md)
|
|
373
387
|
'remember',
|
|
374
388
|
]);
|
|
@@ -540,7 +554,20 @@ function maskSecretsDeep(value) {
|
|
|
540
554
|
*/
|
|
541
555
|
function postExecute(_ctx, tool, result) {
|
|
542
556
|
if (result.result !== undefined) {
|
|
543
|
-
|
|
557
|
+
const before = result.result;
|
|
558
|
+
result.result = maskSecretsDeep(before);
|
|
559
|
+
// Tell the platform whether this read was redacted.
|
|
560
|
+
// It needs the flag to decide if a pre-change snapshot can be written back verbatim:
|
|
561
|
+
// writing masked content back would replace the user's real secrets with `***`.
|
|
562
|
+
// Previously the platform could only guess by looking for `***` in the text, which also
|
|
563
|
+
// condemned perfectly normal files (markdown rules, starred comments) as "masked".
|
|
564
|
+
if (tool === 'read_file' && before && typeof before === 'object' && result.result && typeof result.result === 'object') {
|
|
565
|
+
const b = before;
|
|
566
|
+
const a = result.result;
|
|
567
|
+
if (typeof b.encoding === 'string' && typeof b.content === 'string') {
|
|
568
|
+
a.masked = typeof a.content === 'string' && a.content !== b.content;
|
|
569
|
+
}
|
|
570
|
+
}
|
|
544
571
|
}
|
|
545
572
|
if (typeof result.error === 'string') {
|
|
546
573
|
result.error = (0, security_1.maskSecrets)(result.error);
|
|
@@ -632,18 +659,22 @@ const readFile = async (ctx, args, signal) => {
|
|
|
632
659
|
// Return exactly the requested window (capped at what is available) and
|
|
633
660
|
// report `truncated` when more bytes remain beyond that window.
|
|
634
661
|
const readLen = Math.min(length, available);
|
|
635
|
-
const
|
|
662
|
+
const raw = readUpTo(target, readLen, offset);
|
|
636
663
|
const truncated = available > length;
|
|
637
|
-
|
|
638
|
-
|
|
664
|
+
// Align the window to UTF-8 character boundaries before deciding text vs binary.
|
|
665
|
+
// A window that merely happens to cut a CJK character in half must not be reported as
|
|
666
|
+
// binary hex — the model would receive hex instead of code and cannot read the file.
|
|
667
|
+
const win = (0, executor_1.utf8Window)(raw);
|
|
668
|
+
const buf = win ? raw.subarray(win.start, win.end) : raw;
|
|
669
|
+
const utf8 = !!win;
|
|
639
670
|
const content = utf8 ? buf.toString('utf8') : buf.toString('hex');
|
|
640
671
|
return {
|
|
641
672
|
ok: true,
|
|
642
673
|
result: {
|
|
643
674
|
path: rel(realRoot, target),
|
|
644
|
-
bytesRead,
|
|
675
|
+
bytesRead: buf.length,
|
|
645
676
|
totalBytes,
|
|
646
|
-
offset,
|
|
677
|
+
offset: offset + (win ? win.start : 0),
|
|
647
678
|
truncated,
|
|
648
679
|
encoding: utf8 ? 'utf8' : 'hex',
|
|
649
680
|
content,
|
|
@@ -1966,7 +1997,11 @@ const mcpList = async (ctx) => {
|
|
|
1966
1997
|
enabled: true,
|
|
1967
1998
|
config_path: (0, mcp_1.mcpConfigPath)(root),
|
|
1968
1999
|
count: tools.length,
|
|
1969
|
-
|
|
2000
|
+
// inputSchema 必须带上:平台用它生成「模型看到的工具参数表」。
|
|
2001
|
+
// 之前只报了 name/description,平台拿到的是一份「没有参数」的工具定义,
|
|
2002
|
+
// 模型于是只能传空参数 —— 需要入参的 MCP 工具全部调不通,
|
|
2003
|
+
// 表现是「接了 MCP、工具也在表里,一调就报参数缺失」。
|
|
2004
|
+
tools: tools.map((t) => ({ name: t.name, description: t.description, inputSchema: t.inputSchema })),
|
|
1970
2005
|
failures,
|
|
1971
2006
|
note: tools.length
|
|
1972
2007
|
? '调用方式:直接用上面列出的工具名(mcp__server__tool)调用即可,参数按各工具的 inputSchema 传。'
|
|
@@ -2000,6 +2035,18 @@ const TOOLS = {
|
|
|
2000
2035
|
install_app: installApp,
|
|
2001
2036
|
screenshot: screenshot_1.screenshotTool,
|
|
2002
2037
|
browser: browser_1.browserTool,
|
|
2038
|
+
computer_start: computer_1.computerStart,
|
|
2039
|
+
computer_stop: computer_1.computerStop,
|
|
2040
|
+
computer_screenshot: computer_1.computerScreenshot,
|
|
2041
|
+
computer_move: computer_1.computerMove,
|
|
2042
|
+
computer_click: computer_1.computerClick,
|
|
2043
|
+
computer_double_click: computer_1.computerDoubleClick,
|
|
2044
|
+
computer_drag: computer_1.computerDrag,
|
|
2045
|
+
computer_scroll: computer_1.computerScroll,
|
|
2046
|
+
computer_type: computer_1.computerType,
|
|
2047
|
+
computer_key: computer_1.computerKey,
|
|
2048
|
+
computer_clipboard_read: computer_1.computerClipboardRead,
|
|
2049
|
+
computer_clipboard_write: computer_1.computerClipboardWrite,
|
|
2003
2050
|
remember: memory_1.rememberTool,
|
|
2004
2051
|
mcp_list: mcpList,
|
|
2005
2052
|
};
|