Skip to content

Commit 06e5667

Browse files
authored
fix(ci): lint + checkout-eyrie fallback + marketplace sync (#83)
* fix(ci): lint + checkout-eyrie fallback + marketplace sync * style: fix gofumpt formatting in chat_scrollbar.go * fix(ci): add sync.Mutex to fix race in executeToolCalls
1 parent 7f4519c commit 06e5667

19 files changed

Lines changed: 49 additions & 61 deletions

File tree

.github/actions/checkout-eyrie/action.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,17 @@ runs:
2929
# (e.g. by a squash-merge). A depth-1 clone can't check
3030
# out older commits and fails with "unable to read tree".
3131
git clone "https://github.com/GrayCodeAI/${repo}.git" "$dest"
32-
(cd "$dest" && git checkout --quiet "$commit")
32+
if ! (cd "$dest" && git checkout --quiet "$commit" 2>/dev/null); then
33+
echo "Submodule commit $commit not reachable, falling back to ref"
34+
ref="${{ inputs.ref }}"
35+
if [ "$ref" = "main" ]; then
36+
rm -rf "$dest"
37+
git clone --depth=1 --branch main \
38+
"https://github.com/GrayCodeAI/${repo}.git" "$dest"
39+
else
40+
(cd "$dest" && git fetch --depth=1 "origin" "$ref" && git checkout --quiet "$ref")
41+
fi
42+
fi
3343
else
3444
ref="${{ inputs.ref }}"
3545
# Fall back to main if the branch doesn't exist on the dependency repo.

cmd/chat.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ func runChat() error {
578578
}
579579
systemPrompt := promptRes.text
580580
settings := settingsRes.settings
581-
m, err := newChatModelWithRegistry(ref, systemPrompt, settings, registryRes.registry)
581+
m, err := newChatModel(ref, systemPrompt, settings)
582582
if err != nil {
583583
return err
584584
}

cmd/chat_scrollbar.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@ const (
1717
scrollbarBottomGlyph = "╵" // cap at the very bottom of the track
1818
)
1919

20-
var (
21-
// scrollbarThumbStyle — brand orange thumb so it pops.
22-
scrollbarThumbStyle = lipgloss.NewStyle().Foreground(hawkColor)
23-
// scrollbarTrackStyle — very dim grey track so it doesn't distract.
24-
scrollbarTrackStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("#3A3A3A"))
25-
)
20+
// scrollbarThumbStyle — brand orange thumb so it pops.
21+
var scrollbarThumbStyle = lipgloss.NewStyle().Foreground(hawkColor)
2622

2723
// chatHasOverflow reports whether chat content exceeds the viewport height.
2824
func (m chatModel) chatHasOverflow() bool {

cmd/chat_stream.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ func (m *chatModel) startPromptCommand(display, prompt string) (tea.Model, tea.C
2626
return m, nil
2727
}
2828

29-
// dispatchStreamEvent maps one engine event to TUI messages. Returns true when
30-
// the pump should stop (error or done).
31-
func dispatchStreamEvent(ref *progRef, ev engine.StreamEvent) bool {
32-
return dispatchStreamEventWithFlush(ref, ev, nil)
33-
}
34-
3529
func dispatchStreamEventWithFlush(ref *progRef, ev engine.StreamEvent, flush func()) bool {
3630
if ev.Type != "content" && flush != nil {
3731
flush()

external/sight

Submodule sight updated from f7cb990 to faddabc

internal/engine/safety/permission.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,6 @@ func ToolSummary(name string, args map[string]interface{}) string {
161161
return name
162162
}
163163

164-
func boolPtr(v bool) *bool {
165-
return &v
166-
}
167-
168164
func pathArgument(args map[string]interface{}) (string, bool) {
169165
if p, ok := args["path"].(string); ok && p != "" {
170166
return p, true

internal/engine/stream_tool_exec.go

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,6 @@ type toolExecResult struct {
2525
isErr bool
2626
}
2727

28-
// classifyToolCalls splits tool calls into concurrent (read-only) and sequential (write) batches.
29-
func classifyToolCalls(calls []types.ToolCall) (concurrent, sequential []types.ToolCall) {
30-
for _, tc := range calls {
31-
if tool.IsReadOnly(tc.Name) {
32-
concurrent = append(concurrent, tc)
33-
} else {
34-
sequential = append(sequential, tc)
35-
}
36-
}
37-
return
38-
}
39-
4028
// filePathArgKeys is the list of argument names that are conventionally
4129
// file paths. Tools with non-standard names silently fall through and
4230
// extractTargets returns an empty list. For a more robust extraction, see
@@ -203,6 +191,7 @@ func (s *Session) executeToolCalls(ctx context.Context, toolCalls []types.ToolCa
203191
readOnlySem := make(chan struct{}, maxConcurrentReadOnlyToolCalls)
204192
networkSem := make(chan struct{}, maxConcurrentNetworkReadOnlyToolCalls)
205193
var wg sync.WaitGroup
194+
var mu sync.Mutex
206195

207196
for _, item := range concurrentCalls {
208197
wg.Add(1)
@@ -214,13 +203,17 @@ func (s *Session) executeToolCalls(ctx context.Context, toolCalls []types.ToolCa
214203
networkSem <- struct{}{}
215204
defer func() { <-networkSem }()
216205
}
206+
mu.Lock()
217207
results[item.index] = s.executeSingleTool(ctx, item.tc, ch, turnCount, intentText)
208+
mu.Unlock()
218209
}(item)
219210
}
220211
wg.Wait()
221212

222213
for _, item := range sequentialCalls {
214+
mu.Lock()
223215
results[item.index] = s.executeSingleTool(ctx, item.tc, ch, turnCount, intentText)
216+
mu.Unlock()
224217
}
225218

226219
return results

internal/plugin/bundled_skills/idea-refine/SKILL.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ Refines raw ideas into sharp, actionable concepts worth building through structu
99

1010
## How It Works
1111

12-
1. **Understand & Expand (Divergent):** Restate the idea, ask sharpening questions, and generate variations.
13-
2. **Evaluate & Converge:** Cluster ideas, stress-test them, and surface hidden assumptions.
14-
3. **Sharpen & Ship:** Produce a concrete markdown one-pager moving work forward.
12+
1. **Understand & Expand (Divergent):** Restate the idea, ask sharpening questions, and generate variations.
13+
2. **Evaluate & Converge:** Cluster ideas, stress-test them, and surface hidden assumptions.
14+
3. **Sharpen & Ship:** Produce a concrete markdown one-pager moving work forward.
1515

1616
## Usage
1717

internal/plugin/bundled_skills/idea-refine/examples.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ One thing I want to push back on: you said variation 1 feels "necessary but bori
8787

8888
**Skill produces:**
8989

90+
<!-- markdownlint-disable MD025 -->
9091
# ReOrder: Keep Your Regulars Ordering Direct
9192

9293
## Problem Statement

internal/plugin/bundled_skills/performance-optimization/SKILL.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,6 @@ npx lhci autorun
316316
317317
For detailed performance checklists, optimization commands, and anti-pattern reference, see `references/performance-checklist.md`.
318318
319-
320319
## Common Rationalizations
321320
322321
| Rationalization | Reality |

0 commit comments

Comments
 (0)