chad-code 1.3.1
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/AGENTS.md +27 -0
- package/Dockerfile +18 -0
- package/README.md +15 -0
- package/README.npm.md +64 -0
- package/bin/chad-code +84 -0
- package/bunfig.toml +7 -0
- package/eslint.config.js +29 -0
- package/package.json +107 -0
- package/parsers-config.ts +253 -0
- package/script/build.ts +167 -0
- package/script/postinstall.mjs +122 -0
- package/script/publish-registries.ts +187 -0
- package/script/publish.ts +93 -0
- package/script/schema.ts +47 -0
- package/src/acp/README.md +164 -0
- package/src/acp/agent.ts +1086 -0
- package/src/acp/session.ts +101 -0
- package/src/acp/types.ts +22 -0
- package/src/agent/agent.ts +253 -0
- package/src/agent/generate.txt +75 -0
- package/src/agent/prompt/compaction.txt +12 -0
- package/src/agent/prompt/explore.txt +18 -0
- package/src/agent/prompt/summary.txt +11 -0
- package/src/agent/prompt/title.txt +36 -0
- package/src/auth/index.ts +70 -0
- package/src/bun/index.ts +130 -0
- package/src/bus/bus-event.ts +43 -0
- package/src/bus/global.ts +10 -0
- package/src/bus/index.ts +105 -0
- package/src/cli/bootstrap.ts +17 -0
- package/src/cli/cmd/acp.ts +69 -0
- package/src/cli/cmd/agent.ts +257 -0
- package/src/cli/cmd/auth.ts +132 -0
- package/src/cli/cmd/cmd.ts +7 -0
- package/src/cli/cmd/debug/agent.ts +28 -0
- package/src/cli/cmd/debug/config.ts +15 -0
- package/src/cli/cmd/debug/file.ts +91 -0
- package/src/cli/cmd/debug/index.ts +45 -0
- package/src/cli/cmd/debug/lsp.ts +48 -0
- package/src/cli/cmd/debug/ripgrep.ts +83 -0
- package/src/cli/cmd/debug/scrap.ts +15 -0
- package/src/cli/cmd/debug/skill.ts +15 -0
- package/src/cli/cmd/debug/snapshot.ts +48 -0
- package/src/cli/cmd/export.ts +88 -0
- package/src/cli/cmd/generate.ts +38 -0
- package/src/cli/cmd/github.ts +32 -0
- package/src/cli/cmd/import.ts +98 -0
- package/src/cli/cmd/mcp.ts +670 -0
- package/src/cli/cmd/models.ts +42 -0
- package/src/cli/cmd/pr.ts +112 -0
- package/src/cli/cmd/run.ts +374 -0
- package/src/cli/cmd/serve.ts +16 -0
- package/src/cli/cmd/session.ts +135 -0
- package/src/cli/cmd/stats.ts +402 -0
- package/src/cli/cmd/tui/app.tsx +705 -0
- package/src/cli/cmd/tui/attach.ts +32 -0
- package/src/cli/cmd/tui/component/border.tsx +21 -0
- package/src/cli/cmd/tui/component/dialog-agent.tsx +31 -0
- package/src/cli/cmd/tui/component/dialog-command.tsx +124 -0
- package/src/cli/cmd/tui/component/dialog-mcp.tsx +86 -0
- package/src/cli/cmd/tui/component/dialog-model.tsx +232 -0
- package/src/cli/cmd/tui/component/dialog-provider.tsx +228 -0
- package/src/cli/cmd/tui/component/dialog-session-list.tsx +115 -0
- package/src/cli/cmd/tui/component/dialog-session-rename.tsx +31 -0
- package/src/cli/cmd/tui/component/dialog-stash.tsx +86 -0
- package/src/cli/cmd/tui/component/dialog-status.tsx +162 -0
- package/src/cli/cmd/tui/component/dialog-tag.tsx +44 -0
- package/src/cli/cmd/tui/component/dialog-theme-list.tsx +50 -0
- package/src/cli/cmd/tui/component/did-you-know.tsx +85 -0
- package/src/cli/cmd/tui/component/logo.tsx +43 -0
- package/src/cli/cmd/tui/component/prompt/autocomplete.tsx +654 -0
- package/src/cli/cmd/tui/component/prompt/history.tsx +108 -0
- package/src/cli/cmd/tui/component/prompt/index.tsx +1078 -0
- package/src/cli/cmd/tui/component/prompt/stash.tsx +101 -0
- package/src/cli/cmd/tui/component/textarea-keybindings.ts +73 -0
- package/src/cli/cmd/tui/component/tips.ts +92 -0
- package/src/cli/cmd/tui/component/todo-item.tsx +32 -0
- package/src/cli/cmd/tui/context/args.tsx +14 -0
- package/src/cli/cmd/tui/context/directory.ts +13 -0
- package/src/cli/cmd/tui/context/exit.tsx +23 -0
- package/src/cli/cmd/tui/context/helper.tsx +25 -0
- package/src/cli/cmd/tui/context/keybind.tsx +101 -0
- package/src/cli/cmd/tui/context/kv.tsx +49 -0
- package/src/cli/cmd/tui/context/local.tsx +392 -0
- package/src/cli/cmd/tui/context/prompt.tsx +18 -0
- package/src/cli/cmd/tui/context/route.tsx +46 -0
- package/src/cli/cmd/tui/context/sdk.tsx +75 -0
- package/src/cli/cmd/tui/context/sync.tsx +384 -0
- package/src/cli/cmd/tui/context/theme/aura.json +69 -0
- package/src/cli/cmd/tui/context/theme/ayu.json +80 -0
- package/src/cli/cmd/tui/context/theme/catppuccin-frappe.json +233 -0
- package/src/cli/cmd/tui/context/theme/catppuccin-macchiato.json +233 -0
- package/src/cli/cmd/tui/context/theme/catppuccin.json +112 -0
- package/src/cli/cmd/tui/context/theme/chad.json +245 -0
- package/src/cli/cmd/tui/context/theme/cobalt2.json +228 -0
- package/src/cli/cmd/tui/context/theme/cursor.json +249 -0
- package/src/cli/cmd/tui/context/theme/dracula.json +219 -0
- package/src/cli/cmd/tui/context/theme/everforest.json +241 -0
- package/src/cli/cmd/tui/context/theme/flexoki.json +237 -0
- package/src/cli/cmd/tui/context/theme/github.json +233 -0
- package/src/cli/cmd/tui/context/theme/gruvbox.json +95 -0
- package/src/cli/cmd/tui/context/theme/kanagawa.json +77 -0
- package/src/cli/cmd/tui/context/theme/lucent-orng.json +227 -0
- package/src/cli/cmd/tui/context/theme/material.json +235 -0
- package/src/cli/cmd/tui/context/theme/matrix.json +77 -0
- package/src/cli/cmd/tui/context/theme/mercury.json +252 -0
- package/src/cli/cmd/tui/context/theme/monokai.json +221 -0
- package/src/cli/cmd/tui/context/theme/nightowl.json +221 -0
- package/src/cli/cmd/tui/context/theme/nord.json +223 -0
- package/src/cli/cmd/tui/context/theme/one-dark.json +84 -0
- package/src/cli/cmd/tui/context/theme/orng.json +245 -0
- package/src/cli/cmd/tui/context/theme/osaka-jade.json +93 -0
- package/src/cli/cmd/tui/context/theme/palenight.json +222 -0
- package/src/cli/cmd/tui/context/theme/rosepine.json +234 -0
- package/src/cli/cmd/tui/context/theme/solarized.json +223 -0
- package/src/cli/cmd/tui/context/theme/synthwave84.json +226 -0
- package/src/cli/cmd/tui/context/theme/tokyonight.json +243 -0
- package/src/cli/cmd/tui/context/theme/vercel.json +245 -0
- package/src/cli/cmd/tui/context/theme/vesper.json +218 -0
- package/src/cli/cmd/tui/context/theme/zenburn.json +223 -0
- package/src/cli/cmd/tui/context/theme.tsx +1137 -0
- package/src/cli/cmd/tui/event.ts +46 -0
- package/src/cli/cmd/tui/routes/home.tsx +138 -0
- package/src/cli/cmd/tui/routes/session/dialog-fork-from-timeline.tsx +64 -0
- package/src/cli/cmd/tui/routes/session/dialog-message.tsx +109 -0
- package/src/cli/cmd/tui/routes/session/dialog-subagent.tsx +26 -0
- package/src/cli/cmd/tui/routes/session/dialog-timeline.tsx +47 -0
- package/src/cli/cmd/tui/routes/session/footer.tsx +88 -0
- package/src/cli/cmd/tui/routes/session/header.tsx +125 -0
- package/src/cli/cmd/tui/routes/session/index.tsx +1814 -0
- package/src/cli/cmd/tui/routes/session/permission.tsx +416 -0
- package/src/cli/cmd/tui/routes/session/sidebar.tsx +318 -0
- package/src/cli/cmd/tui/spawn.ts +48 -0
- package/src/cli/cmd/tui/thread.ts +111 -0
- package/src/cli/cmd/tui/ui/dialog-alert.tsx +57 -0
- package/src/cli/cmd/tui/ui/dialog-confirm.tsx +83 -0
- package/src/cli/cmd/tui/ui/dialog-export-options.tsx +204 -0
- package/src/cli/cmd/tui/ui/dialog-help.tsx +38 -0
- package/src/cli/cmd/tui/ui/dialog-prompt.tsx +77 -0
- package/src/cli/cmd/tui/ui/dialog-select.tsx +345 -0
- package/src/cli/cmd/tui/ui/dialog.tsx +171 -0
- package/src/cli/cmd/tui/ui/link.tsx +28 -0
- package/src/cli/cmd/tui/ui/spinner.ts +368 -0
- package/src/cli/cmd/tui/ui/toast.tsx +100 -0
- package/src/cli/cmd/tui/util/clipboard.ts +127 -0
- package/src/cli/cmd/tui/util/editor.ts +32 -0
- package/src/cli/cmd/tui/util/signal.ts +7 -0
- package/src/cli/cmd/tui/util/terminal.ts +114 -0
- package/src/cli/cmd/tui/util/transcript.ts +98 -0
- package/src/cli/cmd/tui/worker.ts +68 -0
- package/src/cli/cmd/uninstall.ts +344 -0
- package/src/cli/cmd/upgrade.ts +67 -0
- package/src/cli/cmd/web.ts +73 -0
- package/src/cli/error.ts +56 -0
- package/src/cli/network.ts +53 -0
- package/src/cli/ui.ts +87 -0
- package/src/cli/upgrade.ts +25 -0
- package/src/command/index.ts +131 -0
- package/src/command/template/initialize.txt +10 -0
- package/src/command/template/review.txt +97 -0
- package/src/config/config.ts +1124 -0
- package/src/config/markdown.ts +41 -0
- package/src/env/index.ts +26 -0
- package/src/file/ignore.ts +83 -0
- package/src/file/index.ts +411 -0
- package/src/file/ripgrep.ts +402 -0
- package/src/file/time.ts +64 -0
- package/src/file/watcher.ts +117 -0
- package/src/flag/flag.ts +52 -0
- package/src/format/formatter.ts +359 -0
- package/src/format/index.ts +137 -0
- package/src/global/index.ts +55 -0
- package/src/id/id.ts +73 -0
- package/src/ide/index.ts +77 -0
- package/src/index.ts +159 -0
- package/src/installation/index.ts +198 -0
- package/src/lsp/client.ts +252 -0
- package/src/lsp/index.ts +485 -0
- package/src/lsp/language.ts +119 -0
- package/src/lsp/server.ts +2023 -0
- package/src/mcp/auth.ts +135 -0
- package/src/mcp/index.ts +874 -0
- package/src/mcp/oauth-callback.ts +200 -0
- package/src/mcp/oauth-provider.ts +154 -0
- package/src/patch/index.ts +622 -0
- package/src/permission/arity.ts +163 -0
- package/src/permission/index.ts +210 -0
- package/src/permission/next.ts +268 -0
- package/src/plugin/index.ts +106 -0
- package/src/project/bootstrap.ts +31 -0
- package/src/project/instance.ts +78 -0
- package/src/project/project.ts +263 -0
- package/src/project/state.ts +65 -0
- package/src/project/vcs.ts +76 -0
- package/src/provider/auth.ts +143 -0
- package/src/provider/models-macro.ts +4 -0
- package/src/provider/models.ts +77 -0
- package/src/provider/provider.ts +516 -0
- package/src/provider/transform.ts +114 -0
- package/src/pty/index.ts +212 -0
- package/src/server/error.ts +36 -0
- package/src/server/mdns.ts +57 -0
- package/src/server/project.ts +79 -0
- package/src/server/server.ts +2866 -0
- package/src/server/tui.ts +71 -0
- package/src/session/compaction.ts +225 -0
- package/src/session/index.ts +469 -0
- package/src/session/llm.ts +213 -0
- package/src/session/message-v2.ts +742 -0
- package/src/session/message.ts +189 -0
- package/src/session/processor.ts +402 -0
- package/src/session/prompt/anthropic-20250930.txt +166 -0
- package/src/session/prompt/anthropic.txt +105 -0
- package/src/session/prompt/anthropic_spoof.txt +1 -0
- package/src/session/prompt/beast.txt +147 -0
- package/src/session/prompt/build-switch.txt +5 -0
- package/src/session/prompt/codex.txt +318 -0
- package/src/session/prompt/copilot-gpt-5.txt +143 -0
- package/src/session/prompt/gemini.txt +155 -0
- package/src/session/prompt/max-steps.txt +16 -0
- package/src/session/prompt/plan-reminder-anthropic.txt +67 -0
- package/src/session/prompt/plan.txt +26 -0
- package/src/session/prompt/qwen.txt +109 -0
- package/src/session/prompt.ts +1621 -0
- package/src/session/retry.ts +90 -0
- package/src/session/revert.ts +108 -0
- package/src/session/status.ts +76 -0
- package/src/session/summary.ts +194 -0
- package/src/session/system.ts +108 -0
- package/src/session/todo.ts +37 -0
- package/src/share/share-next.ts +194 -0
- package/src/share/share.ts +23 -0
- package/src/shell/shell.ts +67 -0
- package/src/skill/index.ts +1 -0
- package/src/skill/skill.ts +124 -0
- package/src/snapshot/index.ts +197 -0
- package/src/storage/storage.ts +226 -0
- package/src/tool/bash.ts +262 -0
- package/src/tool/bash.txt +116 -0
- package/src/tool/batch.ts +175 -0
- package/src/tool/batch.txt +24 -0
- package/src/tool/codesearch.ts +132 -0
- package/src/tool/codesearch.txt +12 -0
- package/src/tool/edit.ts +655 -0
- package/src/tool/edit.txt +10 -0
- package/src/tool/glob.ts +75 -0
- package/src/tool/glob.txt +6 -0
- package/src/tool/grep.ts +132 -0
- package/src/tool/grep.txt +8 -0
- package/src/tool/invalid.ts +17 -0
- package/src/tool/ls.ts +119 -0
- package/src/tool/ls.txt +1 -0
- package/src/tool/lsp.ts +94 -0
- package/src/tool/lsp.txt +19 -0
- package/src/tool/multiedit.ts +46 -0
- package/src/tool/multiedit.txt +41 -0
- package/src/tool/patch.ts +210 -0
- package/src/tool/patch.txt +1 -0
- package/src/tool/read.ts +191 -0
- package/src/tool/read.txt +12 -0
- package/src/tool/registry.ts +137 -0
- package/src/tool/skill.ts +77 -0
- package/src/tool/task.ts +167 -0
- package/src/tool/task.txt +60 -0
- package/src/tool/todo.ts +53 -0
- package/src/tool/todoread.txt +14 -0
- package/src/tool/todowrite.txt +167 -0
- package/src/tool/tool.ts +73 -0
- package/src/tool/webfetch.ts +182 -0
- package/src/tool/webfetch.txt +13 -0
- package/src/tool/websearch.ts +144 -0
- package/src/tool/websearch.txt +11 -0
- package/src/tool/write.ts +84 -0
- package/src/tool/write.txt +8 -0
- package/src/util/archive.ts +16 -0
- package/src/util/color.ts +19 -0
- package/src/util/context.ts +25 -0
- package/src/util/defer.ts +12 -0
- package/src/util/eventloop.ts +20 -0
- package/src/util/filesystem.ts +83 -0
- package/src/util/fn.ts +11 -0
- package/src/util/iife.ts +3 -0
- package/src/util/keybind.ts +102 -0
- package/src/util/lazy.ts +18 -0
- package/src/util/locale.ts +81 -0
- package/src/util/lock.ts +98 -0
- package/src/util/log.ts +180 -0
- package/src/util/queue.ts +32 -0
- package/src/util/rpc.ts +42 -0
- package/src/util/scrap.ts +10 -0
- package/src/util/signal.ts +12 -0
- package/src/util/timeout.ts +14 -0
- package/src/util/token.ts +7 -0
- package/src/util/wildcard.ts +54 -0
- package/src/worktree/index.ts +217 -0
- package/sst-env.d.ts +9 -0
- package/test/agent/agent.test.ts +448 -0
- package/test/bun.test.ts +53 -0
- package/test/cli/github-action.test.ts +129 -0
- package/test/cli/github-remote.test.ts +80 -0
- package/test/cli/tui/transcript.test.ts +297 -0
- package/test/config/agent-color.test.ts +66 -0
- package/test/config/config.test.ts +870 -0
- package/test/config/markdown.test.ts +89 -0
- package/test/file/ignore.test.ts +10 -0
- package/test/file/path-traversal.test.ts +115 -0
- package/test/fixture/fixture.ts +45 -0
- package/test/fixture/lsp/fake-lsp-server.js +77 -0
- package/test/ide/ide.test.ts +82 -0
- package/test/keybind.test.ts +421 -0
- package/test/lsp/client.test.ts +95 -0
- package/test/mcp/headers.test.ts +153 -0
- package/test/patch/patch.test.ts +348 -0
- package/test/permission/arity.test.ts +33 -0
- package/test/permission/next.test.ts +652 -0
- package/test/preload.ts +63 -0
- package/test/project/project.test.ts +120 -0
- package/test/provider/amazon-bedrock.test.ts +236 -0
- package/test/provider/provider.test.ts +2127 -0
- package/test/provider/transform.test.ts +980 -0
- package/test/server/session-select.test.ts +78 -0
- package/test/session/compaction.test.ts +251 -0
- package/test/session/message-v2.test.ts +570 -0
- package/test/session/retry.test.ts +131 -0
- package/test/session/revert-compact.test.ts +285 -0
- package/test/session/session.test.ts +71 -0
- package/test/skill/skill.test.ts +185 -0
- package/test/snapshot/snapshot.test.ts +939 -0
- package/test/tool/__snapshots__/tool.test.ts.snap +9 -0
- package/test/tool/bash.test.ts +232 -0
- package/test/tool/grep.test.ts +109 -0
- package/test/tool/patch.test.ts +261 -0
- package/test/tool/read.test.ts +167 -0
- package/test/util/iife.test.ts +36 -0
- package/test/util/lazy.test.ts +50 -0
- package/test/util/timeout.test.ts +21 -0
- package/test/util/wildcard.test.ts +55 -0
- package/tsconfig.json +16 -0
|
@@ -0,0 +1,232 @@
|
|
|
1
|
+
import { describe, expect, test } from "bun:test"
|
|
2
|
+
import path from "path"
|
|
3
|
+
import { BashTool } from "../../src/tool/bash"
|
|
4
|
+
import { Instance } from "../../src/project/instance"
|
|
5
|
+
import { tmpdir } from "../fixture/fixture"
|
|
6
|
+
import type { PermissionNext } from "../../src/permission/next"
|
|
7
|
+
|
|
8
|
+
const ctx = {
|
|
9
|
+
sessionID: "test",
|
|
10
|
+
messageID: "",
|
|
11
|
+
callID: "",
|
|
12
|
+
agent: "build",
|
|
13
|
+
abort: AbortSignal.any([]),
|
|
14
|
+
metadata: () => {},
|
|
15
|
+
ask: async () => {},
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
const projectRoot = path.join(__dirname, "../..")
|
|
19
|
+
|
|
20
|
+
describe("tool.bash", () => {
|
|
21
|
+
test("basic", async () => {
|
|
22
|
+
await Instance.provide({
|
|
23
|
+
directory: projectRoot,
|
|
24
|
+
fn: async () => {
|
|
25
|
+
const bash = await BashTool.init()
|
|
26
|
+
const result = await bash.execute(
|
|
27
|
+
{
|
|
28
|
+
command: "echo 'test'",
|
|
29
|
+
description: "Echo test message",
|
|
30
|
+
},
|
|
31
|
+
ctx,
|
|
32
|
+
)
|
|
33
|
+
expect(result.metadata.exit).toBe(0)
|
|
34
|
+
expect(result.metadata.output).toContain("test")
|
|
35
|
+
},
|
|
36
|
+
})
|
|
37
|
+
})
|
|
38
|
+
})
|
|
39
|
+
|
|
40
|
+
describe("tool.bash permissions", () => {
|
|
41
|
+
test("asks for bash permission with correct pattern", async () => {
|
|
42
|
+
await using tmp = await tmpdir({ git: true })
|
|
43
|
+
await Instance.provide({
|
|
44
|
+
directory: tmp.path,
|
|
45
|
+
fn: async () => {
|
|
46
|
+
const bash = await BashTool.init()
|
|
47
|
+
const requests: Array<Omit<PermissionNext.Request, "id" | "sessionID" | "tool">> = []
|
|
48
|
+
const testCtx = {
|
|
49
|
+
...ctx,
|
|
50
|
+
ask: async (req: Omit<PermissionNext.Request, "id" | "sessionID" | "tool">) => {
|
|
51
|
+
requests.push(req)
|
|
52
|
+
},
|
|
53
|
+
}
|
|
54
|
+
await bash.execute(
|
|
55
|
+
{
|
|
56
|
+
command: "echo hello",
|
|
57
|
+
description: "Echo hello",
|
|
58
|
+
},
|
|
59
|
+
testCtx,
|
|
60
|
+
)
|
|
61
|
+
expect(requests.length).toBe(1)
|
|
62
|
+
expect(requests[0].permission).toBe("bash")
|
|
63
|
+
expect(requests[0].patterns).toContain("echo hello")
|
|
64
|
+
},
|
|
65
|
+
})
|
|
66
|
+
})
|
|
67
|
+
|
|
68
|
+
test("asks for bash permission with multiple commands", async () => {
|
|
69
|
+
await using tmp = await tmpdir({ git: true })
|
|
70
|
+
await Instance.provide({
|
|
71
|
+
directory: tmp.path,
|
|
72
|
+
fn: async () => {
|
|
73
|
+
const bash = await BashTool.init()
|
|
74
|
+
const requests: Array<Omit<PermissionNext.Request, "id" | "sessionID" | "tool">> = []
|
|
75
|
+
const testCtx = {
|
|
76
|
+
...ctx,
|
|
77
|
+
ask: async (req: Omit<PermissionNext.Request, "id" | "sessionID" | "tool">) => {
|
|
78
|
+
requests.push(req)
|
|
79
|
+
},
|
|
80
|
+
}
|
|
81
|
+
await bash.execute(
|
|
82
|
+
{
|
|
83
|
+
command: "echo foo && echo bar",
|
|
84
|
+
description: "Echo twice",
|
|
85
|
+
},
|
|
86
|
+
testCtx,
|
|
87
|
+
)
|
|
88
|
+
expect(requests.length).toBe(1)
|
|
89
|
+
expect(requests[0].permission).toBe("bash")
|
|
90
|
+
expect(requests[0].patterns).toContain("echo foo")
|
|
91
|
+
expect(requests[0].patterns).toContain("echo bar")
|
|
92
|
+
},
|
|
93
|
+
})
|
|
94
|
+
})
|
|
95
|
+
|
|
96
|
+
test("asks for external_directory permission when cd to parent", async () => {
|
|
97
|
+
await using tmp = await tmpdir({ git: true })
|
|
98
|
+
await Instance.provide({
|
|
99
|
+
directory: tmp.path,
|
|
100
|
+
fn: async () => {
|
|
101
|
+
const bash = await BashTool.init()
|
|
102
|
+
const requests: Array<Omit<PermissionNext.Request, "id" | "sessionID" | "tool">> = []
|
|
103
|
+
const testCtx = {
|
|
104
|
+
...ctx,
|
|
105
|
+
ask: async (req: Omit<PermissionNext.Request, "id" | "sessionID" | "tool">) => {
|
|
106
|
+
requests.push(req)
|
|
107
|
+
},
|
|
108
|
+
}
|
|
109
|
+
await bash.execute(
|
|
110
|
+
{
|
|
111
|
+
command: "cd ../",
|
|
112
|
+
description: "Change to parent directory",
|
|
113
|
+
},
|
|
114
|
+
testCtx,
|
|
115
|
+
)
|
|
116
|
+
const extDirReq = requests.find((r) => r.permission === "external_directory")
|
|
117
|
+
expect(extDirReq).toBeDefined()
|
|
118
|
+
},
|
|
119
|
+
})
|
|
120
|
+
})
|
|
121
|
+
|
|
122
|
+
test("asks for external_directory permission when workdir is outside project", async () => {
|
|
123
|
+
await using tmp = await tmpdir({ git: true })
|
|
124
|
+
await Instance.provide({
|
|
125
|
+
directory: tmp.path,
|
|
126
|
+
fn: async () => {
|
|
127
|
+
const bash = await BashTool.init()
|
|
128
|
+
const requests: Array<Omit<PermissionNext.Request, "id" | "sessionID" | "tool">> = []
|
|
129
|
+
const testCtx = {
|
|
130
|
+
...ctx,
|
|
131
|
+
ask: async (req: Omit<PermissionNext.Request, "id" | "sessionID" | "tool">) => {
|
|
132
|
+
requests.push(req)
|
|
133
|
+
},
|
|
134
|
+
}
|
|
135
|
+
await bash.execute(
|
|
136
|
+
{
|
|
137
|
+
command: "ls",
|
|
138
|
+
workdir: "/tmp",
|
|
139
|
+
description: "List /tmp",
|
|
140
|
+
},
|
|
141
|
+
testCtx,
|
|
142
|
+
)
|
|
143
|
+
const extDirReq = requests.find((r) => r.permission === "external_directory")
|
|
144
|
+
expect(extDirReq).toBeDefined()
|
|
145
|
+
expect(extDirReq!.patterns).toContain("/tmp")
|
|
146
|
+
},
|
|
147
|
+
})
|
|
148
|
+
})
|
|
149
|
+
|
|
150
|
+
test("does not ask for external_directory permission when rm inside project", async () => {
|
|
151
|
+
await using tmp = await tmpdir({ git: true })
|
|
152
|
+
await Instance.provide({
|
|
153
|
+
directory: tmp.path,
|
|
154
|
+
fn: async () => {
|
|
155
|
+
const bash = await BashTool.init()
|
|
156
|
+
const requests: Array<Omit<PermissionNext.Request, "id" | "sessionID" | "tool">> = []
|
|
157
|
+
const testCtx = {
|
|
158
|
+
...ctx,
|
|
159
|
+
ask: async (req: Omit<PermissionNext.Request, "id" | "sessionID" | "tool">) => {
|
|
160
|
+
requests.push(req)
|
|
161
|
+
},
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
await Bun.write(path.join(tmp.path, "tmpfile"), "x")
|
|
165
|
+
|
|
166
|
+
await bash.execute(
|
|
167
|
+
{
|
|
168
|
+
command: "rm tmpfile",
|
|
169
|
+
description: "Remove tmpfile",
|
|
170
|
+
},
|
|
171
|
+
testCtx,
|
|
172
|
+
)
|
|
173
|
+
|
|
174
|
+
const extDirReq = requests.find((r) => r.permission === "external_directory")
|
|
175
|
+
expect(extDirReq).toBeUndefined()
|
|
176
|
+
},
|
|
177
|
+
})
|
|
178
|
+
})
|
|
179
|
+
|
|
180
|
+
test("includes always patterns for auto-approval", async () => {
|
|
181
|
+
await using tmp = await tmpdir({ git: true })
|
|
182
|
+
await Instance.provide({
|
|
183
|
+
directory: tmp.path,
|
|
184
|
+
fn: async () => {
|
|
185
|
+
const bash = await BashTool.init()
|
|
186
|
+
const requests: Array<Omit<PermissionNext.Request, "id" | "sessionID" | "tool">> = []
|
|
187
|
+
const testCtx = {
|
|
188
|
+
...ctx,
|
|
189
|
+
ask: async (req: Omit<PermissionNext.Request, "id" | "sessionID" | "tool">) => {
|
|
190
|
+
requests.push(req)
|
|
191
|
+
},
|
|
192
|
+
}
|
|
193
|
+
await bash.execute(
|
|
194
|
+
{
|
|
195
|
+
command: "git log --oneline -5",
|
|
196
|
+
description: "Git log",
|
|
197
|
+
},
|
|
198
|
+
testCtx,
|
|
199
|
+
)
|
|
200
|
+
expect(requests.length).toBe(1)
|
|
201
|
+
expect(requests[0].always.length).toBeGreaterThan(0)
|
|
202
|
+
expect(requests[0].always.some((p) => p.endsWith("*"))).toBe(true)
|
|
203
|
+
},
|
|
204
|
+
})
|
|
205
|
+
})
|
|
206
|
+
|
|
207
|
+
test("does not ask for bash permission when command is cd only", async () => {
|
|
208
|
+
await using tmp = await tmpdir({ git: true })
|
|
209
|
+
await Instance.provide({
|
|
210
|
+
directory: tmp.path,
|
|
211
|
+
fn: async () => {
|
|
212
|
+
const bash = await BashTool.init()
|
|
213
|
+
const requests: Array<Omit<PermissionNext.Request, "id" | "sessionID" | "tool">> = []
|
|
214
|
+
const testCtx = {
|
|
215
|
+
...ctx,
|
|
216
|
+
ask: async (req: Omit<PermissionNext.Request, "id" | "sessionID" | "tool">) => {
|
|
217
|
+
requests.push(req)
|
|
218
|
+
},
|
|
219
|
+
}
|
|
220
|
+
await bash.execute(
|
|
221
|
+
{
|
|
222
|
+
command: "cd .",
|
|
223
|
+
description: "Stay in current directory",
|
|
224
|
+
},
|
|
225
|
+
testCtx,
|
|
226
|
+
)
|
|
227
|
+
const bashReq = requests.find((r) => r.permission === "bash")
|
|
228
|
+
expect(bashReq).toBeUndefined()
|
|
229
|
+
},
|
|
230
|
+
})
|
|
231
|
+
})
|
|
232
|
+
})
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
import { describe, expect, test } from "bun:test"
|
|
2
|
+
import path from "path"
|
|
3
|
+
import { GrepTool } from "../../src/tool/grep"
|
|
4
|
+
import { Instance } from "../../src/project/instance"
|
|
5
|
+
import { tmpdir } from "../fixture/fixture"
|
|
6
|
+
|
|
7
|
+
const ctx = {
|
|
8
|
+
sessionID: "test",
|
|
9
|
+
messageID: "",
|
|
10
|
+
callID: "",
|
|
11
|
+
agent: "build",
|
|
12
|
+
abort: AbortSignal.any([]),
|
|
13
|
+
metadata: () => {},
|
|
14
|
+
ask: async () => {},
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
const projectRoot = path.join(__dirname, "../..")
|
|
18
|
+
|
|
19
|
+
describe("tool.grep", () => {
|
|
20
|
+
test("basic search", async () => {
|
|
21
|
+
await Instance.provide({
|
|
22
|
+
directory: projectRoot,
|
|
23
|
+
fn: async () => {
|
|
24
|
+
const grep = await GrepTool.init()
|
|
25
|
+
const result = await grep.execute(
|
|
26
|
+
{
|
|
27
|
+
pattern: "export",
|
|
28
|
+
path: path.join(projectRoot, "src/tool"),
|
|
29
|
+
include: "*.ts",
|
|
30
|
+
},
|
|
31
|
+
ctx,
|
|
32
|
+
)
|
|
33
|
+
expect(result.metadata.matches).toBeGreaterThan(0)
|
|
34
|
+
expect(result.output).toContain("Found")
|
|
35
|
+
},
|
|
36
|
+
})
|
|
37
|
+
})
|
|
38
|
+
|
|
39
|
+
test("no matches returns correct output", async () => {
|
|
40
|
+
await using tmp = await tmpdir({
|
|
41
|
+
init: async (dir) => {
|
|
42
|
+
await Bun.write(path.join(dir, "test.txt"), "hello world")
|
|
43
|
+
},
|
|
44
|
+
})
|
|
45
|
+
await Instance.provide({
|
|
46
|
+
directory: tmp.path,
|
|
47
|
+
fn: async () => {
|
|
48
|
+
const grep = await GrepTool.init()
|
|
49
|
+
const result = await grep.execute(
|
|
50
|
+
{
|
|
51
|
+
pattern: "xyznonexistentpatternxyz123",
|
|
52
|
+
path: tmp.path,
|
|
53
|
+
},
|
|
54
|
+
ctx,
|
|
55
|
+
)
|
|
56
|
+
expect(result.metadata.matches).toBe(0)
|
|
57
|
+
expect(result.output).toBe("No files found")
|
|
58
|
+
},
|
|
59
|
+
})
|
|
60
|
+
})
|
|
61
|
+
|
|
62
|
+
test("handles CRLF line endings in output", async () => {
|
|
63
|
+
// This test verifies the regex split handles both \n and \r\n
|
|
64
|
+
await using tmp = await tmpdir({
|
|
65
|
+
init: async (dir) => {
|
|
66
|
+
// Create a test file with content
|
|
67
|
+
await Bun.write(path.join(dir, "test.txt"), "line1\nline2\nline3")
|
|
68
|
+
},
|
|
69
|
+
})
|
|
70
|
+
await Instance.provide({
|
|
71
|
+
directory: tmp.path,
|
|
72
|
+
fn: async () => {
|
|
73
|
+
const grep = await GrepTool.init()
|
|
74
|
+
const result = await grep.execute(
|
|
75
|
+
{
|
|
76
|
+
pattern: "line",
|
|
77
|
+
path: tmp.path,
|
|
78
|
+
},
|
|
79
|
+
ctx,
|
|
80
|
+
)
|
|
81
|
+
expect(result.metadata.matches).toBeGreaterThan(0)
|
|
82
|
+
},
|
|
83
|
+
})
|
|
84
|
+
})
|
|
85
|
+
})
|
|
86
|
+
|
|
87
|
+
describe("CRLF regex handling", () => {
|
|
88
|
+
test("regex correctly splits Unix line endings", () => {
|
|
89
|
+
const unixOutput = "file1.txt|1|content1\nfile2.txt|2|content2\nfile3.txt|3|content3"
|
|
90
|
+
const lines = unixOutput.trim().split(/\r?\n/)
|
|
91
|
+
expect(lines.length).toBe(3)
|
|
92
|
+
expect(lines[0]).toBe("file1.txt|1|content1")
|
|
93
|
+
expect(lines[2]).toBe("file3.txt|3|content3")
|
|
94
|
+
})
|
|
95
|
+
|
|
96
|
+
test("regex correctly splits Windows CRLF line endings", () => {
|
|
97
|
+
const windowsOutput = "file1.txt|1|content1\r\nfile2.txt|2|content2\r\nfile3.txt|3|content3"
|
|
98
|
+
const lines = windowsOutput.trim().split(/\r?\n/)
|
|
99
|
+
expect(lines.length).toBe(3)
|
|
100
|
+
expect(lines[0]).toBe("file1.txt|1|content1")
|
|
101
|
+
expect(lines[2]).toBe("file3.txt|3|content3")
|
|
102
|
+
})
|
|
103
|
+
|
|
104
|
+
test("regex handles mixed line endings", () => {
|
|
105
|
+
const mixedOutput = "file1.txt|1|content1\nfile2.txt|2|content2\r\nfile3.txt|3|content3"
|
|
106
|
+
const lines = mixedOutput.trim().split(/\r?\n/)
|
|
107
|
+
expect(lines.length).toBe(3)
|
|
108
|
+
})
|
|
109
|
+
})
|
|
@@ -0,0 +1,261 @@
|
|
|
1
|
+
import { describe, expect, test } from "bun:test"
|
|
2
|
+
import path from "path"
|
|
3
|
+
import { PatchTool } from "../../src/tool/patch"
|
|
4
|
+
import { Instance } from "../../src/project/instance"
|
|
5
|
+
import { tmpdir } from "../fixture/fixture"
|
|
6
|
+
import { PermissionNext } from "../../src/permission/next"
|
|
7
|
+
import * as fs from "fs/promises"
|
|
8
|
+
|
|
9
|
+
const ctx = {
|
|
10
|
+
sessionID: "test",
|
|
11
|
+
messageID: "",
|
|
12
|
+
callID: "",
|
|
13
|
+
agent: "build",
|
|
14
|
+
abort: AbortSignal.any([]),
|
|
15
|
+
metadata: () => {},
|
|
16
|
+
ask: async () => {},
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
const patchTool = await PatchTool.init()
|
|
20
|
+
|
|
21
|
+
describe("tool.patch", () => {
|
|
22
|
+
test("should validate required parameters", async () => {
|
|
23
|
+
await Instance.provide({
|
|
24
|
+
directory: "/tmp",
|
|
25
|
+
fn: async () => {
|
|
26
|
+
expect(patchTool.execute({ patchText: "" }, ctx)).rejects.toThrow("patchText is required")
|
|
27
|
+
},
|
|
28
|
+
})
|
|
29
|
+
})
|
|
30
|
+
|
|
31
|
+
test("should validate patch format", async () => {
|
|
32
|
+
await Instance.provide({
|
|
33
|
+
directory: "/tmp",
|
|
34
|
+
fn: async () => {
|
|
35
|
+
expect(patchTool.execute({ patchText: "invalid patch" }, ctx)).rejects.toThrow("Failed to parse patch")
|
|
36
|
+
},
|
|
37
|
+
})
|
|
38
|
+
})
|
|
39
|
+
|
|
40
|
+
test("should handle empty patch", async () => {
|
|
41
|
+
await Instance.provide({
|
|
42
|
+
directory: "/tmp",
|
|
43
|
+
fn: async () => {
|
|
44
|
+
const emptyPatch = `*** Begin Patch
|
|
45
|
+
*** End Patch`
|
|
46
|
+
|
|
47
|
+
expect(patchTool.execute({ patchText: emptyPatch }, ctx)).rejects.toThrow("No file changes found in patch")
|
|
48
|
+
},
|
|
49
|
+
})
|
|
50
|
+
})
|
|
51
|
+
|
|
52
|
+
test.skip("should ask permission for files outside working directory", async () => {
|
|
53
|
+
await Instance.provide({
|
|
54
|
+
directory: "/tmp",
|
|
55
|
+
fn: async () => {
|
|
56
|
+
const maliciousPatch = `*** Begin Patch
|
|
57
|
+
*** Add File: /etc/passwd
|
|
58
|
+
+malicious content
|
|
59
|
+
*** End Patch`
|
|
60
|
+
patchTool.execute({ patchText: maliciousPatch }, ctx)
|
|
61
|
+
// TODO: this sucks
|
|
62
|
+
await new Promise((resolve) => setTimeout(resolve, 1000))
|
|
63
|
+
const pending = await PermissionNext.list()
|
|
64
|
+
expect(pending.find((p) => p.sessionID === ctx.sessionID)).toBeDefined()
|
|
65
|
+
},
|
|
66
|
+
})
|
|
67
|
+
})
|
|
68
|
+
|
|
69
|
+
test("should handle simple add file operation", async () => {
|
|
70
|
+
await using fixture = await tmpdir()
|
|
71
|
+
|
|
72
|
+
await Instance.provide({
|
|
73
|
+
directory: fixture.path,
|
|
74
|
+
fn: async () => {
|
|
75
|
+
const patchText = `*** Begin Patch
|
|
76
|
+
*** Add File: test-file.txt
|
|
77
|
+
+Hello World
|
|
78
|
+
+This is a test file
|
|
79
|
+
*** End Patch`
|
|
80
|
+
|
|
81
|
+
const result = await patchTool.execute({ patchText }, ctx)
|
|
82
|
+
|
|
83
|
+
expect(result.title).toContain("files changed")
|
|
84
|
+
expect(result.metadata.diff).toBeDefined()
|
|
85
|
+
expect(result.output).toContain("Patch applied successfully")
|
|
86
|
+
|
|
87
|
+
// Verify file was created
|
|
88
|
+
const filePath = path.join(fixture.path, "test-file.txt")
|
|
89
|
+
const content = await fs.readFile(filePath, "utf-8")
|
|
90
|
+
expect(content).toBe("Hello World\nThis is a test file")
|
|
91
|
+
},
|
|
92
|
+
})
|
|
93
|
+
})
|
|
94
|
+
|
|
95
|
+
test("should handle file with context update", async () => {
|
|
96
|
+
await using fixture = await tmpdir()
|
|
97
|
+
|
|
98
|
+
await Instance.provide({
|
|
99
|
+
directory: fixture.path,
|
|
100
|
+
fn: async () => {
|
|
101
|
+
const patchText = `*** Begin Patch
|
|
102
|
+
*** Add File: config.js
|
|
103
|
+
+const API_KEY = "test-key"
|
|
104
|
+
+const DEBUG = false
|
|
105
|
+
+const VERSION = "1.0"
|
|
106
|
+
*** End Patch`
|
|
107
|
+
|
|
108
|
+
const result = await patchTool.execute({ patchText }, ctx)
|
|
109
|
+
|
|
110
|
+
expect(result.title).toContain("files changed")
|
|
111
|
+
expect(result.metadata.diff).toBeDefined()
|
|
112
|
+
expect(result.output).toContain("Patch applied successfully")
|
|
113
|
+
|
|
114
|
+
// Verify file was created with correct content
|
|
115
|
+
const filePath = path.join(fixture.path, "config.js")
|
|
116
|
+
const content = await fs.readFile(filePath, "utf-8")
|
|
117
|
+
expect(content).toBe('const API_KEY = "test-key"\nconst DEBUG = false\nconst VERSION = "1.0"')
|
|
118
|
+
},
|
|
119
|
+
})
|
|
120
|
+
})
|
|
121
|
+
|
|
122
|
+
test("should handle multiple file operations", async () => {
|
|
123
|
+
await using fixture = await tmpdir()
|
|
124
|
+
|
|
125
|
+
await Instance.provide({
|
|
126
|
+
directory: fixture.path,
|
|
127
|
+
fn: async () => {
|
|
128
|
+
const patchText = `*** Begin Patch
|
|
129
|
+
*** Add File: file1.txt
|
|
130
|
+
+Content of file 1
|
|
131
|
+
*** Add File: file2.txt
|
|
132
|
+
+Content of file 2
|
|
133
|
+
*** Add File: file3.txt
|
|
134
|
+
+Content of file 3
|
|
135
|
+
*** End Patch`
|
|
136
|
+
|
|
137
|
+
const result = await patchTool.execute({ patchText }, ctx)
|
|
138
|
+
|
|
139
|
+
expect(result.title).toContain("3 files changed")
|
|
140
|
+
expect(result.metadata.diff).toBeDefined()
|
|
141
|
+
expect(result.output).toContain("Patch applied successfully")
|
|
142
|
+
|
|
143
|
+
// Verify all files were created
|
|
144
|
+
for (let i = 1; i <= 3; i++) {
|
|
145
|
+
const filePath = path.join(fixture.path, `file${i}.txt`)
|
|
146
|
+
const content = await fs.readFile(filePath, "utf-8")
|
|
147
|
+
expect(content).toBe(`Content of file ${i}`)
|
|
148
|
+
}
|
|
149
|
+
},
|
|
150
|
+
})
|
|
151
|
+
})
|
|
152
|
+
|
|
153
|
+
test("should create parent directories when adding nested files", async () => {
|
|
154
|
+
await using fixture = await tmpdir()
|
|
155
|
+
|
|
156
|
+
await Instance.provide({
|
|
157
|
+
directory: fixture.path,
|
|
158
|
+
fn: async () => {
|
|
159
|
+
const patchText = `*** Begin Patch
|
|
160
|
+
*** Add File: deep/nested/file.txt
|
|
161
|
+
+Deep nested content
|
|
162
|
+
*** End Patch`
|
|
163
|
+
|
|
164
|
+
const result = await patchTool.execute({ patchText }, ctx)
|
|
165
|
+
|
|
166
|
+
expect(result.title).toContain("files changed")
|
|
167
|
+
expect(result.output).toContain("Patch applied successfully")
|
|
168
|
+
|
|
169
|
+
// Verify nested file was created
|
|
170
|
+
const nestedPath = path.join(fixture.path, "deep", "nested", "file.txt")
|
|
171
|
+
const exists = await fs
|
|
172
|
+
.access(nestedPath)
|
|
173
|
+
.then(() => true)
|
|
174
|
+
.catch(() => false)
|
|
175
|
+
expect(exists).toBe(true)
|
|
176
|
+
|
|
177
|
+
const content = await fs.readFile(nestedPath, "utf-8")
|
|
178
|
+
expect(content).toBe("Deep nested content")
|
|
179
|
+
},
|
|
180
|
+
})
|
|
181
|
+
})
|
|
182
|
+
|
|
183
|
+
test("should generate proper unified diff in metadata", async () => {
|
|
184
|
+
await using fixture = await tmpdir()
|
|
185
|
+
|
|
186
|
+
await Instance.provide({
|
|
187
|
+
directory: fixture.path,
|
|
188
|
+
fn: async () => {
|
|
189
|
+
// First create a file with simple content
|
|
190
|
+
const patchText1 = `*** Begin Patch
|
|
191
|
+
*** Add File: test.txt
|
|
192
|
+
+line 1
|
|
193
|
+
+line 2
|
|
194
|
+
+line 3
|
|
195
|
+
*** End Patch`
|
|
196
|
+
|
|
197
|
+
await patchTool.execute({ patchText: patchText1 }, ctx)
|
|
198
|
+
|
|
199
|
+
// Now create an update patch
|
|
200
|
+
const patchText2 = `*** Begin Patch
|
|
201
|
+
*** Update File: test.txt
|
|
202
|
+
@@
|
|
203
|
+
line 1
|
|
204
|
+
-line 2
|
|
205
|
+
+line 2 updated
|
|
206
|
+
line 3
|
|
207
|
+
*** End Patch`
|
|
208
|
+
|
|
209
|
+
const result = await patchTool.execute({ patchText: patchText2 }, ctx)
|
|
210
|
+
|
|
211
|
+
expect(result.metadata.diff).toBeDefined()
|
|
212
|
+
expect(result.metadata.diff).toContain("@@")
|
|
213
|
+
expect(result.metadata.diff).toContain("-line 2")
|
|
214
|
+
expect(result.metadata.diff).toContain("+line 2 updated")
|
|
215
|
+
},
|
|
216
|
+
})
|
|
217
|
+
})
|
|
218
|
+
|
|
219
|
+
test("should handle complex patch with multiple operations", async () => {
|
|
220
|
+
await using fixture = await tmpdir()
|
|
221
|
+
|
|
222
|
+
await Instance.provide({
|
|
223
|
+
directory: fixture.path,
|
|
224
|
+
fn: async () => {
|
|
225
|
+
const patchText = `*** Begin Patch
|
|
226
|
+
*** Add File: new.txt
|
|
227
|
+
+This is a new file
|
|
228
|
+
+with multiple lines
|
|
229
|
+
*** Add File: existing.txt
|
|
230
|
+
+old content
|
|
231
|
+
+new line
|
|
232
|
+
+more content
|
|
233
|
+
*** Add File: config.json
|
|
234
|
+
+{
|
|
235
|
+
+ "version": "1.0",
|
|
236
|
+
+ "debug": true
|
|
237
|
+
+}
|
|
238
|
+
*** End Patch`
|
|
239
|
+
|
|
240
|
+
const result = await patchTool.execute({ patchText }, ctx)
|
|
241
|
+
|
|
242
|
+
expect(result.title).toContain("3 files changed")
|
|
243
|
+
expect(result.metadata.diff).toBeDefined()
|
|
244
|
+
expect(result.output).toContain("Patch applied successfully")
|
|
245
|
+
|
|
246
|
+
// Verify all files were created
|
|
247
|
+
const newPath = path.join(fixture.path, "new.txt")
|
|
248
|
+
const newContent = await fs.readFile(newPath, "utf-8")
|
|
249
|
+
expect(newContent).toBe("This is a new file\nwith multiple lines")
|
|
250
|
+
|
|
251
|
+
const existingPath = path.join(fixture.path, "existing.txt")
|
|
252
|
+
const existingContent = await fs.readFile(existingPath, "utf-8")
|
|
253
|
+
expect(existingContent).toBe("old content\nnew line\nmore content")
|
|
254
|
+
|
|
255
|
+
const configPath = path.join(fixture.path, "config.json")
|
|
256
|
+
const configContent = await fs.readFile(configPath, "utf-8")
|
|
257
|
+
expect(configContent).toBe('{\n "version": "1.0",\n "debug": true\n}')
|
|
258
|
+
},
|
|
259
|
+
})
|
|
260
|
+
})
|
|
261
|
+
})
|