lonny-agent 0.2.4 → 0.2.6
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/README.md +326 -326
- package/dist/agent/llm.d.ts +4 -0
- package/dist/agent/llm.d.ts.map +1 -1
- package/dist/agent/prompt-builder.d.ts.map +1 -1
- package/dist/agent/prompt-builder.js +13 -9
- package/dist/agent/prompt-builder.js.map +1 -1
- package/dist/agent/providers/google.d.ts.map +1 -1
- package/dist/agent/providers/google.js.map +1 -1
- package/dist/agent/providers/openai.d.ts.map +1 -1
- package/dist/agent/providers/openai.js +43 -3
- package/dist/agent/providers/openai.js.map +1 -1
- package/dist/agent/session.d.ts +4 -0
- package/dist/agent/session.d.ts.map +1 -1
- package/dist/agent/session.js +45 -7
- package/dist/agent/session.js.map +1 -1
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +7 -1
- package/dist/config/index.js.map +1 -1
- package/dist/tools/__tests__/bash.test.js +1 -1
- package/dist/tools/__tests__/bash.test.js.map +1 -1
- package/dist/tools/__tests__/edit.test.js +875 -371
- package/dist/tools/__tests__/edit.test.js.map +1 -1
- package/dist/tools/__tests__/grep.test.js +32 -0
- package/dist/tools/__tests__/grep.test.js.map +1 -1
- package/dist/tools/__tests__/sed.test.d.ts +2 -0
- package/dist/tools/__tests__/sed.test.d.ts.map +1 -0
- package/dist/tools/__tests__/sed.test.js +228 -0
- package/dist/tools/__tests__/sed.test.js.map +1 -0
- package/dist/tools/bash.d.ts.map +1 -1
- package/dist/tools/bash.js +83 -10
- package/dist/tools/bash.js.map +1 -1
- package/dist/tools/edit.d.ts +50 -9
- package/dist/tools/edit.d.ts.map +1 -1
- package/dist/tools/edit.js +328 -158
- package/dist/tools/edit.js.map +1 -1
- package/dist/tools/grep.d.ts.map +1 -1
- package/dist/tools/grep.js +54 -30
- package/dist/tools/grep.js.map +1 -1
- package/dist/tools/registry.d.ts +0 -6
- package/dist/tools/registry.d.ts.map +1 -1
- package/dist/tools/registry.js +2 -29
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/sed.d.ts +4 -0
- package/dist/tools/sed.d.ts.map +1 -0
- package/dist/tools/sed.js +121 -0
- package/dist/tools/sed.js.map +1 -0
- package/dist/web/index.d.ts.map +1 -1
- package/dist/web/index.js +26 -3
- package/dist/web/index.js.map +1 -1
- package/dist/web/public/app.js +5 -855
- package/dist/web/public/confirm.js +70 -0
- package/dist/web/public/index.html +121 -120
- package/dist/web/public/input.js +107 -0
- package/dist/web/public/messages.js +395 -0
- package/dist/web/public/sidebar.js +82 -0
- package/dist/web/public/state.js +72 -0
- package/dist/web/public/style.css +996 -949
- package/dist/web/public/utils.js +37 -0
- package/dist/web/public/websocket.js +267 -0
- package/dist/web/public/ws.js +19 -0
- package/dist/web/session-bridge.d.ts.map +1 -1
- package/dist/web/session-bridge.js +3 -7
- package/dist/web/session-bridge.js.map +1 -1
- package/package.json +55 -54
- package/scripts/copy-native.mjs +24 -0
- package/scripts/copy-web.mjs +15 -0
- package/src/agent/index.ts +25 -25
- package/src/agent/llm.ts +4 -0
- package/src/agent/prompt-builder.ts +13 -9
- package/src/agent/providers/anthropic.ts +179 -179
- package/src/agent/providers/google.ts +210 -211
- package/src/agent/providers/ollama.ts +186 -186
- package/src/agent/providers/openai.ts +61 -5
- package/src/agent/session.ts +59 -3
- package/src/config/index.ts +342 -335
- package/src/tools/__tests__/bash.test.ts +1 -1
- package/src/tools/__tests__/edit.test.ts +981 -385
- package/src/tools/__tests__/grep.test.ts +35 -0
- package/src/tools/bash.ts +97 -11
- package/src/tools/edit.ts +362 -169
- package/src/tools/git.ts +76 -76
- package/src/tools/grep.ts +57 -30
- package/src/tools/registry.ts +2 -31
- package/src/tui/index.ts +786 -786
- package/src/web/index.ts +25 -3
- package/src/web/public/app.js +5 -855
- package/src/web/public/confirm.js +70 -0
- package/src/web/public/index.html +121 -120
- package/src/web/public/input.js +107 -0
- package/src/web/public/messages.js +395 -0
- package/src/web/public/sidebar.js +82 -0
- package/src/web/public/state.js +72 -0
- package/src/web/public/style.css +996 -949
- package/src/web/public/utils.js +37 -0
- package/src/web/public/websocket.js +267 -0
- package/src/web/public/ws.js +19 -0
- package/src/web/session-bridge.ts +193 -194
- package/.claude/settings.local.json +0 -14
- package/.kilo/plans/1780064105789-mighty-pixel.md +0 -171
- package/.kilo/plans/1780293725888-quick-wizard.md +0 -62
- package/.lonny/plan-web-cwd-status.md +0 -38
- package/src/tools/exec.ts +0 -348
package/dist/tools/edit.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edit.js","sourceRoot":"","sources":["../../src/tools/edit.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"edit.js","sourceRoot":"","sources":["../../src/tools/edit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAA;AAC7B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAElE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAWpC,6EAA6E;AAC7E,MAAM,QAAQ,GAAG,sBAAsB,CAAA;AACvC,MAAM,UAAU,GAAG,sBAAsB,CAAA;AACzC,MAAM,QAAQ,GAAG,wBAAwB,CAAA;AACzC,MAAM,UAAU,GAAG,SAAS,CAAA;AAE5B,6EAA6E;AAC7E,MAAM,QAAQ,GAAG,SAAS,CAAA;AAC1B,MAAM,UAAU,GAAG,SAAS,CAAA;AAC5B,MAAM,QAAQ,GAAG,SAAS,CAAA;AAE1B,+CAA+C;AAC/C,SAAS,SAAS,CAAC,IAAgB;IACjC,OAAO,IAAI,CAAC,SAAS,CAAC;QACpB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,UAAU,EAAE,IAAI,CAAC,UAAU;KAC5B,CAAC,CAAA;AACJ,CAAC;AAED,iGAAiG;AACjG,SAAS,iBAAiB,CAAC,QAAiB;IAC1C,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;IAClC,IAAI,CAAC,CAAC,MAAM,IAAI,GAAG;QAAE,OAAO,CAAC,CAAA;IAC7B,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,yBAAyB,CAAC,CAAC,MAAM,SAAS,CAAA;AACrE,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,WAAW,CAAC,MAAc,EAAE,MAAc;IACxD,MAAM,QAAQ,GAAG,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACxD,MAAM,QAAQ,GAAG,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAExD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAA;IAE7D,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;IAChD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACvB,IAAI,EACF,CAAC,CAAC,CAAC,CAAC,KAAK,WAAW;YAClB,CAAC,CAAE,QAAkB;YACrB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,WAAW;gBACpB,CAAC,CAAE,QAAkB;gBACrB,CAAC,CAAE,OAAiB;QAC1B,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;KACd,CAAC,CAAC,CAAA;AACL,CAAC;AAED,yDAAyD;AACzD,MAAM,UAAU,kBAAkB,CAAC,KAAiB,EAAE,YAAqB;IACzE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAA;IAEjC,MAAM,MAAM,GAAa,EAAE,CAAA;IAC3B,IAAI,KAAK,GAAG,YAAY,IAAI,CAAC,CAAA;IAC7B,IAAI,KAAK,GAAG,YAAY,IAAI,CAAC,CAAA;IAC7B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3B,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,KAAK,KAAK,KAAK,IAAI,CAAC,OAAO,GAAG,UAAU,EAAE,CAAC,CAAA;YACpE,KAAK,EAAE,CAAA;QACT,CAAC;aAAM,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAClC,MAAM,CAAC,IAAI,CAAC,KAAK,UAAU,KAAK,KAAK,KAAK,IAAI,CAAC,OAAO,GAAG,UAAU,EAAE,CAAC,CAAA;YACtE,KAAK,EAAE,CAAA;QACT,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,KAAK,KAAK,KAAK,IAAI,CAAC,OAAO,GAAG,UAAU,EAAE,CAAC,CAAA;YACpE,KAAK,EAAE,CAAA;YACP,KAAK,EAAE,CAAA;QACT,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC1B,CAAC;AAED,mCAAmC;AACnC,MAAM,UAAU,cAAc,CAAC,KAAiB;IAC9C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAA;IAEjC,MAAM,MAAM,GAAa,EAAE,CAAA;IAC3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3B,MAAM,CAAC,IAAI,CAAC,yBAAyB,QAAQ,QAAQ,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QACzF,CAAC;aAAM,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAClC,MAAM,CAAC,IAAI,CAAC,yBAAyB,UAAU,QAAQ,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QAC3F,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CAAC,yBAAyB,QAAQ,QAAQ,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QACzF,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC1B,CAAC;AAED,qCAAqC;AACrC,MAAM,UAAU,UAAU,CAAC,GAAW;IACpC,OAAO,GAAG;SACP,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;SACtB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC;SACvB,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AAC3B,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,MAAc,EAAE,MAAc,EAAE,YAAqB;IAChF,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzC,OAAO,kBAAkB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAA;AAChD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CACrC,WAAmB,EACnB,MAAc,EACd,MAAc,EACd,UAAkB,EAClB,WAAmB;IAEnB,0DAA0D;IAC1D,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAA;IAExE,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAE5C,iDAAiD;IACjD,IAAI,OAAO,GAAG,CAAC,CAAA;IACf,IAAI,iBAAiB,GAAG,CAAC,CAAA;IACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7C,IAAI,OAAO,IAAI,UAAU,IAAI,UAAU,GAAG,OAAO,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/E,iBAAiB,GAAG,CAAC,CAAA;YACrB,MAAK;QACP,CAAC;QACD,OAAO,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAA,CAAC,YAAY;IACpD,CAAC;IAED,2DAA2D;IAC3D,MAAM,QAAQ,GAAG,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACxD,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAA;IACpC,MAAM,eAAe,GAAG,iBAAiB,GAAG,YAAY,GAAG,CAAC,CAAA;IAE5D,6CAA6C;IAC7C,MAAM,aAAa,GAAG,iBAAiB,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACxE,MAAM,YAAY,GAAG,eAAe,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAEzF,yCAAyC;IACzC,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAE7C,MAAM,MAAM,GAAa,EAAE,CAAA;IAE3B,iBAAiB;IACjB,IAAI,aAAa,KAAK,CAAC,CAAC,EAAE,CAAC;QACzB,MAAM,OAAO,GAAG,aAAa,GAAG,CAAC,CAAA;QACjC,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,KAAK,OAAO,KAAK,YAAY,CAAC,aAAa,CAAC,GAAG,UAAU,EAAE,CAAC,CAAA;IACvF,CAAC;IAED,+BAA+B;IAC/B,IAAI,KAAK,GAAG,YAAY,CAAA;IACxB,IAAI,KAAK,GAAG,YAAY,CAAA;IACxB,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3B,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,KAAK,KAAK,KAAK,IAAI,CAAC,OAAO,GAAG,UAAU,EAAE,CAAC,CAAA;YACpE,KAAK,EAAE,CAAA;QACT,CAAC;aAAM,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAClC,MAAM,CAAC,IAAI,CAAC,KAAK,UAAU,KAAK,KAAK,KAAK,IAAI,CAAC,OAAO,GAAG,UAAU,EAAE,CAAC,CAAA;YACtE,KAAK,EAAE,CAAA;QACT,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,KAAK,KAAK,KAAK,IAAI,CAAC,OAAO,GAAG,UAAU,EAAE,CAAC,CAAA;YACpE,KAAK,EAAE,CAAA;YACP,KAAK,EAAE,CAAA;QACT,CAAC;IACH,CAAC;IAED,gBAAgB;IAChB,IAAI,YAAY,KAAK,CAAC,CAAC,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,YAAY,GAAG,CAAC,CAAA;QAChC,MAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,KAAK,OAAO,KAAK,YAAY,CAAC,YAAY,CAAC,GAAG,UAAU,EAAE,CAAC,CAAA;IACtF,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC1B,CAAC;AAED;;;;;;;;;GASG;AACH,yBAAyB;AACzB,MAAM,UAAU,aAAa,CAAC,CAAS;IACrC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,GAAG,CAAC,CAAA;AAC5C,CAAC;AAOD;;;;;;;GAOG;AACH,yBAAyB;AACzB,MAAM,UAAU,oBAAoB,CAAC,OAAe,EAAE,SAAiB;IACrE,IAAI,SAAS,KAAK,EAAE;QAAE,OAAO,EAAE,CAAA;IAE/B,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACxC,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAEtC,IAAI,QAAQ,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM;QAAE,OAAO,EAAE,CAAA;IAEpD,0BAA0B;IAC1B,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IACnD,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IAE3C,MAAM,OAAO,GAAe,EAAE,CAAA;IAE9B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,IAAI,WAAW,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QAC1E,IAAI,KAAK,GAAG,IAAI,CAAA;QAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACxC,IAAI,WAAW,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1C,KAAK,GAAG,KAAK,CAAA;gBACb,MAAK;YACP,CAAC;QACH,CAAC;QACD,IAAI,KAAK,EAAE,CAAC;YACV,2DAA2D;YAC3D,IAAI,OAAO,GAAG,CAAC,CAAA;YACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC/B,OAAO,IAAI,YAAY,CAAC,CAAC,CAAE,CAAC,MAAM,GAAG,CAAC,CAAA,CAAC,gBAAgB;YACzD,CAAC;YACD,kDAAkD;YAClD,IAAI,UAAU,GAAG,CAAC,CAAA;YAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACzC,UAAU,IAAI,YAAY,CAAC,KAAK,GAAG,CAAC,CAAE,CAAC,MAAM,CAAA;gBAC7C,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC;oBAAE,UAAU,IAAI,CAAC,CAAA,CAAC,gBAAgB;YAC/D,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAA;QACtD,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AAUD,yBAAyB;AACzB,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,MAAM,KAAK,GAAW,EAAE,CAAA;IAExB,SAAS,cAAc,CAAC,GAAW;QACjC,uEAAuE;QACvE,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAA;QAE7C,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;QAClD,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAA;QAC3B,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,CAAA;QAErC,IAAI,SAAS,GAAG,EAAE,CAAA;QAClB,IAAI,SAAS,GAAG,EAAE,CAAA;QAElB,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAA;QACzE,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAA;QAEpE,IAAI,QAAQ,EAAE,CAAC;YACb,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QAClE,CAAC;QACD,IAAI,QAAQ,EAAE,CAAC;YACb,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QAClE,CAAC;QAED,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,IAAI,EAAE,EAAE,UAAU,EAAE,SAAS,IAAI,EAAE,EAAE,CAAA;IAC1F,CAAC;IAED,8EAA8E;IAC9E,MAAM,UAAU,GAAG,2BAA2B,CAAA;IAC9C,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACtD,MAAM,IAAI,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,CAAE,CAAC,CAAA;QAC3C,IAAI,IAAI;YAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC5B,CAAC;IAED,sFAAsF;IACtF,sEAAsE;IACtE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC;QACnC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAA;QAChB,MAAM,WAAW,GAAG,yBAAyB,CAAA;QAC7C,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YACvD,MAAM,IAAI,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,CAAE,CAAC,CAAA;YAC3C,IAAI,IAAI;gBAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC5B,CAAC;IACH,CAAC;IAED,yEAAyE;IACzE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;QACpC,IAAI,IAAI;YAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC5B,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC;AAED,qEAAqE;AACrE,SAAS,oBAAoB,CAAC,KAA8B;IAC1D,0EAA0E;IAC1E,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,gCAAgC;QAChC,OAAO,KAAe,CAAA;IACxB,CAAC;IAED,4FAA4F;IAC5F,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAE/B,yFAAyF;QACzF,MAAM,WAAW,GAAG,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ,CAAA;QACvD,MAAM,YAAY,GAAG,OAAO,KAAK,CAAC,UAAU,KAAK,QAAQ,CAAA;QACzD,MAAM,YAAY,GAAG,OAAO,KAAK,CAAC,UAAU,KAAK,QAAQ,CAAA;QAEzD,IAAI,WAAW,IAAI,YAAY,IAAI,YAAY,EAAE,CAAC;YAChD,OAAO;gBACL;oBACE,SAAS,EAAE,KAAK,CAAC,SAAmB;oBACpC,UAAU,EAAE,KAAK,CAAC,UAAoB;oBACtC,UAAU,EAAE,KAAK,CAAC,UAAoB;iBACvC;aACF,CAAA;QACH,CAAC;aAAM,IAAI,WAAW,IAAI,YAAY,EAAE,CAAC;YACvC,oEAAoE;YACpE,qFAAqF;YACrF,OAAO;gBACL;oBACE,SAAS,EAAE,KAAK,CAAC,SAAmB;oBACpC,UAAU,EAAE,KAAK,CAAC,UAAoB;oBACtC,UAAU,EAAG,KAAK,CAAC,UAAqB,IAAI,wBAAwB;iBACrE;aACF,CAAA;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,WAAW,IAAI,OAAO,KAAK,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;YACpF,wEAAwE;YACxE,OAAO;gBACL;oBACE,SAAS,EAAE,KAAK,CAAC,SAAmB;oBACpC,UAAU,EAAE,EAAE;oBACd,UAAU,EAAE,KAAK,CAAC,UAAoB;iBACvC;aACF,CAAA;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,WAAW,EAAE,CAAC;YAC5C,oEAAoE;YACpE,OAAO,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAmB,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAA;QACnF,CAAC;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IAED,6DAA6D;IAC7D,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAC,KAAe,CAAA;IAC9B,CAAC;IAED,OAAO,EAAE,CAAA;AACX,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAwB,EAAE,GAAW;IAClE,OAAO;QACL,UAAU,EAAE;YACV,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8DAsC2C;YACxD,UAAU,EAAE;gBACV,OAAO,EAAE;oBACP,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,yEAAyE;oBACtF,QAAQ,EAAE,IAAI;iBACf;aACF;SACF;QACD,KAAK,CAAC,OAAO,CAAC,KAAK;YACjB,8EAA8E;YAC9E,MAAM,QAAQ,GAAG,KAAK,CAAA;YAEtB,qEAAqE;YACrE,IAAI,KAAK,GAAW,EAAE,CAAA;YAEtB,qDAAqD;YACrD,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gBACtC,6CAA6C;gBAC7C,IAAI,UAAU,GAAG,KAAK,CAAC,OAAO,CAAA;gBAC9B,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;oBACrC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;wBAC/B,UAAU,GAAG,MAAM,CAAA;oBACrB,CAAC;yBAAM,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;wBACtF,UAAU,GAAG,MAAM,CAAC,OAAO,CAAA;oBAC7B,CAAC;gBACH,CAAC;gBAAC,MAAM,CAAC;oBACP,uBAAuB;gBACzB,CAAC;gBACD,KAAK,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAA;gBACrC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACvB,OAAO;wBACL,OAAO,EAAE,KAAK;wBACd,MAAM,EAAE,EAAE;wBACT,KAAK,EAAE,2CAA2C,iBAAiB,CAAC,QAAQ,CAAC,yEAAyE;qBACxJ,CAAA;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,8CAA8C;gBAC9C,KAAK,GAAG,oBAAoB,CAAC,KAAgC,CAAC,CAAA;YAChE,CAAC;YAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvB,+EAA+E;gBAC/E,MAAM,UAAU,GAAI,KAAiC,CAAC,KAAK,CAAA;gBAC3D,IAAI,OAAO,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC7E,OAAO;wBACL,OAAO,EAAE,KAAK;wBACd,MAAM,EAAE,EAAE;wBACT,KAAK,EAAE,oFAAoF,iBAAiB,CAAC,QAAQ,CAAC,EAAE;qBAC1H,CAAA;gBACH,CAAC;gBACD,qDAAqD;gBACrD,IAAI,OAAO,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAE,KAAiC,CAAC,KAAK,CAAC,EAAE,CAAC;oBACjF,OAAO;wBACL,OAAO,EAAE,KAAK;wBACd,MAAM,EAAE,EAAE;wBACT,KAAK,EAAE,kIAAkI,iBAAiB,CAAC,QAAQ,CAAC,EAAE;qBACxK,CAAA;gBACH,CAAC;gBACD,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,MAAM,EAAE,EAAE;oBACP,KAAK,EAAE,gPAAgP,iBAAiB,CAAC,QAAQ,CAAC,EAAE;iBACxR,CAAA;YACH,CAAC;YAED,4BAA4B;YAC5B,MAAM,UAAU,GAAa,EAAE,CAAA;YAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACtC,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;gBAClB,MAAM,OAAO,GAAa,EAAE,CAAA;gBAC5B,IAAI,OAAO,CAAC,CAAC,SAAS,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,SAAS;oBAAE,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;gBAC9E,IAAI,OAAO,CAAC,CAAC,UAAU,KAAK,QAAQ;oBAAE,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;gBAChE,IAAI,OAAO,CAAC,CAAC,UAAU,KAAK,QAAQ;oBAAE,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;gBAChE,IAAI,CAAC,CAAC,UAAU,KAAK,wBAAwB,EAAE,CAAC;oBAC9C,OAAO,CAAC,IAAI,CAAC,kEAAkE,CAAC,CAAA;gBAClF,CAAC;gBACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACvB,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;yBAC3B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAe,CAAC,KAAK,QAAQ,CAAC;yBACnD,IAAI,CAAC,IAAI,CAAC,CAAA;oBACb,UAAU,CAAC,IAAI,CACb,WAAW,CAAC,GAAG,CAAC,aAAa,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,UAAU,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACxF,CAAA;gBACH,CAAC;YACH,CAAC;YACD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,MAAM,EAAE,EAAE;oBACV,KAAK,EAAE,iBAAiB,UAAU,CAAC,MAAM,OAAO,KAAK,CAAC,MAAM,kCAAkC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,iBAAiB,CAAC,QAAQ,CAAC,gGAAgG;iBAChQ,CAAA;YACH,CAAC;YAED,MAAM,UAAU,GAAG,IAAI,GAAG,EAAmE,CAAA;YAC7F,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;gBACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,SAAS,CAAC,CAAA;gBAC/C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC9B,IAAI,eAAe,GAAkB,IAAI,CAAA;oBACzC,IAAI,CAAC;wBACH,eAAe,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;oBACtD,CAAC;oBAAC,MAAM,CAAC;wBACP,4BAA4B;oBAC9B,CAAC;oBACD,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAA;gBAC1D,CAAC;gBACD,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YACzC,CAAC;YAED,MAAM,OAAO,GAAa,EAAE,CAAA;YAC5B,IAAI,SAAS,GAAG,KAAK,CAAA;YACrB,IAAI,UAAU,GAAG,EAAE,CAAA;YACnB,MAAM,aAAa,GAAG,IAAI,GAAG,EAAyB,CAAA;YAEtD,KAAK,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,UAAU,EAAE,CAAC;gBAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;gBAChE,IAAI,OAAO,GACT,KAAK,CAAC,eAAe,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;gBAEtF,yDAAyD;gBACzD,MAAM,WAAW,GAAG,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;gBAE7E,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;oBACjD,MAAM,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;oBACxB,mEAAmE;oBACnE,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;oBAClD,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;oBAElD,IAAI,CAAC,CAAC,UAAU,KAAK,EAAE,EAAE,CAAC;wBACxB,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;4BACrB,gEAAgE;4BAChE,4DAA4D;4BAC5D,OAAO,CAAC,IAAI,CACV,UAAU,OAAO,mFAAmF,CACrG,CAAA;4BACD,IAAI,CAAC,SAAS,EAAE,CAAC;gCACf,SAAS,GAAG,IAAI,CAAA;gCAChB,UAAU,GAAG,uBAAuB,OAAO,wBAAwB,CAAA;4BACrE,CAAC;4BACD,MAAK;wBACP,CAAC;wBACD,MAAM,QAAQ,GAAG,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAA;wBAChD,OAAO,GAAG,CAAC,CAAC,UAAU,CAAA;wBACtB,OAAO,CAAC,IAAI,CACV,aAAa,OAAO,KAAK,QAAQ,aAAa,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAClF,CAAA;wBACD,SAAQ;oBACV,CAAC;oBAED,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;wBACrB,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;wBACzB,MAAM,UAAU,GAAG,iFAAiF,CAAA;wBACpG,OAAO,CAAC,IAAI,CAAC,UAAU,OAAO;UAChC,IAAI;EACZ,UAAU,EAAE,CAAC,CAAA;wBACH,IAAI,CAAC,SAAS,EAAE,CAAC;4BACf,SAAS,GAAG,IAAI,CAAA;4BAChB,UAAU,GAAG,mBAAmB,OAAO,EAAE,CAAA;wBAC3C,CAAC;wBACD,MAAK;oBACP,CAAC;oBAED,gEAAgE;oBAChE,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;oBAE9C,IAAI,SAAS,GACX,IAAI,CAAA;oBAEN,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;wBACpB,2CAA2C;wBAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;wBACjD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;4BACzB,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;4BACzB,MAAM,UAAU,GAAG,iHAAiH,CAAA;4BACpI,OAAO,CAAC,IAAI,CAAC,UAAU,OAAO;UAClC,IAAI;EACZ,UAAU,EAAE,CAAC,CAAA;4BACD,IAAI,CAAC,SAAS,EAAE,CAAC;gCACf,SAAS,GAAG,IAAI,CAAA;gCAChB,UAAU,GAAG,wCAAwC,OAAO,EAAE,CAAA;4BAChE,CAAC;4BACD,MAAK;wBACP,CAAC;wBACD,SAAS,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAA;oBACjF,CAAC;yBAAM,CAAC;wBACN,8DAA8D;wBAC9D,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,EAAE,CAAC,CAAC,UAAU,CAAC,CAAA;wBAC5D,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;4BAC1B,qDAAqD;4BACrD,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;4BACxC,IAAI,IAAI,GAAG,EAAE,CAAA;4BACb,MAAM,SAAS,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;4BAC5D,IAAI,SAAS,EAAE,CAAC;gCACd,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC,CAAA;gCAC1C,uDAAuD;gCACvD,MAAM,UAAU,GAAG,YAAY,CAAC,SAAS,CACvC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAClF,CAAA;gCACD,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;oCACtB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC,CAAA;oCACzC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,GAAG,CAAC,CAAC,CAAA;oCACzD,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;oCACzD,IAAI,GAAG,iBAAiB,UAAU,GAAG,CAAC,aAAa,OAAO,SAAS,CAAA;gCACrE,CAAC;4BACH,CAAC;4BACD,sEAAsE;4BACtE,IAAI,CAAC,IAAI,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gCACrC,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAA;gCACrE,IAAI,GAAG,2BAA2B,KAAK,CAAC,MAAM,oBAAoB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAA;4BAC7F,CAAC;4BACD,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;4BACzB,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,OAAO,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;4BACxD,MAAM,UAAU,GAAG,gDAAgD,CAAC,CAAC,SAAS,8HAA8H,QAAQ,EAAE,CAAA;4BACtN,OAAO,CAAC,IAAI,CAAC,UAAU,OAAO,yBAAyB,IAAI;UAC/D,IAAI;EACZ,UAAU,EAAE,CAAC,CAAA;4BACD,IAAI,CAAC,SAAS,EAAE,CAAC;gCACf,SAAS,GAAG,IAAI,CAAA;gCAChB,UAAU,GAAG,2BAA2B,OAAO,GAAG,IAAI,EAAE,CAAA;4BAC1D,CAAC;4BACD,MAAK;wBACP,CAAC;wBACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BACxB,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;4BACzB,MAAM,UAAU,GAAG,iHAAiH,CAAA;4BACpI,OAAO,CAAC,IAAI,CACV,UAAU,OAAO,wEAAwE,IAAI,KAAK,UAAU,EAAE,CAC/G,CAAA;4BACD,IAAI,CAAC,SAAS,EAAE,CAAC;gCACf,SAAS,GAAG,IAAI,CAAA;gCAChB,UAAU,GAAG,wCAAwC,OAAO,0BAA0B,CAAA;4BACxF,CAAC;4BACD,MAAK;wBACP,CAAC;wBACD,SAAS,GAAG;4BACV,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAE,CAAC,KAAK;4BACzB,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAE,CAAC,MAAM;4BAC3B,QAAQ,EAAE,UAAU;yBACrB,CAAA;oBACH,CAAC;oBAED,wEAAwE;oBACxE,+EAA+E;oBAC/E,MAAM,UAAU,GACd,SAAS,CAAC,QAAQ,KAAK,UAAU;wBAC/B,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC;wBACpE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;oBAClB,MAAM,IAAI,GAAG,uBAAuB,CAClC,OAAO,EACP,UAAU,EACV,CAAC,CAAC,UAAU,EACZ,SAAS,CAAC,KAAK,EACf,SAAS,CAAC,MAAM,CACjB,CAAA;oBACD,OAAO,CAAC,IAAI,CAAC,YAAY,OAAO,MAAM,IAAI,EAAE,CAAC,CAAA;oBAC7C,OAAO;wBACL,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC;4BACjC,CAAC,CAAC,UAAU;4BACZ,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;gBACrD,CAAC;gBAED,IAAI,SAAS;oBAAE,MAAK;gBACpB,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;YACtC,CAAC;YAED,IAAI,SAAS,EAAE,CAAC;gBACd,KAAK,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,UAAU,EAAE,CAAC;oBAC3C,MAAM,eAAe,GAAG,KAAK,CAAC,eAAe,CAAA;oBAC7C,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;wBAC7B,IAAI,CAAC;4BACH,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;wBACzB,CAAC;wBAAC,MAAM,CAAC;4BACP,QAAQ;wBACV,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC;4BACH,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;4BACzD,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,eAAe,EAAE,OAAO,CAAC,CAAA;wBACtD,CAAC;wBAAC,MAAM,CAAC;4BACP,QAAQ;wBACV,CAAC;oBACH,CAAC;oBACD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;gBAC5B,CAAC;gBACD,wEAAwE;gBACxE,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBACzE,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,MAAM,EAAE,EAAE;oBACV,KAAK,EAAE,2CAA2C,SAAS,OAAO,UAAU,EAAE;iBAC/E,CAAA;YACH,CAAC;YAED,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,aAAa,EAAE,CAAC;gBAChD,IAAI,CAAC;oBACH,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;wBACrB,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;oBACzB,CAAC;yBAAM,CAAC;wBACN,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;wBACzD,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;oBAC9C,CAAC;gBACH,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,OAAO;wBACL,OAAO,EAAE,KAAK;wBACd,MAAM,EAAE,EAAE;wBACT,KAAK,EAAE,mBAAmB,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,MAAM,CAAC,GAAG,CAAC,YAAY,iBAAiB,CAAC,QAAQ,CAAC,EAAE;qBACrI,CAAA;gBACH,CAAC;gBACD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;YAC5B,CAAC;YAED,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;aAClD,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC"}
|
package/dist/tools/grep.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grep.d.ts","sourceRoot":"","sources":["../../src/tools/grep.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAc,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"grep.d.ts","sourceRoot":"","sources":["../../src/tools/grep.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAc,MAAM,YAAY,CAAA;AAgHlD,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CA6DhD"}
|
package/dist/tools/grep.js
CHANGED
|
@@ -1,15 +1,19 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { execFileSync } from 'node:child_process';
|
|
2
2
|
import * as fs from 'node:fs/promises';
|
|
3
3
|
import * as path from 'node:path';
|
|
4
4
|
import { fmtErr } from './errors.js';
|
|
5
|
+
let _hasRg;
|
|
5
6
|
function hasRg() {
|
|
7
|
+
if (_hasRg !== undefined)
|
|
8
|
+
return _hasRg;
|
|
6
9
|
try {
|
|
7
|
-
|
|
8
|
-
|
|
10
|
+
execFileSync('rg', ['--version'], { stdio: 'pipe' });
|
|
11
|
+
_hasRg = true;
|
|
9
12
|
}
|
|
10
13
|
catch {
|
|
11
|
-
|
|
14
|
+
_hasRg = false;
|
|
12
15
|
}
|
|
16
|
+
return _hasRg;
|
|
13
17
|
}
|
|
14
18
|
/** Simple glob-to-regex for the `include` parameter (e.g. "*.ts", "*.{ts,tsx}"). */
|
|
15
19
|
function includeRe(include) {
|
|
@@ -23,9 +27,12 @@ function includeRe(include) {
|
|
|
23
27
|
continue;
|
|
24
28
|
}
|
|
25
29
|
if (ch === '*') {
|
|
30
|
+
// Handle ** (match across dirs) and * (match within a single dir segment)
|
|
26
31
|
if (include[i + 1] === '*') {
|
|
27
32
|
re += '.*';
|
|
28
|
-
|
|
33
|
+
// Skip all consecutive asterisks so `***` doesn't leave a trailing literal `*`
|
|
34
|
+
while (i < include.length && include[i] === '*')
|
|
35
|
+
i++;
|
|
29
36
|
continue;
|
|
30
37
|
}
|
|
31
38
|
re += '[^/]*';
|
|
@@ -46,6 +53,12 @@ function includeRe(include) {
|
|
|
46
53
|
i++;
|
|
47
54
|
continue;
|
|
48
55
|
}
|
|
56
|
+
// Escape special regex characters (except those we handle above)
|
|
57
|
+
if (/[.+^${}()|[\]\\]/.test(ch)) {
|
|
58
|
+
re += '\\' + ch;
|
|
59
|
+
i++;
|
|
60
|
+
continue;
|
|
61
|
+
}
|
|
49
62
|
re += ch;
|
|
50
63
|
i++;
|
|
51
64
|
}
|
|
@@ -55,36 +68,37 @@ async function nodeGrep(dir, re, incRe) {
|
|
|
55
68
|
const results = [];
|
|
56
69
|
try {
|
|
57
70
|
const entries = await fs.readdir(dir, { withFileTypes: true });
|
|
58
|
-
const
|
|
71
|
+
const promises = [];
|
|
59
72
|
for (const e of entries) {
|
|
60
73
|
const full = path.join(dir, e.name);
|
|
61
74
|
if (e.isDirectory()) {
|
|
62
75
|
if (e.name === '.git' || e.name === 'node_modules')
|
|
63
76
|
continue;
|
|
64
|
-
|
|
77
|
+
promises.push(nodeGrep(full, re, incRe).then(sub => {
|
|
78
|
+
for (const m of sub)
|
|
79
|
+
results.push(m);
|
|
80
|
+
}));
|
|
65
81
|
}
|
|
66
82
|
else if (e.isFile()) {
|
|
67
83
|
if (incRe && !incRe.test(e.name))
|
|
68
84
|
continue;
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
85
|
+
promises.push((async () => {
|
|
86
|
+
try {
|
|
87
|
+
const content = await fs.readFile(full, 'utf-8');
|
|
88
|
+
const lines = content.split('\n');
|
|
89
|
+
for (let i = 0; i < lines.length; i++) {
|
|
90
|
+
if (re.test(lines[i])) {
|
|
91
|
+
results.push({ file: full, line: i + 1, text: lines[i] });
|
|
92
|
+
}
|
|
75
93
|
}
|
|
76
94
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
}
|
|
95
|
+
catch {
|
|
96
|
+
/* permission denied etc */
|
|
97
|
+
}
|
|
98
|
+
})());
|
|
81
99
|
}
|
|
82
100
|
}
|
|
83
|
-
|
|
84
|
-
const subMatches = await Promise.all(subResults);
|
|
85
|
-
for (const sm of subMatches) {
|
|
86
|
-
results.push(...sm);
|
|
87
|
-
}
|
|
101
|
+
await Promise.all(promises);
|
|
88
102
|
}
|
|
89
103
|
catch {
|
|
90
104
|
/* permission denied etc */
|
|
@@ -112,12 +126,25 @@ export function createGrepTool(cwd) {
|
|
|
112
126
|
const searchPath = input.path || cwd;
|
|
113
127
|
try {
|
|
114
128
|
if (useRg) {
|
|
115
|
-
|
|
129
|
+
const args = ['-n', '--no-heading', pattern];
|
|
116
130
|
if (include)
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
131
|
+
args.push('-g', include);
|
|
132
|
+
args.push(searchPath);
|
|
133
|
+
try {
|
|
134
|
+
const output = execFileSync('rg', args, {
|
|
135
|
+
encoding: 'utf-8',
|
|
136
|
+
stdio: ['pipe', 'pipe', 'pipe'],
|
|
137
|
+
});
|
|
138
|
+
return { success: true, output: output || 'No matches found.' };
|
|
139
|
+
}
|
|
140
|
+
catch (rgErr) {
|
|
141
|
+
const rgMsg = fmtErr(rgErr);
|
|
142
|
+
// ripgrep exit code 1 = no matches, exit code 2 = error
|
|
143
|
+
if (rgMsg.includes('exit code 1')) {
|
|
144
|
+
return { success: true, output: 'No matches found.' };
|
|
145
|
+
}
|
|
146
|
+
throw rgErr;
|
|
147
|
+
}
|
|
121
148
|
}
|
|
122
149
|
const re = new RegExp(pattern);
|
|
123
150
|
const incRe = include ? includeRe(include) : null;
|
|
@@ -132,9 +159,6 @@ export function createGrepTool(cwd) {
|
|
|
132
159
|
}
|
|
133
160
|
catch (err) {
|
|
134
161
|
const msg = fmtErr(err);
|
|
135
|
-
if (useRg && msg.includes('exit code 1')) {
|
|
136
|
-
return { success: true, output: 'No matches found.' };
|
|
137
|
-
}
|
|
138
162
|
return { success: false, output: '', error: `Grep failed: ${msg}` };
|
|
139
163
|
}
|
|
140
164
|
},
|
package/dist/tools/grep.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grep.js","sourceRoot":"","sources":["../../src/tools/grep.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"grep.js","sourceRoot":"","sources":["../../src/tools/grep.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/registry.d.ts
CHANGED
|
@@ -20,15 +20,9 @@ export declare class ToolRegistry {
|
|
|
20
20
|
private tools;
|
|
21
21
|
private context;
|
|
22
22
|
private plugins;
|
|
23
|
-
/** Reference to the exec tool for dynamic description updates */
|
|
24
|
-
private execTool;
|
|
25
23
|
constructor(context: ToolContext);
|
|
26
24
|
/** Register all built-in tools */
|
|
27
25
|
private registerBuiltins;
|
|
28
|
-
/** Register the exec tool with dynamic type declarations for all registered tools */
|
|
29
|
-
private registerExecTool;
|
|
30
|
-
/** Refresh the exec tool's description to include current tool type declarations */
|
|
31
|
-
private refreshExecDescription;
|
|
32
26
|
setMode(mode: 'code' | 'plan' | 'ask'): void;
|
|
33
27
|
/** Register a single tool */
|
|
34
28
|
register(tool: Tool): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAavD,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AA4D5E,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,EAAE,OAAO,CAAA;IACpB,OAAO,EAAE,eAAe,CAAA;IACxB,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAA;IAC7B,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAC1C;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAA;CACvC;AAED;;;GAGG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,KAAK,CAA+B;IAC5C,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,OAAO,CAAqC;gBAExC,OAAO,EAAE,WAAW;IAKhC,kCAAkC;IAClC,OAAO,CAAC,gBAAgB;IA4BxB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,IAAI;IAwB5C,6BAA6B;IAC7B,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAI1B,qDAAqD;IACrD,cAAc,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAWxC,gCAAgC;IAChC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIjC,oCAAoC;IACpC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI1B,2DAA2D;IAC3D,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAKtE,0EAA0E;IAC1E,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI;IAIlD,qCAAqC;IACrC,SAAS,IAAI,MAAM,EAAE;IAIrB,cAAc,IAAI,cAAc,EAAE;IAI5B,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;CA6BpD"}
|
package/dist/tools/registry.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { bashTool } from './bash.js';
|
|
2
2
|
import { createEditTool } from './edit.js';
|
|
3
3
|
import { fmtErr } from './errors.js';
|
|
4
|
-
import { createExecTool, updateExecToolDefinition } from './exec.js';
|
|
5
4
|
import { fetchTool } from './fetch.js';
|
|
6
5
|
import { createFindTool } from './find.js';
|
|
7
6
|
import { createGitTool } from './git.js';
|
|
@@ -41,9 +40,6 @@ function normalizeToolInput(toolName, _definition, input) {
|
|
|
41
40
|
if (toolName === 'write_plan') {
|
|
42
41
|
return { filename: input, content: input };
|
|
43
42
|
}
|
|
44
|
-
if (toolName === 'exec') {
|
|
45
|
-
return { code: input };
|
|
46
|
-
}
|
|
47
43
|
// For tools that take a single string param, guess from the definition
|
|
48
44
|
const params = Object.keys(_definition.parameters);
|
|
49
45
|
if (params.length === 1) {
|
|
@@ -71,15 +67,13 @@ export class ToolRegistry {
|
|
|
71
67
|
tools = new Map();
|
|
72
68
|
context;
|
|
73
69
|
plugins = new Map();
|
|
74
|
-
/** Reference to the exec tool for dynamic description updates */
|
|
75
|
-
execTool = null;
|
|
76
70
|
constructor(context) {
|
|
77
71
|
this.context = context;
|
|
78
72
|
this.registerBuiltins();
|
|
79
73
|
}
|
|
80
74
|
/** Register all built-in tools */
|
|
81
75
|
registerBuiltins() {
|
|
82
|
-
// ask mode: only fetch and search
|
|
76
|
+
// ask mode: only fetch and search
|
|
83
77
|
if (this.context.mode === 'ask') {
|
|
84
78
|
this.register(fetchTool);
|
|
85
79
|
this.register(searchTool);
|
|
@@ -98,25 +92,12 @@ export class ToolRegistry {
|
|
|
98
92
|
this.register(createGitTool(this.context.cwd));
|
|
99
93
|
this.register(createInstallSkillTool(this.context.cwd));
|
|
100
94
|
this.register(createEditTool(this.context.applier, this.context.cwd));
|
|
101
|
-
this.registerExecTool();
|
|
102
95
|
}
|
|
103
96
|
else {
|
|
104
97
|
// Plan mode: read-only investigation + write_plan
|
|
105
98
|
this.register(createWritePlanTool(this.context.cwd, this.context.onPlanWritten));
|
|
106
99
|
}
|
|
107
100
|
}
|
|
108
|
-
/** Register the exec tool with dynamic type declarations for all registered tools */
|
|
109
|
-
registerExecTool() {
|
|
110
|
-
const execTool = createExecTool(() => Array.from(this.tools.values()));
|
|
111
|
-
this.execTool = execTool;
|
|
112
|
-
this.register(execTool);
|
|
113
|
-
}
|
|
114
|
-
/** Refresh the exec tool's description to include current tool type declarations */
|
|
115
|
-
refreshExecDescription() {
|
|
116
|
-
if (this.execTool) {
|
|
117
|
-
updateExecToolDefinition(this.execTool, this.getDefinitions());
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
101
|
setMode(mode) {
|
|
121
102
|
// Update context.mode FIRST so registerBuiltins() and mode-based logic
|
|
122
103
|
// use the NEW mode, not the stale one (fixes bug when switching from
|
|
@@ -125,22 +106,18 @@ export class ToolRegistry {
|
|
|
125
106
|
if (mode === 'code') {
|
|
126
107
|
// Re-register all built-in tools for code mode
|
|
127
108
|
this.tools.clear();
|
|
128
|
-
this.execTool = null;
|
|
129
109
|
this.registerBuiltins();
|
|
130
110
|
}
|
|
131
111
|
else if (mode === 'plan') {
|
|
132
|
-
// Keep existing tools but swap edit/write_plan
|
|
112
|
+
// Keep existing tools but swap edit/write_plan
|
|
133
113
|
if (!this.tools.has('write_plan')) {
|
|
134
114
|
this.register(createWritePlanTool(this.context.cwd, this.context.onPlanWritten));
|
|
135
115
|
}
|
|
136
116
|
this.tools.delete('edit');
|
|
137
|
-
this.tools.delete('exec');
|
|
138
|
-
this.execTool = null;
|
|
139
117
|
}
|
|
140
118
|
else if (mode === 'ask') {
|
|
141
119
|
// Ask mode: only fetch and search
|
|
142
120
|
this.tools.clear();
|
|
143
|
-
this.execTool = null;
|
|
144
121
|
this.register(fetchTool);
|
|
145
122
|
this.register(searchTool);
|
|
146
123
|
}
|
|
@@ -148,10 +125,6 @@ export class ToolRegistry {
|
|
|
148
125
|
/** Register a single tool */
|
|
149
126
|
register(tool) {
|
|
150
127
|
this.tools.set(tool.definition.name, tool);
|
|
151
|
-
// Refresh exec tool description to include the new tool's type declarations
|
|
152
|
-
if (this.execTool && tool.definition.name !== 'exec') {
|
|
153
|
-
this.refreshExecDescription();
|
|
154
|
-
}
|
|
155
128
|
}
|
|
156
129
|
/** Register a tool plugin (lazy creation pattern) */
|
|
157
130
|
registerPlugin(plugin) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sed.d.ts","sourceRoot":"","sources":["../../src/tools/sed.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAGvD,OAAO,KAAK,EAAE,IAAI,EAAc,MAAM,YAAY,CAAA;AAElD,wBAAgB,aAAa,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAmHzE"}
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
import * as fs from 'node:fs';
|
|
2
|
+
import * as path from 'node:path';
|
|
3
|
+
import { computeDiff, renderDiffTerminal } from './edit.js';
|
|
4
|
+
import { fmtErr } from './errors.js';
|
|
5
|
+
export function createSedTool(applier, cwd) {
|
|
6
|
+
return {
|
|
7
|
+
definition: {
|
|
8
|
+
name: 'sed',
|
|
9
|
+
description: `Replace text in a file using JavaScript RegExp pattern matching.
|
|
10
|
+
Use this when the \`edit\` tool's exact match fails due to whitespace, encoding, or invisible character differences.
|
|
11
|
+
|
|
12
|
+
PARAMETERS:
|
|
13
|
+
- file_path (required): Path to the file to edit
|
|
14
|
+
- pattern (required): JavaScript RegExp pattern string (e.g. "foo\\\\d+" — note: double-escape backslashes)
|
|
15
|
+
- replacement (required): Replacement string (supports $1, $2 etc. for capture groups)
|
|
16
|
+
- flags (optional): RegExp flags — "g" (global), "i" (ignore case), "m" (multiline), "s" (dotAll)
|
|
17
|
+
|
|
18
|
+
EXAMPLES:
|
|
19
|
+
- Replace first occurrence of "foo" with "bar": { pattern: "foo", replacement: "bar" }
|
|
20
|
+
- Replace all occurrences: { pattern: "foo", replacement: "bar", flags: "g" }
|
|
21
|
+
- Replace with capture groups: { pattern: "(\\\\w+)\\\\s+(\\\\w+)", replacement: "$2, $1" }
|
|
22
|
+
- Case-insensitive: { pattern: "hello", replacement: "hi", flags: "gi" }`,
|
|
23
|
+
parameters: {
|
|
24
|
+
file_path: {
|
|
25
|
+
type: 'string',
|
|
26
|
+
description: 'Path to the file to edit',
|
|
27
|
+
required: true,
|
|
28
|
+
},
|
|
29
|
+
pattern: {
|
|
30
|
+
type: 'string',
|
|
31
|
+
description: 'JavaScript RegExp pattern string',
|
|
32
|
+
required: true,
|
|
33
|
+
},
|
|
34
|
+
replacement: {
|
|
35
|
+
type: 'string',
|
|
36
|
+
description: 'Replacement string (supports $1, $2 capture group references)',
|
|
37
|
+
required: true,
|
|
38
|
+
},
|
|
39
|
+
flags: {
|
|
40
|
+
type: 'string',
|
|
41
|
+
description: 'RegExp flags: g (global), i (ignore case), m (multiline), s (dotAll)',
|
|
42
|
+
required: false,
|
|
43
|
+
},
|
|
44
|
+
},
|
|
45
|
+
},
|
|
46
|
+
async execute(input) {
|
|
47
|
+
const filePath = input.file_path;
|
|
48
|
+
const pattern = input.pattern;
|
|
49
|
+
const replacement = input.replacement;
|
|
50
|
+
const flags = input.flags || '';
|
|
51
|
+
if (typeof filePath !== 'string' || !filePath) {
|
|
52
|
+
return { success: false, output: '', error: 'file_path is required' };
|
|
53
|
+
}
|
|
54
|
+
if (typeof pattern !== 'string' || !pattern) {
|
|
55
|
+
return { success: false, output: '', error: 'pattern is required' };
|
|
56
|
+
}
|
|
57
|
+
if (typeof replacement !== 'string') {
|
|
58
|
+
return { success: false, output: '', error: 'replacement is required' };
|
|
59
|
+
}
|
|
60
|
+
const resolved = path.resolve(cwd, filePath);
|
|
61
|
+
const relPath = path.relative(cwd, resolved).replace(/\\/g, '/');
|
|
62
|
+
let content;
|
|
63
|
+
try {
|
|
64
|
+
content = fs.readFileSync(resolved, 'utf-8');
|
|
65
|
+
}
|
|
66
|
+
catch {
|
|
67
|
+
return {
|
|
68
|
+
success: false,
|
|
69
|
+
output: '',
|
|
70
|
+
error: `File not found: ${relPath}`,
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
content = content.replace(/\r\n/g, '\n');
|
|
74
|
+
let regex;
|
|
75
|
+
try {
|
|
76
|
+
regex = new RegExp(pattern, flags);
|
|
77
|
+
}
|
|
78
|
+
catch (err) {
|
|
79
|
+
return {
|
|
80
|
+
success: false,
|
|
81
|
+
output: '',
|
|
82
|
+
error: `Invalid regex pattern: ${fmtErr(err)}`,
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
const newContent = content.replace(regex, replacement);
|
|
86
|
+
if (newContent === content) {
|
|
87
|
+
return {
|
|
88
|
+
success: false,
|
|
89
|
+
output: '',
|
|
90
|
+
error: `Pattern not found in file: ${relPath}`,
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
const firstMatchLineNum = findFirstMatchLineNum(content, regex);
|
|
94
|
+
try {
|
|
95
|
+
fs.mkdirSync(path.dirname(resolved), { recursive: true });
|
|
96
|
+
fs.writeFileSync(resolved, newContent, 'utf-8');
|
|
97
|
+
}
|
|
98
|
+
catch (err) {
|
|
99
|
+
return {
|
|
100
|
+
success: false,
|
|
101
|
+
output: '',
|
|
102
|
+
error: `Failed to write ${relPath}: ${fmtErr(err)}`,
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
applier.markRead(resolved);
|
|
106
|
+
return {
|
|
107
|
+
success: true,
|
|
108
|
+
output: ` Edited ${relPath}:\n${renderDiffTerminal(computeDiff(content, newContent, firstMatchLineNum))}`,
|
|
109
|
+
};
|
|
110
|
+
},
|
|
111
|
+
};
|
|
112
|
+
}
|
|
113
|
+
function findFirstMatchLineNum(content, regex) {
|
|
114
|
+
const savedFlags = regex.flags;
|
|
115
|
+
const single = new RegExp(regex.source, savedFlags.replace('g', ''));
|
|
116
|
+
const match = single.exec(content);
|
|
117
|
+
if (!match || typeof match.index !== 'number')
|
|
118
|
+
return 0;
|
|
119
|
+
return content.substring(0, match.index).split('\n').length;
|
|
120
|
+
}
|
|
121
|
+
//# sourceMappingURL=sed.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sed.js","sourceRoot":"","sources":["../../src/tools/sed.ts"],"names":[],"mappings":"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"}
|
package/dist/web/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/web/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/web/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AA2EhD,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmZ5E"}
|
package/dist/web/index.js
CHANGED
|
@@ -7,6 +7,7 @@ import { resetGlobalEventBus } from '../agent/event-bus.js';
|
|
|
7
7
|
import { ensurePromptsDir, loadPromptTemplates } from '../agent/prompt-templates.js';
|
|
8
8
|
import { Session } from '../agent/session.js';
|
|
9
9
|
import { ensureSkillsDir, loadSkills } from '../agent/skills.js';
|
|
10
|
+
import { resetTokenUsage } from '../config/tokens.js';
|
|
10
11
|
import { fmtErr } from '../tools/errors.js';
|
|
11
12
|
import { fetchDeepSeekBalance, isDeepSeekOfficial } from '../tui/balance.js';
|
|
12
13
|
import { listPlans } from '../tui/components.js';
|
|
@@ -133,7 +134,7 @@ export async function startWebUi(config, port) {
|
|
|
133
134
|
},
|
|
134
135
|
};
|
|
135
136
|
// Re-create session with output
|
|
136
|
-
|
|
137
|
+
let sessionWithOutput = (await Session.load(config, output)) || new Session(config, output);
|
|
137
138
|
sessionWithOutput.messages = session.messages;
|
|
138
139
|
sessionWithOutput.totalInputTokens = session.totalInputTokens;
|
|
139
140
|
sessionWithOutput.totalOutputTokens = session.totalOutputTokens;
|
|
@@ -223,7 +224,29 @@ export async function startWebUi(config, port) {
|
|
|
223
224
|
return;
|
|
224
225
|
}
|
|
225
226
|
if (cmd === 'new') {
|
|
227
|
+
// Stop any running agent first
|
|
228
|
+
sessionWithOutput.stop();
|
|
229
|
+
// Close old bridge
|
|
230
|
+
if (bridge)
|
|
231
|
+
bridge.close();
|
|
232
|
+
// Clear persisted state
|
|
226
233
|
Session.clearSavedSession(config.cwd);
|
|
234
|
+
resetTokenUsage(config.cwd);
|
|
235
|
+
resetGlobalEventBus();
|
|
236
|
+
// Create fresh session with empty context
|
|
237
|
+
sessionWithOutput = new Session(config, output);
|
|
238
|
+
sessionWithOutput.onPlanWritten = (display) => {
|
|
239
|
+
ws.send(JSON.stringify({ type: 'plan_written', display }));
|
|
240
|
+
sendPlanData();
|
|
241
|
+
};
|
|
242
|
+
// Create new bridge for the fresh session
|
|
243
|
+
bridge = startSessionBridge(sessionWithOutput, config, (msg) => {
|
|
244
|
+
if (ws.readyState === ws.OPEN) {
|
|
245
|
+
ws.send(JSON.stringify(msg));
|
|
246
|
+
}
|
|
247
|
+
});
|
|
248
|
+
// Reset pending confirmation state
|
|
249
|
+
pendingConfirm = null;
|
|
227
250
|
ws.send(JSON.stringify({ type: 'session_cleared' }));
|
|
228
251
|
ws.send(JSON.stringify({ type: 'done', reason: 'stop' }));
|
|
229
252
|
return;
|
|
@@ -389,11 +412,11 @@ export async function startWebUi(config, port) {
|
|
|
389
412
|
}));
|
|
390
413
|
sendPlanData();
|
|
391
414
|
})();
|
|
392
|
-
// Send full session history (exclude system prompt, strip ANSI from tool results)
|
|
415
|
+
// Send full session history (exclude system prompt, strip ANSI from non-edit tool results)
|
|
393
416
|
const historyMessages = sessionWithOutput.messages
|
|
394
417
|
.filter(m => m.role !== 'system')
|
|
395
418
|
.map(m => {
|
|
396
|
-
if (m.role === 'tool' && typeof m.content === 'string') {
|
|
419
|
+
if (m.role === 'tool' && typeof m.content === 'string' && m.name !== 'edit') {
|
|
397
420
|
return { ...m, content: stripAnsi(m.content) };
|
|
398
421
|
}
|
|
399
422
|
return m;
|