@atel-ai/runtime-core 0.1.1 → 0.1.2
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/adapters/claude-code.d.ts.map +1 -1
- package/dist/adapters/claude-code.js +1 -0
- package/dist/adapters/claude-code.js.map +1 -1
- package/dist/adapters/codex.d.ts.map +1 -1
- package/dist/adapters/codex.js +3 -0
- package/dist/adapters/codex.js.map +1 -1
- package/dist/adapters/gemini-cli.d.ts.map +1 -1
- package/dist/adapters/gemini-cli.js +1 -0
- package/dist/adapters/gemini-cli.js.map +1 -1
- package/dist/adapters/qwen-agent.d.ts.map +1 -1
- package/dist/adapters/qwen-agent.js +2 -1
- package/dist/adapters/qwen-agent.js.map +1 -1
- package/dist/companion.d.ts +5 -0
- package/dist/companion.d.ts.map +1 -1
- package/dist/companion.js +42 -1
- package/dist/companion.js.map +1 -1
- package/dist/events/mapping.d.ts.map +1 -1
- package/dist/events/mapping.js +5 -5
- package/dist/events/mapping.js.map +1 -1
- package/dist/wakers/cli.d.ts.map +1 -1
- package/dist/wakers/cli.js +5 -1
- package/dist/wakers/cli.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code.d.ts","sourceRoot":"","sources":["../../src/adapters/claude-code.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,OAAO,EAAuC,MAAM,YAAY,CAAC;AAS/E,eAAO,MAAM,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"claude-code.d.ts","sourceRoot":"","sources":["../../src/adapters/claude-code.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,OAAO,EAAuC,MAAM,YAAY,CAAC;AAS/E,eAAO,MAAM,iBAAiB,EAAE,OAwD/B,CAAC"}
|
|
@@ -45,6 +45,7 @@ export const claudeCodeAdapter = {
|
|
|
45
45
|
bin: 'claude',
|
|
46
46
|
defaultTimeoutMs: 300_000,
|
|
47
47
|
sessionStatePath: path.join(ctx.config.dataDir, 'claude-sessions.json'),
|
|
48
|
+
cwd: ctx.config.dataDir, // 中性 cwd,避免把仓库 CLAUDE.md/上下文带进 agent
|
|
48
49
|
log: ctx.log,
|
|
49
50
|
buildArgs: ({ prompt, sessionId, isResume }) => {
|
|
50
51
|
const base = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code.js","sourceRoot":"","sources":["../../src/adapters/claude-code.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE3C,SAAS,aAAa,CAAC,OAAe;IACpC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAY;IACxC,EAAE,EAAE,aAAa;IACjB,WAAW,EAAE,aAAa;IAC1B,IAAI,EAAE,KAAK;IAEX,KAAK,CAAC,MAAM;QACV,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC;QACtE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAgB;QACnC,MAAM,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC5C,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACnD,EAAE,CAAC,aAAa,CACd,CAAC,EACD,IAAI,CAAC,SAAS,CACZ;YACE,UAAU,EAAE;gBACV,IAAI,EAAE;oBACJ,IAAI,EAAE,MAAM;oBACZ,GAAG,EAAE,GAAG,CAAC,MAAM;oBACf,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,GAAG,CAAC,KAAK,EAAE,EAAE;iBAClD;aACF;SACF,EACD,IAAI,EACJ,CAAC,CACF,CACF,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,GAAa;QACvB,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjD,OAAO,IAAI,QAAQ,CAAC;YAClB,GAAG,EAAE,QAAQ;YACb,gBAAgB,EAAE,OAAO;YACzB,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,sBAAsB,CAAC;YACvE,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE;gBAC7C,MAAM,IAAI,GAAG;oBACX,IAAI;oBACJ,MAAM;oBACN,iBAAiB;oBACjB,MAAM;oBACN,cAAc;oBACd,MAAM;oBACN,qBAAqB;oBACrB,gCAAgC;iBACjC,CAAC;gBACF,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC;YAC5F,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
|
|
1
|
+
{"version":3,"file":"claude-code.js","sourceRoot":"","sources":["../../src/adapters/claude-code.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE3C,SAAS,aAAa,CAAC,OAAe;IACpC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAY;IACxC,EAAE,EAAE,aAAa;IACjB,WAAW,EAAE,aAAa;IAC1B,IAAI,EAAE,KAAK;IAEX,KAAK,CAAC,MAAM;QACV,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC;QACtE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAgB;QACnC,MAAM,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC5C,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACnD,EAAE,CAAC,aAAa,CACd,CAAC,EACD,IAAI,CAAC,SAAS,CACZ;YACE,UAAU,EAAE;gBACV,IAAI,EAAE;oBACJ,IAAI,EAAE,MAAM;oBACZ,GAAG,EAAE,GAAG,CAAC,MAAM;oBACf,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,GAAG,CAAC,KAAK,EAAE,EAAE;iBAClD;aACF;SACF,EACD,IAAI,EACJ,CAAC,CACF,CACF,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,GAAa;QACvB,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjD,OAAO,IAAI,QAAQ,CAAC;YAClB,GAAG,EAAE,QAAQ;YACb,gBAAgB,EAAE,OAAO;YACzB,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,sBAAsB,CAAC;YACvE,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,qCAAqC;YAC9D,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE;gBAC7C,MAAM,IAAI,GAAG;oBACX,IAAI;oBACJ,MAAM;oBACN,iBAAiB;oBACjB,MAAM;oBACN,cAAc;oBACd,MAAM;oBACN,qBAAqB;oBACrB,gCAAgC;iBACjC,CAAC;gBACF,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC;YAC5F,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../src/adapters/codex.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,OAAO,EAAuC,MAAM,YAAY,CAAC;AAmB/E,eAAO,MAAM,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../src/adapters/codex.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,OAAO,EAAuC,MAAM,YAAY,CAAC;AAmB/E,eAAO,MAAM,YAAY,EAAE,OA0C1B,CAAC"}
|
package/dist/adapters/codex.js
CHANGED
|
@@ -54,6 +54,9 @@ export const codexAdapter = {
|
|
|
54
54
|
return new CliWaker({
|
|
55
55
|
bin: 'codex',
|
|
56
56
|
defaultTimeoutMs: 300_000,
|
|
57
|
+
// 中性 cwd:codex exec 会扫工作目录(AGENTS.md/文件/git),在大仓库里会拖到超时。
|
|
58
|
+
// 用 dataDir(小目录)当 cwd,accept 才不会卡 300s(真机 bug #10)。
|
|
59
|
+
cwd: ctx.config.dataDir,
|
|
57
60
|
log: ctx.log,
|
|
58
61
|
env: () => readCodexEnv(ctx.config.dataDir),
|
|
59
62
|
buildArgs: ({ prompt }) => [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../src/adapters/codex.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7D,SAAS,SAAS,CAAC,OAAe;IAChC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,YAAY,CAAC,OAAe;IACnC,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7D,IAAI,CAAC;YAAE,OAAO,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC;IACtC,CAAC;IAAC,MAAM,CAAC;QACP,eAAe;IACjB,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAY;IACnC,EAAE,EAAE,OAAO;IACX,WAAW,EAAE,OAAO;IACpB,IAAI,EAAE,KAAK;IAEX,KAAK,CAAC,MAAM;QACV,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC;QACrE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAgB;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;QAC9D,MAAM,IAAI,GAAG;YACX,UAAU,GAAG,CAAC,MAAM,GAAG;YACvB,yCAAyC;SAC1C,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,gBAAgB,CAAC,IAAI,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC;QACjD,yDAAyD;QACzD,MAAM,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACxC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACnD,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,WAAW,CAAC,GAAa;QACvB,OAAO,IAAI,QAAQ,CAAC;YAClB,GAAG,EAAE,OAAO;YACZ,gBAAgB,EAAE,OAAO;YACzB,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,GAAG,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC;YAC3C,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;gBACzB,MAAM;gBACN,4CAA4C;gBAC5C,uBAAuB;gBACvB,MAAM;aACP;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
|
|
1
|
+
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../src/adapters/codex.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7D,SAAS,SAAS,CAAC,OAAe;IAChC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,YAAY,CAAC,OAAe;IACnC,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7D,IAAI,CAAC;YAAE,OAAO,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC;IACtC,CAAC;IAAC,MAAM,CAAC;QACP,eAAe;IACjB,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAY;IACnC,EAAE,EAAE,OAAO;IACX,WAAW,EAAE,OAAO;IACpB,IAAI,EAAE,KAAK;IAEX,KAAK,CAAC,MAAM;QACV,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC;QACrE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAgB;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;QAC9D,MAAM,IAAI,GAAG;YACX,UAAU,GAAG,CAAC,MAAM,GAAG;YACvB,yCAAyC;SAC1C,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,gBAAgB,CAAC,IAAI,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC;QACjD,yDAAyD;QACzD,MAAM,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACxC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACnD,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,WAAW,CAAC,GAAa;QACvB,OAAO,IAAI,QAAQ,CAAC;YAClB,GAAG,EAAE,OAAO;YACZ,gBAAgB,EAAE,OAAO;YACzB,yDAAyD;YACzD,oDAAoD;YACpD,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO;YACvB,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,GAAG,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC;YAC3C,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;gBACzB,MAAM;gBACN,4CAA4C;gBAC5C,uBAAuB;gBACvB,MAAM;aACP;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini-cli.d.ts","sourceRoot":"","sources":["../../src/adapters/gemini-cli.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAuC,MAAM,YAAY,CAAC;AAK/E,eAAO,MAAM,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"gemini-cli.d.ts","sourceRoot":"","sources":["../../src/adapters/gemini-cli.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAuC,MAAM,YAAY,CAAC;AAK/E,eAAO,MAAM,gBAAgB,EAAE,OAiC9B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini-cli.js","sourceRoot":"","sources":["../../src/adapters/gemini-cli.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtD,MAAM,CAAC,MAAM,gBAAgB,GAAY;IACvC,EAAE,EAAE,YAAY;IAChB,WAAW,EAAE,YAAY;IACzB,IAAI,EAAE,KAAK;IAEX,KAAK,CAAC,MAAM;QACV,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC;QACtE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAgB;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;QACjE,SAAS,CAAC,IAAI,EAAE;YACd,UAAU,EAAE;gBACV,IAAI,EAAE;oBACJ,OAAO,EAAE,GAAG,CAAC,MAAM;oBACnB,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,GAAG,CAAC,KAAK,EAAE,EAAE;iBAClD;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,WAAW,CAAC,GAAa;QACvB,OAAO,IAAI,QAAQ,CAAC;YAClB,GAAG,EAAE,QAAQ;YACb,gBAAgB,EAAE,OAAO;YACzB,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC;SACpD,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
|
|
1
|
+
{"version":3,"file":"gemini-cli.js","sourceRoot":"","sources":["../../src/adapters/gemini-cli.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtD,MAAM,CAAC,MAAM,gBAAgB,GAAY;IACvC,EAAE,EAAE,YAAY;IAChB,WAAW,EAAE,YAAY;IACzB,IAAI,EAAE,KAAK;IAEX,KAAK,CAAC,MAAM;QACV,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC;QACtE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAgB;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;QACjE,SAAS,CAAC,IAAI,EAAE;YACd,UAAU,EAAE;gBACV,IAAI,EAAE;oBACJ,OAAO,EAAE,GAAG,CAAC,MAAM;oBACnB,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,GAAG,CAAC,KAAK,EAAE,EAAE;iBAClD;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,WAAW,CAAC,GAAa;QACvB,OAAO,IAAI,QAAQ,CAAC;YAClB,GAAG,EAAE,QAAQ;YACb,gBAAgB,EAAE,OAAO;YACzB,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS;YAClC,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC;SACpD,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"qwen-agent.d.ts","sourceRoot":"","sources":["../../src/adapters/qwen-agent.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,OAAO,EAAuC,MAAM,YAAY,CAAC;AAc/E,eAAO,MAAM,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"qwen-agent.d.ts","sourceRoot":"","sources":["../../src/adapters/qwen-agent.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,OAAO,EAAuC,MAAM,YAAY,CAAC;AAc/E,eAAO,MAAM,gBAAgB,EAAE,OAsE9B,CAAC"}
|
|
@@ -24,7 +24,8 @@ export const qwenAgentAdapter = {
|
|
|
24
24
|
displayName: 'Qwen-Agent (阿里)',
|
|
25
25
|
kind: 'embedded',
|
|
26
26
|
async detect() {
|
|
27
|
-
|
|
27
|
+
// 优先 ATEL_PYTHON(指向装了 qwen_agent 的解释器/venv),否则系统 python
|
|
28
|
+
const py = process.env.ATEL_PYTHON || (await which('python3')) || (await which('python'));
|
|
28
29
|
if (!py)
|
|
29
30
|
return { present: false, detail: 'no python' };
|
|
30
31
|
// 用 sentinel 区分 import 成功 vs 失败(runText 会把 stderr traceback 也返回,不能直接当版本)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"qwen-agent.js","sourceRoot":"","sources":["../../src/adapters/qwen-agent.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE3C,SAAS,aAAa,CAAC,OAAe;IACpC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;AAC7C,CAAC;AAED,qDAAqD;AACrD,SAAS,cAAc,CAAC,OAAe;IACrC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;AAC5C,CAAC;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAY;IACvC,EAAE,EAAE,YAAY;IAChB,WAAW,EAAE,iBAAiB;IAC9B,IAAI,EAAE,UAAU;IAEhB,KAAK,CAAC,MAAM;QACV,MAAM,EAAE,GAAG,CAAC,MAAM,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"qwen-agent.js","sourceRoot":"","sources":["../../src/adapters/qwen-agent.ts"],"names":[],"mappings":"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"}
|
package/dist/companion.d.ts
CHANGED
|
@@ -31,9 +31,14 @@ export declare class Companion {
|
|
|
31
31
|
private spine;
|
|
32
32
|
private autonomyTimer?;
|
|
33
33
|
private heartbeatTimer?;
|
|
34
|
+
private readonly resweptAt;
|
|
34
35
|
private readonly stats;
|
|
35
36
|
constructor(opts: CompanionOpts);
|
|
36
37
|
start(): Promise<void>;
|
|
38
|
+
/** 对所有非终结的已知订单各唤醒一次推进(启动续跑)。 */
|
|
39
|
+
private resumeSweep;
|
|
40
|
+
/** 唤醒 agent 读单状态、按当前状态+角色推进恰当的一步(续跑 / 周期再扫 / 自愈共用)。 */
|
|
41
|
+
private advanceOrder;
|
|
37
42
|
stop(): void;
|
|
38
43
|
/** webhook 模式入口:外部 HTTP 服务把回调事件喂进来。 */
|
|
39
44
|
ingestWebhook(raw: unknown): Promise<void>;
|
package/dist/companion.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"companion.d.ts","sourceRoot":"","sources":["../src/companion.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAYxD,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,aAAa,CAAC;IACtB,KAAK,EAAE,KAAK,CAAC;IACb,6BAA6B;IAC7B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB;AAID,qBAAa,SAAS;
|
|
1
|
+
{"version":3,"file":"companion.d.ts","sourceRoot":"","sources":["../src/companion.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAYxD,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,aAAa,CAAC;IACtB,KAAK,EAAE,KAAK,CAAC;IACb,6BAA6B;IAC7B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB;AAID,qBAAa,SAAS;IAsBR,OAAO,CAAC,QAAQ,CAAC,IAAI;IArBjC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAc;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IACrC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiB;IACvC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAC3C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAkB;IACtC,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,aAAa,CAAC,CAAiC;IACvD,OAAO,CAAC,cAAc,CAAC,CAAiC;IACxD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA6B;IACvD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAQpB;gBAE2B,IAAI,EAAE,aAAa;IAa1C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAgD5B,gCAAgC;IAChC,OAAO,CAAC,WAAW;IAOnB,uDAAuD;IACvD,OAAO,CAAC,YAAY;IAiBpB,IAAI,IAAI,IAAI;IAQZ,uCAAuC;IACjC,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,QAAQ,IAAI,cAAc;YAKZ,OAAO;YA+BP,WAAW;IA8BzB,OAAO,CAAC,WAAW;IA2DnB,OAAO,CAAC,GAAG;CAGZ"}
|
package/dist/companion.js
CHANGED
|
@@ -35,6 +35,7 @@ export class Companion {
|
|
|
35
35
|
spine;
|
|
36
36
|
autonomyTimer;
|
|
37
37
|
heartbeatTimer;
|
|
38
|
+
resweptAt = new Map();
|
|
38
39
|
stats = {
|
|
39
40
|
received: 0,
|
|
40
41
|
deduped: 0,
|
|
@@ -96,7 +97,33 @@ export class Companion {
|
|
|
96
97
|
this.autonomyTimer = setInterval(() => this.runAutonomy(), 5 * 60 * 1000);
|
|
97
98
|
if (this.autonomyTimer.unref)
|
|
98
99
|
this.autonomyTimer.unref();
|
|
99
|
-
|
|
100
|
+
// 5) 重启续跑扫描(6.5 D-3:重启后不丢单)。已 ack 的旧事件不会重发,
|
|
101
|
+
// 所以对每个未终结订单各唤醒一次,让 agent 读 atel_order_get 推进当前该做的一步。
|
|
102
|
+
this.resumeSweep();
|
|
103
|
+
this.log('companion started (relay + spine + heartbeat + autonomy + resume-sweep)');
|
|
104
|
+
}
|
|
105
|
+
/** 对所有非终结的已知订单各唤醒一次推进(启动续跑)。 */
|
|
106
|
+
resumeSweep() {
|
|
107
|
+
const active = this.tracker.all().filter((o) => !o.terminal);
|
|
108
|
+
if (active.length === 0)
|
|
109
|
+
return;
|
|
110
|
+
this.log(`resume sweep: ${active.length} active order(s)`);
|
|
111
|
+
for (const o of active)
|
|
112
|
+
this.advanceOrder(o.orderId, 'resume');
|
|
113
|
+
}
|
|
114
|
+
/** 唤醒 agent 读单状态、按当前状态+角色推进恰当的一步(续跑 / 周期再扫 / 自愈共用)。 */
|
|
115
|
+
advanceOrder(orderId, reason) {
|
|
116
|
+
const role = this.roles.roleOf(orderId, this.opts.identity.did);
|
|
117
|
+
const prompt = `[ATEL companion · ${reason}] 订单 ${orderId} 可能有未完成的一步。` +
|
|
118
|
+
`先调 atel_order_get {"orderId":"${orderId}"} 和 atel_milestone_list 读当前状态,按当前状态 + 你的角色推进恰当的一步:\n` +
|
|
119
|
+
`- 若订单 created 且你是接活方 → atel_order_accept;\n` +
|
|
120
|
+
`- 若状态 milestone_review(计划评审)→ 不论你是雇主还是接活方,都调 atel_milestone_plan_feedback {"orderId":"${orderId}","approved":true} 确认计划(双方都确认后才启动);\n` +
|
|
121
|
+
`- 若你是接活方且有 pending/draft/rejected 里程碑 → 写真实交付内容 atel_milestone_submit;\n` +
|
|
122
|
+
`- 若你是雇主且有 submitted 里程碑 → atel_milestone_verify(达标)或 atel_milestone_reject。\n` +
|
|
123
|
+
`只做当前该做的一步,无事可做回 NO_REPLY。`;
|
|
124
|
+
this.queue.run(orderId, () => this.opts.waker
|
|
125
|
+
.wake({ prompt, sessionId: deterministicUuid(orderId) })
|
|
126
|
+
.then((r) => this.log(`${reason} ${orderId} role=${role} ${r.ok ? 'ok' : 'fail:' + (r.error || '').slice(0, 80)}`)));
|
|
100
127
|
}
|
|
101
128
|
stop() {
|
|
102
129
|
this.auth.stop();
|
|
@@ -177,6 +204,20 @@ export class Companion {
|
|
|
177
204
|
}
|
|
178
205
|
// ── 失败自治 ───────────────────────────────────────────────────
|
|
179
206
|
runAutonomy() {
|
|
207
|
+
// 周期性再扫:对长时间无事件推进的未终结订单重新唤醒一次,自愈各种时序坑
|
|
208
|
+
// (漏事件、两方计划确认、对端慢)。idle 超过 4min 才扫,避免和正常事件抢。
|
|
209
|
+
const now = Date.now();
|
|
210
|
+
for (const o of this.tracker.all()) {
|
|
211
|
+
if (o.terminal)
|
|
212
|
+
continue;
|
|
213
|
+
if (now - o.lastEventAt < 4 * 60 * 1000)
|
|
214
|
+
continue;
|
|
215
|
+
const last = this.resweptAt.get(o.orderId) || 0;
|
|
216
|
+
if (now - last < 4 * 60 * 1000)
|
|
217
|
+
continue; // 每单 4min 最多再扫一次
|
|
218
|
+
this.resweptAt.set(o.orderId, now);
|
|
219
|
+
this.advanceOrder(o.orderId, 're-sweep');
|
|
220
|
+
}
|
|
180
221
|
// 超时:escrow 到 deadline 仍非终态 → 唤醒 agent 处理过期(退款兜底)。
|
|
181
222
|
// 走 agent(SKILL.md 教它调对应工具),不在 companion 里硬编码合约/端点
|
|
182
223
|
// (遵 feedback_everything_agent;refundExpired 任何人可触发但动作仍由 agent 调)。
|
package/dist/companion.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"companion.js","sourceRoot":"","sources":["../src/companion.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"companion.js","sourceRoot":"","sources":["../src/companion.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapping.d.ts","sourceRoot":"","sources":["../../src/events/mapping.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,MAAM,WAAW,QAAQ;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,cAAc,CAAC;IAC1B,IAAI,EAAE,SAAS,CAAC;IAChB,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,mCAAmC;IACnC,SAAS,EAAE,MAAM,CAAC;CACnB;AAID,iDAAiD;AACjD,wBAAgB,UAAU,CAAC,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,CAOzE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,cAAc,GAAG,SAAS,CAelE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"mapping.d.ts","sourceRoot":"","sources":["../../src/events/mapping.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,MAAM,WAAW,QAAQ;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,cAAc,CAAC;IAC1B,IAAI,EAAE,SAAS,CAAC;IAChB,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,mCAAmC;IACnC,SAAS,EAAE,MAAM,CAAC;CACnB;AAID,iDAAiD;AACjD,wBAAgB,UAAU,CAAC,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,CAOzE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,cAAc,GAAG,SAAS,CAelE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI,CAuNtF"}
|
package/dist/events/mapping.js
CHANGED
|
@@ -70,12 +70,12 @@ export function mapEventToAction(ev, role) {
|
|
|
70
70
|
`完成后回 NO_REPLY。`,
|
|
71
71
|
].join('\n'));
|
|
72
72
|
case 'milestone.review':
|
|
73
|
-
//
|
|
74
|
-
|
|
75
|
-
return null;
|
|
73
|
+
// 计划评审阶段:**雇主和接活方都要确认计划**,双方都 plan_feedback approved 后 M0 才启动
|
|
74
|
+
// (真机 bug #12:平台要求两方都确认)。
|
|
76
75
|
return mk([
|
|
77
|
-
head(`${oid} 进入里程碑计划评审(
|
|
78
|
-
`${readFirst} 用 atel_milestone_list
|
|
76
|
+
head(`${oid} 进入里程碑计划评审(你是${role === 'executor' ? '接活方' : '雇主'})。`),
|
|
77
|
+
`${readFirst} 用 atel_milestone_list 看计划;合理则调 atel_milestone_plan_feedback {"orderId":"${orderId}","approved":true} 确认。`,
|
|
78
|
+
`(双方都确认后里程碑才启动。)回 NO_REPLY。`,
|
|
79
79
|
].join('\n'));
|
|
80
80
|
case 'milestone.plan_confirmed':
|
|
81
81
|
// 计划已确认 → 接活方提交首个里程碑。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapping.js","sourceRoot":"","sources":["../../src/events/mapping.ts"],"names":[],"mappings":"AAyBA,MAAM,GAAG,GAAG,kBAAkB,CAAC;AAE/B,iDAAiD;AACjD,MAAM,UAAU,UAAU,CAAC,EAAmB,EAAE,MAAc;IAC5D,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC;IACrB,MAAM,IAAI,GAAI,CAAC,CAAC,WAAsB,IAAK,CAAC,CAAC,YAAuB,IAAK,CAAC,CAAC,QAAmB,CAAC;IAC/F,MAAM,GAAG,GAAI,CAAC,CAAC,YAAuB,IAAK,CAAC,CAAC,aAAwB,IAAK,CAAC,CAAC,SAAoB,CAAC;IACjG,IAAI,IAAI,KAAK,MAAM;QAAE,OAAO,UAAU,CAAC;IACvC,IAAI,GAAG,KAAK,MAAM;QAAE,OAAO,WAAW,CAAC;IACvC,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAoB;IACrD,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,eAAe,CAAC,CAAC,eAAe;QACrC,KAAK,oBAAoB,CAAC,CAAC,kBAAkB;QAC7C,KAAK,oBAAoB,CAAC,CAAC,kBAAkB;QAC7C,KAAK,0BAA0B,CAAC,CAAC,mBAAmB;QACpD,KAAK,kBAAkB;YACrB,OAAO,UAAU,CAAC;QACpB,KAAK,gBAAgB,CAAC,CAAC,gBAAgB;QACvC,KAAK,qBAAqB,CAAC,CAAC,oBAAoB;QAChD,KAAK,yBAAyB;YAC5B,OAAO,WAAW,CAAC;QACrB;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,EAAmB,EAAE,IAAe;IACnE,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC;IAC3B,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,MAAM,OAAO,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IAC9C,MAAM,IAAI,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IAChD,MAAM,SAAS,GAAG,OAAO;QACvB,CAAC,CAAC,iCAAiC,OAAO,kBAAkB;QAC5D,CAAC,CAAC,4BAA4B,CAAC;IACjC,MAAM,EAAE,GAAG,CAAC,MAAc,EAAY,EAAE,CAAC,CAAC;QACxC,OAAO;QACP,SAAS,EAAE,EAAE,CAAC,IAAI;QAClB,IAAI;QACJ,MAAM;QACN,SAAS,EAAE,OAAO,IAAI,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;KACjD,CAAC,CAAC;IAEH,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QAChB,4DAA4D;QAC5D,KAAK,eAAe;YAClB,+BAA+B;YAC/B,IAAI,IAAI,KAAK,WAAW;gBAAE,OAAO,IAAI,CAAC;YACtC,OAAO,EAAE,CACP;gBACE,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC;gBAC/B,GAAG,SAAS,+CAA+C,OAAO,KAAK;gBACvE,oCAAoC;aACrC,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;QAEJ,KAAK,gBAAgB;YACnB,sBAAsB;YACtB,IAAI,IAAI,KAAK,UAAU;gBAAE,OAAO,IAAI,CAAC;YACrC,OAAO,EAAE,CACP;gBACE,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;gBAC5B,GAAG,SAAS,4DAA4D,OAAO,iCAAiC;gBAChH,gBAAgB;aACjB,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;QAEJ,KAAK,kBAAkB;YACrB,
|
|
1
|
+
{"version":3,"file":"mapping.js","sourceRoot":"","sources":["../../src/events/mapping.ts"],"names":[],"mappings":"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"}
|
package/dist/wakers/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/wakers/cli.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEjE,MAAM,WAAW,YAAY;IAC3B,8BAA8B;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,SAAS,EAAE,CAAC,GAAG,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,KAAK,MAAM,EAAE,CAAC;IACvF,yCAAyC;IACzC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC9D,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,0CAA0C;IAC1C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,6CAA6C;IAC7C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7B;AAOD,qBAAa,QAAS,YAAW,KAAK;IAIxB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAHjC,QAAQ,CAAC,IAAI,EAAG,KAAK,CAAU;IAC/B,OAAO,CAAC,OAAO,CAAqB;gBAEP,IAAI,EAAE,YAAY;IAIzC,IAAI,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAQjD,OAAO,CAAC,OAAO;
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/wakers/cli.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEjE,MAAM,WAAW,YAAY;IAC3B,8BAA8B;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,SAAS,EAAE,CAAC,GAAG,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,KAAK,MAAM,EAAE,CAAC;IACvF,yCAAyC;IACzC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC9D,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,0CAA0C;IAC1C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,6CAA6C;IAC7C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7B;AAOD,qBAAa,QAAS,YAAW,KAAK;IAIxB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAHjC,QAAQ,CAAC,IAAI,EAAG,KAAK,CAAU;IAC/B,OAAO,CAAC,OAAO,CAAqB;gBAEP,IAAI,EAAE,YAAY;IAIzC,IAAI,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAQjD,OAAO,CAAC,OAAO;IA0Df,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,GAAG;CAGZ"}
|
package/dist/wakers/cli.js
CHANGED
|
@@ -39,7 +39,7 @@ export class CliWaker {
|
|
|
39
39
|
const extraEnv = typeof this.spec.env === 'function' ? this.spec.env() : this.spec.env || {};
|
|
40
40
|
const t0 = Date.now();
|
|
41
41
|
return new Promise((resolve) => {
|
|
42
|
-
execFile(this.spec.bin, args, {
|
|
42
|
+
const child = execFile(this.spec.bin, args, {
|
|
43
43
|
timeout: timeoutMs,
|
|
44
44
|
maxBuffer: this.spec.maxBuffer ?? 10 * 1024 * 1024,
|
|
45
45
|
env: { ...process.env, ...extraEnv },
|
|
@@ -75,6 +75,10 @@ export class CliWaker {
|
|
|
75
75
|
resolve({ ok: true, output: out, durationMs, sessionId });
|
|
76
76
|
}
|
|
77
77
|
});
|
|
78
|
+
// 关键:立刻关闭子进程 stdin。codex exec 会读 stdin("Reading additional input from
|
|
79
|
+
// stdin..."),execFile 默认留着 stdin 管道开着 → codex 永远等 EOF → 卡满超时(bug #11)。
|
|
80
|
+
// prompt 已通过 argv 传入,无需 stdin。claude/gemini 不读 stdin,关掉也无害。
|
|
81
|
+
child.stdin?.end();
|
|
78
82
|
});
|
|
79
83
|
}
|
|
80
84
|
markStarted(sessionId) {
|
package/dist/wakers/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/wakers/cli.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAsB7B,MAAM,OAAO,GAAG,uDAAuD,CAAC;AACxE,MAAM,aAAa,GAAG,sFAAsF,CAAC;AAC7G,MAAM,SAAS,GAAG,mDAAmD,CAAC;AACtE,MAAM,cAAc,GAAG,CAAC,CAAC;AAEzB,MAAM,OAAO,QAAQ;IAIU;IAHpB,IAAI,GAAG,KAAc,CAAC;IACvB,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAEpC,YAA6B,IAAkB;QAAlB,SAAI,GAAJ,IAAI,CAAc;QAC7C,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAgB;QACzB,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,IAAI,UAAU,EAAE,CAAC;QAChD,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,OAAO,CAAC;QACzE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;QACpG,IAAI,MAAM,CAAC,EAAE;YAAE,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC3C,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,OAAO,CACb,SAAiB,EACjB,MAAc,EACd,SAAiB,EACjB,WAAmB,EACnB,QAAiB;QAEjB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;QAClE,MAAM,QAAQ,GAAG,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;QAC7F,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACtB,OAAO,IAAI,OAAO,CAAa,CAAC,OAAO,EAAE,EAAE;YACzC,QAAQ,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/wakers/cli.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED