dvalincode 0.22.0 → 0.24.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +103 -35
- package/README.zh-CN.md +86 -30
- package/dist/agent/compact.js +9 -1
- package/dist/agent/compact.js.map +1 -1
- package/dist/agent/loop.d.ts +9 -1
- package/dist/agent/loop.js +58 -14
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/modes.js +7 -0
- package/dist/agent/modes.js.map +1 -1
- package/dist/agent/runner.d.ts +13 -1
- package/dist/agent/runner.js +198 -33
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/session.d.ts +21 -0
- package/dist/agent/session.js +76 -36
- package/dist/agent/session.js.map +1 -1
- package/dist/agent/toolFollowups.d.ts +13 -0
- package/dist/agent/toolFollowups.js +50 -0
- package/dist/agent/toolFollowups.js.map +1 -0
- package/dist/agent/types.d.ts +3 -1
- package/dist/agent/types.js.map +1 -1
- package/dist/audit/log.d.ts +41 -1
- package/dist/audit/log.js.map +1 -1
- package/dist/audit/minimize.js +2 -1
- package/dist/audit/minimize.js.map +1 -1
- package/dist/audit/taps.js +10 -1
- package/dist/audit/taps.js.map +1 -1
- package/dist/cli.js +4 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/agents.d.ts +11 -0
- package/dist/commands/agents.js +223 -0
- package/dist/commands/agents.js.map +1 -0
- package/dist/commands/checkpoint.d.ts +3 -0
- package/dist/commands/checkpoint.js +34 -0
- package/dist/commands/checkpoint.js.map +1 -0
- package/dist/commands/mcpInstall.d.ts +24 -0
- package/dist/commands/mcpInstall.js +62 -17
- package/dist/commands/mcpInstall.js.map +1 -1
- package/dist/commands/provider.js +4 -1
- package/dist/commands/provider.js.map +1 -1
- package/dist/commands/run.d.ts +1 -0
- package/dist/commands/run.js +46 -18
- package/dist/commands/run.js.map +1 -1
- package/dist/commands/security.d.ts +13 -0
- package/dist/commands/security.js +47 -10
- package/dist/commands/security.js.map +1 -1
- package/dist/core/checkpoint.d.ts +41 -0
- package/dist/core/checkpoint.js +159 -0
- package/dist/core/checkpoint.js.map +1 -0
- package/dist/core/context.d.ts +7 -0
- package/dist/core/context.js +1 -0
- package/dist/core/context.js.map +1 -1
- package/dist/core/gitRead.d.ts +20 -0
- package/dist/core/gitRead.js +97 -0
- package/dist/core/gitRead.js.map +1 -0
- package/dist/core/ignorefile.d.ts +2 -0
- package/dist/core/ignorefile.js +8 -0
- package/dist/core/ignorefile.js.map +1 -1
- package/dist/core/policy.d.ts +4 -0
- package/dist/core/policy.js +8 -6
- package/dist/core/policy.js.map +1 -1
- package/dist/core/redactSecrets.d.ts +14 -0
- package/dist/core/redactSecrets.js +35 -0
- package/dist/core/redactSecrets.js.map +1 -0
- package/dist/core/trust.d.ts +5 -0
- package/dist/core/trust.js +12 -0
- package/dist/core/trust.js.map +1 -1
- package/dist/core/webEgress.d.ts +66 -0
- package/dist/core/webEgress.js +281 -0
- package/dist/core/webEgress.js.map +1 -0
- package/dist/dvalinCli.js +2 -0
- package/dist/dvalinCli.js.map +1 -1
- package/dist/evidence/compliance.js +1 -1
- package/dist/evidence/compliance.js.map +1 -1
- package/dist/harness/run.d.ts +4 -0
- package/dist/harness/run.js +20 -15
- package/dist/harness/run.js.map +1 -1
- package/dist/mcp/agents.d.ts +41 -0
- package/dist/mcp/agents.js +129 -0
- package/dist/mcp/agents.js.map +1 -0
- package/dist/mcp/install.d.ts +43 -6
- package/dist/mcp/install.js +104 -1
- package/dist/mcp/install.js.map +1 -1
- package/dist/mcp/register.js +4 -1
- package/dist/mcp/register.js.map +1 -1
- package/dist/mcp/server.d.ts +3 -2
- package/dist/mcp/server.js +33 -9
- package/dist/mcp/server.js.map +1 -1
- package/dist/providers/anthropic.js +16 -1
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/chatImages.d.ts +21 -0
- package/dist/providers/chatImages.js +18 -0
- package/dist/providers/chatImages.js.map +1 -0
- package/dist/providers/egress.js +7 -0
- package/dist/providers/egress.js.map +1 -1
- package/dist/providers/openaiCompatible.js +19 -1
- package/dist/providers/openaiCompatible.js.map +1 -1
- package/dist/providers/retry.js +2 -0
- package/dist/providers/retry.js.map +1 -1
- package/dist/providers/runBudget.d.ts +11 -0
- package/dist/providers/runBudget.js +74 -0
- package/dist/providers/runBudget.js.map +1 -0
- package/dist/providers/trustedBaseUrls.js +1 -1
- package/dist/providers/trustedBaseUrls.js.map +1 -1
- package/dist/providers/types.d.ts +6 -0
- package/dist/remediation/cases.d.ts +1 -0
- package/dist/remediation/cases.js +1 -0
- package/dist/remediation/cases.js.map +1 -1
- package/dist/remediation/codexSecurity.d.ts +54 -0
- package/dist/remediation/codexSecurity.js +366 -0
- package/dist/remediation/codexSecurity.js.map +1 -0
- package/dist/remediation/sarif.d.ts +10 -0
- package/dist/remediation/sarif.js +2 -2
- package/dist/remediation/sarif.js.map +1 -1
- package/dist/remediation/scannerSuite.d.ts +1 -0
- package/dist/remediation/scannerSuite.js +1 -1
- package/dist/remediation/scannerSuite.js.map +1 -1
- package/dist/server/auth.d.ts +33 -0
- package/dist/server/auth.js +53 -0
- package/dist/server/auth.js.map +1 -0
- package/dist/server/configStore.d.ts +10 -0
- package/dist/server/configStore.js +9 -0
- package/dist/server/configStore.js.map +1 -1
- package/dist/server/index.d.ts +5 -0
- package/dist/server/index.js +73 -5
- package/dist/server/index.js.map +1 -1
- package/dist/server/routes/config.js +37 -0
- package/dist/server/routes/config.js.map +1 -1
- package/dist/server/routes/sessions.js +2 -1
- package/dist/server/routes/sessions.js.map +1 -1
- package/dist/server/wsHandler.js +23 -12
- package/dist/server/wsHandler.js.map +1 -1
- package/dist/sessions/journal.d.ts +2 -0
- package/dist/sessions/journal.js.map +1 -1
- package/dist/sessions/store.d.ts +6 -0
- package/dist/sessions/store.js +11 -0
- package/dist/sessions/store.js.map +1 -1
- package/dist/tools/applyPatch.d.ts +13 -0
- package/dist/tools/applyPatch.js +144 -0
- package/dist/tools/applyPatch.js.map +1 -0
- package/dist/tools/askUser.d.ts +3 -0
- package/dist/tools/askUser.js +23 -0
- package/dist/tools/askUser.js.map +1 -0
- package/dist/tools/checkDiagnostics.d.ts +8 -0
- package/dist/tools/checkDiagnostics.js +48 -0
- package/dist/tools/checkDiagnostics.js.map +1 -0
- package/dist/tools/editFile.d.ts +8 -2
- package/dist/tools/editFile.js +95 -26
- package/dist/tools/editFile.js.map +1 -1
- package/dist/tools/gitBlame.d.ts +11 -0
- package/dist/tools/gitBlame.js +43 -0
- package/dist/tools/gitBlame.js.map +1 -0
- package/dist/tools/gitDiff.js +13 -24
- package/dist/tools/gitDiff.js.map +1 -1
- package/dist/tools/gitLog.d.ts +11 -0
- package/dist/tools/gitLog.js +39 -0
- package/dist/tools/gitLog.js.map +1 -0
- package/dist/tools/gitShow.d.ts +11 -0
- package/dist/tools/gitShow.js +41 -0
- package/dist/tools/gitShow.js.map +1 -0
- package/dist/tools/gitStatus.js +2 -5
- package/dist/tools/gitStatus.js.map +1 -1
- package/dist/tools/htmlText.d.ts +19 -0
- package/dist/tools/htmlText.js +104 -0
- package/dist/tools/htmlText.js.map +1 -0
- package/dist/tools/readFile.js +84 -1
- package/dist/tools/readFile.js.map +1 -1
- package/dist/tools/registry.d.ts +2 -1
- package/dist/tools/registry.js +29 -3
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/rollbackRun.d.ts +5 -0
- package/dist/tools/rollbackRun.js +142 -0
- package/dist/tools/rollbackRun.js.map +1 -0
- package/dist/tools/runCheck.js +10 -1
- package/dist/tools/runCheck.js.map +1 -1
- package/dist/tools/searchText.d.ts +10 -0
- package/dist/tools/searchText.js +193 -19
- package/dist/tools/searchText.js.map +1 -1
- package/dist/tools/updatePlan.d.ts +38 -0
- package/dist/tools/updatePlan.js +81 -0
- package/dist/tools/updatePlan.js.map +1 -0
- package/dist/tools/webFetch.d.ts +8 -0
- package/dist/tools/webFetch.js +103 -0
- package/dist/tools/webFetch.js.map +1 -0
- package/dist/tools/webSearch.d.ts +26 -0
- package/dist/tools/webSearch.js +157 -0
- package/dist/tools/webSearch.js.map +1 -0
- package/dist/tools/writeFile.js +4 -1
- package/dist/tools/writeFile.js.map +1 -1
- package/dist/tui/app.js +22 -1
- package/dist/tui/app.js.map +1 -1
- package/dist/tui/render.js +7 -1
- package/dist/tui/render.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
package/dist/sessions/store.js
CHANGED
|
@@ -102,6 +102,17 @@ export async function deleteAllSessions() {
|
|
|
102
102
|
}
|
|
103
103
|
return deleted;
|
|
104
104
|
}
|
|
105
|
+
/**
|
|
106
|
+
* What the session is about, for the session list: the first line of the first
|
|
107
|
+
* thing the user asked. The summary describes only the latest turn, which after
|
|
108
|
+
* a long agent run is an assistant reply such as "## Security Scan Results".
|
|
109
|
+
*/
|
|
110
|
+
export function sessionTitle(session) {
|
|
111
|
+
const first = session.messages.find(m => m.role === 'user' && m.content.trim());
|
|
112
|
+
if (!first)
|
|
113
|
+
return undefined;
|
|
114
|
+
return truncate(first.content.trim().split('\n', 1)[0].trim(), 80);
|
|
115
|
+
}
|
|
105
116
|
/**
|
|
106
117
|
* Generate a short summary of the session's latest turn for cross-session memory.
|
|
107
118
|
* Uses the last assistant response and user message.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../src/sessions/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAGlC,SAAS,UAAU,CAAC,EAAU;IAC5B,kDAAkD;IAClD,MAAM,SAAS,GAAG,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;IACpD,IAAI,SAAS,KAAK,EAAE,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACxE,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAcD,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB,0EAA0E;AAC1E,MAAM,UAAU,WAAW;IACzB,OAAO,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;AAC3F,CAAC;AAED,SAAS,UAAU;IACjB,OAAO,WAAW,EAAE,CAAC;AACvB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;IACzB,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACtC,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAW,EAAE,IAAa;IACtD,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,EAAE,IAAI,UAAU,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;IAC7E,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACrC,OAAO;QACL,EAAE;QACF,SAAS,EAAE,GAAG;QACd,SAAS,EAAE,GAAG;QACd,GAAG;QACH,IAAI;QACJ,QAAQ,EAAE,EAAE;KACb,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,OAAgB;IAChD,OAAO,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC7C,MAAM,GAAG,GAAG,MAAM,gBAAgB,EAAE,CAAC;IACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;IACjD,MAAM,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,EAAU;IAC1C,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;IACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,OAAO,CAAC,CAAC;IAC7C,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAY,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY;IAChC,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;IACzB,IAAI,KAAe,CAAC;IACpB,IAAI,CAAC;QACH,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;YAAE,SAAS;QACtC,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;YACtD,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAY,CAAC,CAAC;QAC7C,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC;IACD,QAAQ,CAAC,IAAI,CACX,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAC5E,CAAC;IACF,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAAU;IAC5C,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;IACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,OAAO,CAAC,CAAC;IAC7C,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACpC,MAAM,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,gBAAgB,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACrC,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;IACzB,IAAI,KAAe,CAAC;IACpB,IAAI,CAAC;QACH,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,CAAC;IACX,CAAC;IAED,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC9D,MAAM,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3C,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAgB;IAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACjE,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3E,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjE,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,KAAK,CAAC,IAAI,CAAC,gBAAgB,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;IACrF,CAAC;IACD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,KAAK,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;IAC7F,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,QAAQ;aACnB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;aACvD,MAAM,CAAC,OAAO,CAAC,CAAC;QACnB,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,KAAK,CAAC,IAAI,CAAC,eAAe,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,QAAQ,CAAC,CAAS,EAAE,GAAW;IACtC,IAAI,CAAC,CAAC,MAAM,IAAI,GAAG;QAAE,OAAO,CAAC,CAAC;IAC9B,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC;AAC/B,CAAC"}
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../src/sessions/store.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import type { Tool } from './types.js';
|
|
3
|
+
declare const schema: z.ZodObject<{
|
|
4
|
+
files: z.ZodArray<z.ZodObject<{
|
|
5
|
+
filePath: z.ZodString;
|
|
6
|
+
oldString: z.ZodString;
|
|
7
|
+
newString: z.ZodString;
|
|
8
|
+
expectedHash: z.ZodOptional<z.ZodString>;
|
|
9
|
+
}, z.core.$strict>>;
|
|
10
|
+
}, z.core.$strict>;
|
|
11
|
+
type Input = z.infer<typeof schema>;
|
|
12
|
+
export declare const applyPatchTool: Tool<Input>;
|
|
13
|
+
export {};
|
|
@@ -0,0 +1,144 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { chmod, lstat, readFile, rename, unlink, writeFile } from 'node:fs/promises';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
import { z } from 'zod';
|
|
5
|
+
import { sha256 } from '../audit/hash.js';
|
|
6
|
+
import { countDiffLines } from '../audit/diffStat.js';
|
|
7
|
+
import { generateDiff, formatDiff } from '../core/diffPreview.js';
|
|
8
|
+
import { isIgnoredPath, loadIgnorePatterns } from '../core/ignorefile.js';
|
|
9
|
+
import { assertNoRedactionWriteBack } from '../core/redactSecrets.js';
|
|
10
|
+
import { resolveInsideWorkspace, resolveRelativeInside, resolveWorkspaceRoot } from '../core/workspace.js';
|
|
11
|
+
const patch = z.object({
|
|
12
|
+
filePath: z.string().min(1),
|
|
13
|
+
oldString: z.string(),
|
|
14
|
+
newString: z.string(),
|
|
15
|
+
expectedHash: z.string().regex(/^[a-f0-9]{64}$/).optional(),
|
|
16
|
+
}).strict();
|
|
17
|
+
const schema = z.object({ files: z.array(patch).min(2).max(20) }).strict();
|
|
18
|
+
export const applyPatchTool = {
|
|
19
|
+
name: 'apply_patch',
|
|
20
|
+
description: 'Apply exact text replacements across multiple existing files. Every file and match is checked before any changes.',
|
|
21
|
+
access: 'write',
|
|
22
|
+
inputSchema: schema,
|
|
23
|
+
policyTargets: input => input.files.map(({ filePath }) => ({ kind: 'path', value: filePath })),
|
|
24
|
+
isUndoable: () => true,
|
|
25
|
+
reverse(_input, result) {
|
|
26
|
+
const files = result.metadata?.originalContent;
|
|
27
|
+
if (!Array.isArray(files))
|
|
28
|
+
return;
|
|
29
|
+
return { toolName: 'apply_patch', input: { files }, description: 'Restore files changed by apply_patch' };
|
|
30
|
+
},
|
|
31
|
+
async run(input, context) {
|
|
32
|
+
const root = await resolveWorkspaceRoot(context.cwd);
|
|
33
|
+
const ignored = await loadIgnorePatterns(root);
|
|
34
|
+
const targets = new Set();
|
|
35
|
+
const changes = [];
|
|
36
|
+
for (const file of input.files) {
|
|
37
|
+
const lexical = resolveRelativeInside(root, file.filePath);
|
|
38
|
+
const target = await resolveInsideWorkspace(root, file.filePath);
|
|
39
|
+
const relative = path.relative(root, target);
|
|
40
|
+
if (target !== lexical || !relative || relative.split(path.sep).join('/') !== file.filePath ||
|
|
41
|
+
relative.split(path.sep).some(part => part.toLowerCase() === '.git') || isIgnoredPath(relative, ignored)) {
|
|
42
|
+
throw new Error(`Patch requires a regular workspace file: ${file.filePath}`);
|
|
43
|
+
}
|
|
44
|
+
const info = await lstat(target);
|
|
45
|
+
if (!info.isFile() || info.nlink !== 1 || info.size > context.maxBytes) {
|
|
46
|
+
throw new Error(`Patch requires a regular file within the size limit: ${file.filePath}`);
|
|
47
|
+
}
|
|
48
|
+
if (targets.has(target))
|
|
49
|
+
throw new Error(`Duplicate patch path: ${file.filePath}`);
|
|
50
|
+
targets.add(target);
|
|
51
|
+
const bytes = await readFile(target);
|
|
52
|
+
const before = bytes.toString('utf8');
|
|
53
|
+
if (bytes.length > context.maxBytes || !Buffer.from(before).equals(bytes) || before.includes('\0')) {
|
|
54
|
+
throw new Error(`Patch requires UTF-8 text within the size limit: ${file.filePath}`);
|
|
55
|
+
}
|
|
56
|
+
const beforeHash = sha256(before);
|
|
57
|
+
if (file.expectedHash && beforeHash !== file.expectedHash)
|
|
58
|
+
throw new Error(`File changed since the patch: ${file.filePath}`);
|
|
59
|
+
// A hash-bound undo replaces the entire file and may restore an empty file.
|
|
60
|
+
let after;
|
|
61
|
+
if (file.expectedHash) {
|
|
62
|
+
if (file.oldString !== before)
|
|
63
|
+
throw new Error(`File content no longer matches: ${file.filePath}`);
|
|
64
|
+
after = file.newString;
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
const index = before.indexOf(file.oldString);
|
|
68
|
+
if (!file.oldString || index < 0 || before.indexOf(file.oldString, index + 1) >= 0) {
|
|
69
|
+
throw new Error(`Expected exactly one match in ${file.filePath}`);
|
|
70
|
+
}
|
|
71
|
+
after = before.slice(0, index) + file.newString + before.slice(index + file.oldString.length);
|
|
72
|
+
}
|
|
73
|
+
if (Buffer.byteLength(after) > context.maxBytes || after.includes('\0'))
|
|
74
|
+
throw new Error(`Patched text exceeds limits: ${file.filePath}`);
|
|
75
|
+
// Checked for every file before any is staged, so the patch stays all or nothing.
|
|
76
|
+
assertNoRedactionWriteBack(before, after, file.filePath);
|
|
77
|
+
const diff = generateDiff(before, after);
|
|
78
|
+
changes.push({ filePath: file.filePath, target, before, after, beforeHash, afterHash: sha256(after), mode: info.mode & 0o777,
|
|
79
|
+
output: formatDiff(diff), ...countDiffLines(diff) });
|
|
80
|
+
}
|
|
81
|
+
const staged = new Map();
|
|
82
|
+
const temporaryFiles = [];
|
|
83
|
+
const committed = [];
|
|
84
|
+
const recoveryFiles = new Set();
|
|
85
|
+
try {
|
|
86
|
+
for (const change of changes) {
|
|
87
|
+
const base = path.join(path.dirname(change.target), `.dvalin-patch-${randomUUID()}`);
|
|
88
|
+
const next = `${base}.next`;
|
|
89
|
+
const backup = `${base}.backup`;
|
|
90
|
+
await writeFile(next, change.after, { flag: 'wx', mode: change.mode });
|
|
91
|
+
temporaryFiles.push(next);
|
|
92
|
+
await chmod(next, change.mode);
|
|
93
|
+
await writeFile(backup, change.before, { flag: 'wx', mode: 0o600 });
|
|
94
|
+
temporaryFiles.push(backup);
|
|
95
|
+
staged.set(change, { next, backup });
|
|
96
|
+
}
|
|
97
|
+
for (const change of changes) {
|
|
98
|
+
if (context.signal?.aborted)
|
|
99
|
+
throw new Error('interrupted');
|
|
100
|
+
const resolved = await resolveInsideWorkspace(root, change.filePath);
|
|
101
|
+
const current = await lstat(resolved);
|
|
102
|
+
if (resolved !== change.target || !current.isFile() || current.nlink !== 1 ||
|
|
103
|
+
(current.mode & 0o777) !== change.mode || sha256(await readFile(resolved)) !== change.beforeHash) {
|
|
104
|
+
throw new Error(`File changed while staging patch: ${change.filePath}`);
|
|
105
|
+
}
|
|
106
|
+
await rename(staged.get(change).next, change.target);
|
|
107
|
+
committed.push(change);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
catch (error) {
|
|
111
|
+
for (const change of committed.reverse()) {
|
|
112
|
+
const { backup } = staged.get(change);
|
|
113
|
+
try {
|
|
114
|
+
const resolved = await resolveInsideWorkspace(root, change.filePath);
|
|
115
|
+
if (resolved !== change.target || sha256(await readFile(resolved, 'utf8')) !== change.afterHash) {
|
|
116
|
+
throw new Error('File changed during patch');
|
|
117
|
+
}
|
|
118
|
+
await chmod(backup, change.mode);
|
|
119
|
+
await rename(backup, change.target);
|
|
120
|
+
}
|
|
121
|
+
catch {
|
|
122
|
+
recoveryFiles.add(backup);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
if (recoveryFiles.size)
|
|
126
|
+
throw new Error(`Patch could not restore all files. Recovery copies: ${[...recoveryFiles].map(file => path.relative(root, file)).join(', ')}`);
|
|
127
|
+
throw error;
|
|
128
|
+
}
|
|
129
|
+
finally {
|
|
130
|
+
await Promise.allSettled(temporaryFiles.filter(file => !recoveryFiles.has(file)).map(file => unlink(file)));
|
|
131
|
+
}
|
|
132
|
+
return {
|
|
133
|
+
title: `Patched ${changes.length} files`,
|
|
134
|
+
output: changes.map(change => `${change.filePath}\n${change.output}`).join('\n\n'),
|
|
135
|
+
metadata: {
|
|
136
|
+
files: changes.map(({ filePath, beforeHash, afterHash, added, removed }) => ({ filePath, beforeHash, afterHash, added, removed })),
|
|
137
|
+
originalContent: changes.map(change => ({
|
|
138
|
+
filePath: change.filePath, oldString: change.after, newString: change.before, expectedHash: change.afterHash,
|
|
139
|
+
})),
|
|
140
|
+
},
|
|
141
|
+
};
|
|
142
|
+
},
|
|
143
|
+
};
|
|
144
|
+
//# sourceMappingURL=applyPatch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"applyPatch.js","sourceRoot":"","sources":["../../src/tools/applyPatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { z } from 'zod';
|
|
3
|
+
export const askUserTool = {
|
|
4
|
+
name: 'ask_user',
|
|
5
|
+
description: 'Ask the user one question with distinct options when a decision is needed to continue.',
|
|
6
|
+
access: 'read',
|
|
7
|
+
inputSchema: z.object({
|
|
8
|
+
question: z.string().trim().min(1).max(500),
|
|
9
|
+
options: z.array(z.string().trim().min(1).max(200)).min(2).max(5)
|
|
10
|
+
.refine(options => new Set(options).size === options.length, 'Use distinct options'),
|
|
11
|
+
}).strict(),
|
|
12
|
+
async run(input, context) {
|
|
13
|
+
if (!context.askUser) {
|
|
14
|
+
context.audit?.append({ type: 'user_question', outcome: 'unavailable', optionCount: input.options.length });
|
|
15
|
+
return { title: 'User question unavailable', output: 'This run cannot ask interactive questions. Include the question in your final response.' };
|
|
16
|
+
}
|
|
17
|
+
const choice = await context.askUser(randomUUID(), input);
|
|
18
|
+
const label = typeof choice === 'number' && Number.isInteger(choice) ? input.options[choice] : undefined;
|
|
19
|
+
context.audit?.append({ type: 'user_question', outcome: label ? 'answered' : 'skipped', optionCount: input.options.length });
|
|
20
|
+
return { title: 'User question', output: label ? `The user selected option ${choice + 1}: ${label}` : 'The user skipped the question.' };
|
|
21
|
+
},
|
|
22
|
+
};
|
|
23
|
+
//# sourceMappingURL=askUser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"askUser.js","sourceRoot":"","sources":["../../src/tools/askUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,MAAM,CAAC,MAAM,WAAW,GAAuB;IAC7C,IAAI,EAAE,UAAU;IAChB,WAAW,EAAE,wFAAwF;IACrG,MAAM,EAAE,MAAM;IACd,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC;QACpB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;QAC3C,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;aAC9D,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,MAAM,EAAE,sBAAsB,CAAC;KACvF,CAAC,CAAC,MAAM,EAAE;IACX,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO;QACtB,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACrB,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;YAC5G,OAAO,EAAE,KAAK,EAAE,2BAA2B,EAAE,MAAM,EAAE,yFAAyF,EAAE,CAAC;QACnJ,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,KAAK,CAAC,CAAC;QAC1D,MAAM,KAAK,GAAG,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACzG,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAC7H,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,4BAA4B,MAAO,GAAG,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,gCAAgC,EAAE,CAAC;IAC5I,CAAC;CACF,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export type CheckDiagnostic = {
|
|
2
|
+
file: string;
|
|
3
|
+
line: number;
|
|
4
|
+
column?: number;
|
|
5
|
+
message: string;
|
|
6
|
+
};
|
|
7
|
+
/** Parse the common machine-readable location lines without inferring test success. */
|
|
8
|
+
export declare function parseCheckDiagnostics(output: string, cwd: string): CheckDiagnostic[];
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import path from 'node:path';
|
|
2
|
+
/** Parse the common machine-readable location lines without inferring test success. */
|
|
3
|
+
export function parseCheckDiagnostics(output, cwd) {
|
|
4
|
+
const diagnostics = [];
|
|
5
|
+
const seen = new Set();
|
|
6
|
+
const clean = output.replace(/\x1b\[[0-?]*[ -/]*[@-~]/g, '');
|
|
7
|
+
let failure;
|
|
8
|
+
let lintFile;
|
|
9
|
+
for (const line of clean.split(/\r?\n/)) {
|
|
10
|
+
const trimmed = line.trim();
|
|
11
|
+
const failureLine = /^(?:FAIL(?:ED)?\s+|not ok\s+\d+\s*-\s*|(?:AssertionError|TypeError|ReferenceError|Error):\s*)(.+)$/.exec(trimmed);
|
|
12
|
+
if (failureLine)
|
|
13
|
+
failure = failureLine[1].slice(0, 500);
|
|
14
|
+
if (/^(?:[A-Za-z]:)?[/\\].+\.[\w-]+$/.test(trimmed))
|
|
15
|
+
lintFile = trimmed;
|
|
16
|
+
if (!trimmed)
|
|
17
|
+
lintFile = undefined;
|
|
18
|
+
const lint = lintFile ? /^(\d+):(\d+)\s+(?:error|warning)\s+(.+)$/.exec(trimmed) : null;
|
|
19
|
+
const tsc = /^(.+?)\((\d+),(\d+)\):\s*(?:error|warning)\s+(.+)$/.exec(trimmed);
|
|
20
|
+
const location = /^((?:[A-Za-z]:)?[^:()]+?\.[\w-]+):(\d+)(?::(\d+))?:\s*(?:E\s+)?(\S.*)$/.exec(trimmed);
|
|
21
|
+
const frame = /^(?:❯|at)\s+(?:.*?\s+\()?((?:[A-Za-z]:)?[^:()]+?\.[\w-]+):(\d+):(\d+)\)?$/.exec(trimmed);
|
|
22
|
+
const match = tsc ?? location ?? frame ?? (lint ? [lint[0], lintFile, lint[1], lint[2], lint[3]] : null);
|
|
23
|
+
if (!match)
|
|
24
|
+
continue;
|
|
25
|
+
const file = path.relative(cwd, path.resolve(cwd, match[1]));
|
|
26
|
+
if (!file || file === '..' || file.startsWith(`..${path.sep}`) || path.isAbsolute(file))
|
|
27
|
+
continue;
|
|
28
|
+
const lineNumber = Number(match[2]);
|
|
29
|
+
const column = match[3] ? Number(match[3]) : undefined;
|
|
30
|
+
if (!Number.isSafeInteger(lineNumber) || lineNumber < 1 || (column !== undefined && (!Number.isSafeInteger(column) || column < 1)))
|
|
31
|
+
continue;
|
|
32
|
+
const diagnostic = {
|
|
33
|
+
file: file.split(path.sep).join('/'),
|
|
34
|
+
line: lineNumber,
|
|
35
|
+
...(column === undefined ? {} : { column }),
|
|
36
|
+
message: frame ? (failure ?? 'Failure reported at this location') : match[4].slice(0, 500),
|
|
37
|
+
};
|
|
38
|
+
const key = JSON.stringify(diagnostic);
|
|
39
|
+
if (seen.has(key))
|
|
40
|
+
continue;
|
|
41
|
+
seen.add(key);
|
|
42
|
+
diagnostics.push(diagnostic);
|
|
43
|
+
if (diagnostics.length >= 50)
|
|
44
|
+
break;
|
|
45
|
+
}
|
|
46
|
+
return diagnostics;
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=checkDiagnostics.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"checkDiagnostics.js","sourceRoot":"","sources":["../../src/tools/checkDiagnostics.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/editFile.d.ts
CHANGED
|
@@ -2,8 +2,14 @@ import { z } from 'zod';
|
|
|
2
2
|
import type { Tool } from './types.js';
|
|
3
3
|
declare const inputSchema: z.ZodObject<{
|
|
4
4
|
filePath: z.ZodString;
|
|
5
|
-
oldString: z.ZodString
|
|
6
|
-
newString: z.ZodString
|
|
5
|
+
oldString: z.ZodOptional<z.ZodString>;
|
|
6
|
+
newString: z.ZodOptional<z.ZodString>;
|
|
7
|
+
replaceAll: z.ZodOptional<z.ZodBoolean>;
|
|
8
|
+
edits: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
9
|
+
oldString: z.ZodString;
|
|
10
|
+
newString: z.ZodString;
|
|
11
|
+
replaceAll: z.ZodOptional<z.ZodBoolean>;
|
|
12
|
+
}, z.core.$strict>>>;
|
|
7
13
|
}, z.core.$strict>;
|
|
8
14
|
type Input = z.infer<typeof inputSchema>;
|
|
9
15
|
export declare const editFileTool: Tool<Input>;
|
package/dist/tools/editFile.js
CHANGED
|
@@ -1,56 +1,89 @@
|
|
|
1
1
|
import { readFile, writeFile } from 'node:fs/promises';
|
|
2
2
|
import { z } from 'zod';
|
|
3
3
|
import { generateDiff, formatDiff } from '../core/diffPreview.js';
|
|
4
|
+
import { assertNoRedactionWriteBack } from '../core/redactSecrets.js';
|
|
4
5
|
import { resolveInsideWorkspace } from '../core/workspace.js';
|
|
5
6
|
import { sha256 } from '../audit/hash.js';
|
|
6
7
|
import { countDiffLines } from '../audit/diffStat.js';
|
|
8
|
+
const editSchema = z
|
|
9
|
+
.object({
|
|
10
|
+
oldString: z.string().describe('Exact text to replace. Must occur exactly once unless replaceAll is set.'),
|
|
11
|
+
newString: z.string().describe('Replacement text.'),
|
|
12
|
+
replaceAll: z.boolean().optional().describe('Replace every occurrence of oldString.'),
|
|
13
|
+
})
|
|
14
|
+
.strict();
|
|
7
15
|
const inputSchema = z
|
|
8
16
|
.object({
|
|
9
17
|
filePath: z.string().min(1),
|
|
10
|
-
oldString: z.string().describe('Exact text to replace; must occur exactly once
|
|
11
|
-
newString: z.string().describe('Replacement text'),
|
|
18
|
+
oldString: z.string().optional().describe('Exact text to replace; must occur exactly once unless replaceAll is set. Omit when using edits.'),
|
|
19
|
+
newString: z.string().optional().describe('Replacement text. Omit when using edits.'),
|
|
20
|
+
replaceAll: z.boolean().optional().describe('Replace every occurrence of oldString, e.g. to rename a variable throughout the file.'),
|
|
21
|
+
edits: z
|
|
22
|
+
.array(editSchema)
|
|
23
|
+
.min(1)
|
|
24
|
+
.max(100)
|
|
25
|
+
.optional()
|
|
26
|
+
.describe('Several replacements in one file, applied in order and all or nothing. Use instead of oldString/newString.'),
|
|
12
27
|
})
|
|
13
|
-
.strict()
|
|
28
|
+
.strict()
|
|
29
|
+
.superRefine((input, ctx) => {
|
|
30
|
+
const single = input.oldString !== undefined || input.newString !== undefined || input.replaceAll !== undefined;
|
|
31
|
+
if (input.edits && single) {
|
|
32
|
+
ctx.addIssue({ code: 'custom', message: 'Use either edits or oldString/newString, not both.' });
|
|
33
|
+
}
|
|
34
|
+
else if (!input.edits && (input.oldString === undefined || input.newString === undefined)) {
|
|
35
|
+
ctx.addIssue({ code: 'custom', message: 'Provide oldString and newString, or an edits list.' });
|
|
36
|
+
}
|
|
37
|
+
});
|
|
14
38
|
export const editFileTool = {
|
|
15
39
|
name: 'edit_file',
|
|
16
|
-
description: 'Replace exact text in a file. Reports a diff of the change.',
|
|
40
|
+
description: 'Replace exact text in a file: one replacement (oldString/newString), every occurrence (replaceAll), or several replacements at once (edits). Reports a diff of the change.',
|
|
17
41
|
access: 'write',
|
|
18
42
|
inputSchema,
|
|
19
43
|
isConcurrencySafe: () => false,
|
|
20
44
|
policyTargets: input => [{ kind: 'path', value: input.filePath }],
|
|
21
45
|
isUndoable: () => true,
|
|
22
|
-
reverse(input,
|
|
46
|
+
reverse(input, result) {
|
|
47
|
+
// Batches and replaceAll keep the original file, because swapping the strings
|
|
48
|
+
// back would also rewrite text that matched newString before the edit.
|
|
49
|
+
const originalContent = result.metadata?.originalContent;
|
|
50
|
+
if (typeof originalContent === 'string') {
|
|
51
|
+
return {
|
|
52
|
+
toolName: 'write_file',
|
|
53
|
+
input: { filePath: input.filePath, content: originalContent },
|
|
54
|
+
description: `Undo edit_file: restore "${input.filePath}" as it was before the edit`,
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
const oldString = input.oldString ?? '';
|
|
58
|
+
const newString = input.newString ?? '';
|
|
23
59
|
return {
|
|
24
60
|
toolName: 'edit_file',
|
|
25
61
|
input: {
|
|
26
62
|
filePath: input.filePath,
|
|
27
|
-
oldString:
|
|
28
|
-
newString:
|
|
63
|
+
oldString: newString,
|
|
64
|
+
newString: oldString,
|
|
29
65
|
},
|
|
30
|
-
description: `Undo edit_file: revert "${input.filePath}" — swap back "${
|
|
66
|
+
description: `Undo edit_file: revert "${input.filePath}" — swap back "${newString.slice(0, 40)}…" → "${oldString.slice(0, 40)}…"`,
|
|
31
67
|
};
|
|
32
68
|
},
|
|
33
69
|
async run(input, context) {
|
|
34
70
|
const filePath = await resolveInsideWorkspace(context.cwd, input.filePath);
|
|
35
71
|
const existing = await readFile(filePath, 'utf8');
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
}
|
|
43
|
-
const before = input.oldString.length > 60
|
|
44
|
-
? input.oldString.slice(0, 60) + '…'
|
|
45
|
-
: input.oldString;
|
|
46
|
-
const occurrences = existing.split(input.oldString).length - 1;
|
|
47
|
-
if (occurrences > 1) {
|
|
48
|
-
throw new Error(`oldString matches ${occurrences} places in ${input.filePath}; include enough surrounding lines to match exactly one.`);
|
|
49
|
-
}
|
|
50
|
-
// Not String.prototype.replace: it would expand `$$`, `$&` and `$'` in newString.
|
|
51
|
-
const updated = existing.slice(0, idx) + input.newString + existing.slice(idx + input.oldString.length);
|
|
72
|
+
const batch = input.edits !== undefined;
|
|
73
|
+
const edits = input.edits ?? [
|
|
74
|
+
{ oldString: input.oldString ?? '', newString: input.newString ?? '', replaceAll: input.replaceAll },
|
|
75
|
+
];
|
|
76
|
+
const { updated, replacements } = applyEdits(existing, edits, input.filePath);
|
|
77
|
+
assertNoRedactionWriteBack(existing, updated, input.filePath);
|
|
52
78
|
const diff = generateDiff(existing, updated);
|
|
53
|
-
const
|
|
79
|
+
const first = edits[0].oldString;
|
|
80
|
+
const before = first.length > 60 ? first.slice(0, 60) + '…' : first;
|
|
81
|
+
const summary = batch
|
|
82
|
+
? `Applied ${edits.length} edit${edits.length === 1 ? '' : 's'} (${replacements} replacement${replacements === 1 ? '' : 's'})`
|
|
83
|
+
: replacements > 1
|
|
84
|
+
? `Replaced ${replacements} occurrences of "${before}"`
|
|
85
|
+
: `Replaced: "${before}"`;
|
|
86
|
+
const output = [summary, '', formatDiff(diff)].join('\n');
|
|
54
87
|
await writeFile(filePath, updated, 'utf8');
|
|
55
88
|
const stat = countDiffLines(diff);
|
|
56
89
|
return {
|
|
@@ -60,14 +93,50 @@ export const editFileTool = {
|
|
|
60
93
|
path: input.filePath,
|
|
61
94
|
bytesBefore: Buffer.byteLength(existing, 'utf8'),
|
|
62
95
|
bytesAfter: Buffer.byteLength(updated, 'utf8'),
|
|
63
|
-
occurrences,
|
|
96
|
+
occurrences: replacements,
|
|
97
|
+
edits: edits.length,
|
|
64
98
|
diff,
|
|
65
99
|
added: stat.added,
|
|
66
100
|
removed: stat.removed,
|
|
67
101
|
beforeHash: sha256(existing),
|
|
68
102
|
afterHash: sha256(updated),
|
|
103
|
+
// Kept for undo; stripped before WebSocket send.
|
|
104
|
+
...(batch || input.replaceAll ? { originalContent: existing } : {}),
|
|
69
105
|
},
|
|
70
106
|
};
|
|
71
107
|
},
|
|
72
108
|
};
|
|
109
|
+
/**
|
|
110
|
+
* Apply `edits` in order to `content`. Each edit sees the result of the ones
|
|
111
|
+
* before it, and any failure throws before anything is written.
|
|
112
|
+
*/
|
|
113
|
+
function applyEdits(content, edits, filePath) {
|
|
114
|
+
let updated = content;
|
|
115
|
+
let replacements = 0;
|
|
116
|
+
edits.forEach((edit, index) => {
|
|
117
|
+
const label = edits.length > 1 ? `Edit ${index + 1} of ${edits.length}: ` : '';
|
|
118
|
+
if (!edit.oldString) {
|
|
119
|
+
throw new Error(`${label}oldString must not be empty; use write_file to replace a whole file.`);
|
|
120
|
+
}
|
|
121
|
+
const occurrences = updated.split(edit.oldString).length - 1;
|
|
122
|
+
if (occurrences === 0) {
|
|
123
|
+
const after = index > 0 ? ' (after the earlier edits were applied)' : '';
|
|
124
|
+
throw new Error(`${label}Could not find oldString in ${filePath}${after}`);
|
|
125
|
+
}
|
|
126
|
+
if (occurrences > 1 && !edit.replaceAll) {
|
|
127
|
+
throw new Error(`${label}oldString matches ${occurrences} places in ${filePath}; include enough surrounding lines to match exactly one, or set replaceAll.`);
|
|
128
|
+
}
|
|
129
|
+
if (edit.replaceAll) {
|
|
130
|
+
updated = updated.split(edit.oldString).join(edit.newString);
|
|
131
|
+
replacements += occurrences;
|
|
132
|
+
}
|
|
133
|
+
else {
|
|
134
|
+
// Not String.prototype.replace: it would expand `$$`, `$&` and `$'` in newString.
|
|
135
|
+
const idx = updated.indexOf(edit.oldString);
|
|
136
|
+
updated = updated.slice(0, idx) + edit.newString + updated.slice(idx + edit.oldString.length);
|
|
137
|
+
replacements += 1;
|
|
138
|
+
}
|
|
139
|
+
});
|
|
140
|
+
return { updated, replacements };
|
|
141
|
+
}
|
|
73
142
|
//# sourceMappingURL=editFile.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editFile.js","sourceRoot":"","sources":["../../src/tools/editFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,MAAM,WAAW,GAAG,CAAC;KAClB,MAAM,CAAC;IACN,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"editFile.js","sourceRoot":"","sources":["../../src/tools/editFile.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import type { Tool } from './types.js';
|
|
3
|
+
declare const inputSchema: z.ZodObject<{
|
|
4
|
+
filePath: z.ZodString;
|
|
5
|
+
startLine: z.ZodDefault<z.ZodNumber>;
|
|
6
|
+
endLine: z.ZodOptional<z.ZodNumber>;
|
|
7
|
+
ref: z.ZodOptional<z.ZodString>;
|
|
8
|
+
}, z.core.$strict>;
|
|
9
|
+
type Input = z.infer<typeof inputSchema>;
|
|
10
|
+
export declare const gitBlameTool: Tool<Input>;
|
|
11
|
+
export {};
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import { assertRevision, gitRead, workspaceGitPath } from '../core/gitRead.js';
|
|
3
|
+
import { loadIgnorePatterns } from '../core/ignorefile.js';
|
|
4
|
+
const MAX_LINES = 500;
|
|
5
|
+
const inputSchema = z
|
|
6
|
+
.object({
|
|
7
|
+
filePath: z.string().min(1),
|
|
8
|
+
startLine: z.number().int().positive().default(1),
|
|
9
|
+
endLine: z.number().int().positive().optional().describe('Last line to include (default: 200 lines from startLine).'),
|
|
10
|
+
ref: z.string().min(1).max(200).optional().describe('Blame the file as of this commit (default: the working tree).'),
|
|
11
|
+
})
|
|
12
|
+
.strict();
|
|
13
|
+
export const gitBlameTool = {
|
|
14
|
+
name: 'git_blame',
|
|
15
|
+
description: 'Show which commit, author, and date last changed each line of a file, for a range of up to 500 lines. Use it to find the commit behind a line, then git_show to read it.',
|
|
16
|
+
access: 'read',
|
|
17
|
+
inputSchema,
|
|
18
|
+
isConcurrencySafe: () => true,
|
|
19
|
+
isUndoable: () => false,
|
|
20
|
+
policyTargets: input => [{ kind: 'path', value: input.filePath }],
|
|
21
|
+
async run(input, context) {
|
|
22
|
+
const endLine = input.endLine ?? input.startLine + 199;
|
|
23
|
+
if (endLine < input.startLine)
|
|
24
|
+
throw new Error('endLine must not be before startLine.');
|
|
25
|
+
if (endLine - input.startLine + 1 > MAX_LINES)
|
|
26
|
+
throw new Error(`Blame at most ${MAX_LINES} lines at a time.`);
|
|
27
|
+
const patterns = await loadIgnorePatterns(context.cwd);
|
|
28
|
+
const relative = await workspaceGitPath(context.cwd, input.filePath, patterns);
|
|
29
|
+
// blame takes the revision before "--" and does not honor --end-of-options;
|
|
30
|
+
// assertRevision has already refused anything that starts with a dash.
|
|
31
|
+
const args = ['blame', '--no-textconv', '--date=short', '-L', `${input.startLine},${endLine}`];
|
|
32
|
+
if (input.ref)
|
|
33
|
+
args.push(assertRevision(input.ref));
|
|
34
|
+
args.push('--', relative);
|
|
35
|
+
const { stdout, truncated } = await gitRead(args, context.cwd, 128_000);
|
|
36
|
+
return {
|
|
37
|
+
title: `git blame ${input.filePath}`,
|
|
38
|
+
output: stdout.trimEnd() + (truncated ? '\n[output truncated; blame a smaller range]' : ''),
|
|
39
|
+
metadata: { filePath: input.filePath, startLine: input.startLine, endLine, ref: input.ref },
|
|
40
|
+
};
|
|
41
|
+
},
|
|
42
|
+
};
|
|
43
|
+
//# sourceMappingURL=gitBlame.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gitBlame.js","sourceRoot":"","sources":["../../src/tools/gitBlame.ts"],"names":[],"mappings":"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"}
|