Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .config/jp/tools/src/fs/modify_file.rs
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,9 @@ fn apply_changes<R: ProcessRunner>(
Some(true) => {}
Some(false) => {
return Err(
"`apply_changes` inquiry was answered with `false`. Changes discarded.".into(),
"The proposed file changes were reviewed and rejected. Changes were not applied. \
You may retry with different changes."
.into(),
);
}
None => {
Expand Down
3 changes: 2 additions & 1 deletion .jp/config/personas/dev.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ extends = [
]

[conversation.tools]
fs_move_file.questions.move_dirty_file.answer = true
fs_create_file.questions.overwrite_file.answer = true
fs_modify_file.questions.modify_dirty_file.answer = true
fs_move_file.questions.move_dirty_file.answer = true

[[conversation.attachments]]
type = "cmd"
Expand Down
5 changes: 4 additions & 1 deletion .jp/config/personas/stager.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ extends = [
"../skill/project-discourse.toml",
]

[conversation.tools]
'*' = { enable = false, run = "ask" }
git_stage_patch.questions.stage_changes.answer = true

[assistant.system_prompt]
strategy = "append"
separator = "paragraph"
Expand All @@ -28,7 +32,6 @@ diff --cached`. A summary of what was staged and why this group was picked is en

[conversation]
title.generate.auto = false
tools.'*' = { enable = false, run = "unattended" }

[[conversation.attachments]]
type = "cmd"
Expand Down
4 changes: 3 additions & 1 deletion .jp/config/skill/edit-files.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ the current project. The following tools help you with this:

You should consider token-usage when using these tools:

- Do NOT re-create files that already exist, unless the majority of the file's content will be \
- DO NOT re-create files that already exist, unless the majority of the file's content will be \
replaced.
- DO NOT delete-and-recreate files when you want to MOVE them to a new location, use \
`fs_move_file` instead.
- DO USE `fs_modify_file` to mutate multiple files at once, using multiple patterns if applicable. \
This is faster and more token-efficient than calling `fs_modify_file` multiple times for \
single-file mutations.
Expand Down
4 changes: 2 additions & 2 deletions .jp/config/skill/git-reading.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ value = """
You have been given the git-reading skill. You are an expert at reading and navigating git history \
and diffs. The following tools help you with this:

- git_diff: Diff the git repository, with a required `status` parameter: `"staged"`, `"unstaged"`, \
or `"all"`.
- git_diff: Diff the git repository, with a required `status` parameter: `"staged"` or `"unstaged"`. \
Output is truncated per file; use the `paths` parameter to see full diffs for specific files.
- git_log: Search the commit history. Supports filtering by message text, file paths, date range, \
and result count.
- git_show: Show commit details (message and changed file stats). Does NOT include actual diff \
Expand Down
6 changes: 5 additions & 1 deletion .jp/mcp/tools/cargo/expand.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[conversation.tools.cargo_expand]
enable = false
run = "unattended"
style.inline_results = "off"

source = "local"
command = "just serve-tools {{context}} {{tool}}"
Expand All @@ -19,6 +18,11 @@ Expand a top-level item:
```
"""

[conversation.tools.cargo_expand.style]
inline_results = "off"
results_file_link = "off"
parameters = "function_call"

[conversation.tools.cargo_expand.parameters.package]
summary = "Package to find the item in, required if working with a workspace."
type = "string"
Expand Down
4 changes: 2 additions & 2 deletions .jp/mcp/tools/fs/modify_file.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ Use regex with capture groups:
```
"""

questions.apply_changes.target = "assistant"
# questions.apply_changes.answer = true
# questions.apply_changes.target = "assistant"
questions.apply_changes.answer = true

[conversation.tools.fs_modify_file.style]
parameters = "just serve-tools {{context}} {{tool}}"
Expand Down
13 changes: 6 additions & 7 deletions .jp/mcp/tools/git/diff.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ style.inline_results = "full"
source = "local"
command = "just serve-tools {{context}} {{tool}}"
summary = "Show the diff of changes in the git repository, filtered by staging status."
description = """
Returns a per-file summary of changes with truncated diffs. Each file's diff \
is capped at 50 lines. If a file is truncated, re-run with `paths` set to \
that file to see its full diff.
"""

examples = """
Diff all unstaged changes:
Expand All @@ -22,11 +27,6 @@ Diff staged changes:
```json
{"status": "staged", "paths": ["src/"]}
```

Diff all changes (staged + unstaged combined):
```json
{"status": "all"}
```
"""

[conversation.tools.git_diff.parameters.paths]
Expand All @@ -36,13 +36,12 @@ summary = "Optional list of paths to restrict the diff to. If omitted, diffs the

[conversation.tools.git_diff.parameters.status]
type = "string"
enum = ["all", "staged", "unstaged"]
enum = ["staged", "unstaged"]
required = true
summary = "Which changes to include in the diff."
description = """
- `"staged"`: changes in the index that differ from HEAD (HEAD vs index).
- `"unstaged"`: changes in the working tree that differ from the index (index vs working tree).
- `"all"`: all changes from HEAD, regardless of staging (HEAD vs working tree).

A staged change will NOT appear in the `"unstaged"` diff and vice versa.
"""
7 changes: 4 additions & 3 deletions .jp/mcp/tools/git/stage_patch.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[conversation.tools.git_stage_patch]
enable = "explicit"
run = "unattended"
style.inline_results = "full"

source = "local"
command = "just serve-tools {{context}} {{tool}}"
Expand All @@ -23,8 +22,10 @@ Stage patches across multiple files:
```
"""

# questions.stage_changes.target = "assistant"
questions.stage_changes.answer = true
[conversation.tools.git_stage_patch.style]
inline_results = "full"
results_file_link = "off"
parameters = "off"

[conversation.tools.git_stage_patch.parameters.patches]
type = "array"
Expand Down
5 changes: 5 additions & 0 deletions .jp/mcp/tools/github/code_search.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ Search in another repository:
```
"""

[conversation.tools.github_code_search.style]
inline_results = "off"
results_file_link = "off"
parameters = "function_call"

[conversation.tools.github_code_search.parameters.repository]
type = "string"
summary = "Repository to search for code."
Expand Down
5 changes: 5 additions & 0 deletions .jp/mcp/tools/web/fetch.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ examples = """
```
"""

[conversation.tools.web_fetch.style]
parameters = "function_call"
inline_results = "off"
results_file_link = "full"

[conversation.tools.web_fetch.parameters.url]
type = "string"
required = true
Expand Down
Loading