mirror of
https://github.com/mark3labs/kit.git
synced 2026-06-14 03:30:26 +00:00
e8e99b19a8
* Remove dead code: 5 unused symbols across internal packages
- internal/models: LoadModelSettingsFromConfig (zero refs)
- internal/prompts: PromptTemplate.ExpandWithArgs (zero refs)
- internal/app: NewMessageStore (tests migrated to NewMessageStoreWithMessages)
- internal/config: HasEnvVars (+ its test)
- internal/core: ContextWithSudoPassword (test migrated to context.WithValue)
* pkg/kit: use TreeManager alias in exported signatures
NewTreeManagerAdapter and InitTreeSession now spell their signatures with
the public kit.TreeManager alias instead of internal/session.TreeManager,
so go doc renders domain types rather than internal paths.
* Consolidate tool-kind classification into internal/extensions
coreToolKinds + toolKindFor were duplicated verbatim in
internal/extensions/wrapper.go and pkg/kit/events.go, risking silent
divergence between extension events and SDK events. Single source of
truth now lives in internal/extensions/toolkinds.go; pkg/kit re-exports
the constants.
* Consolidate Anthropic OAuth detection and usage-tracker refresh
The 'is the active Anthropic credential a stored OAuth token' check was
copy-pasted at 5 sites, all prefix-matching the magic string
'stored OAuth' produced in internal/auth. Now:
- internal/auth: new CredentialSourceOAuth constant + IsAnthropicOAuth()
- internal/ui: new UpdateUsageTrackerForModel(); CreateUsageTracker and
SetupCLI share lookupTrackableModel (SetupCLI no longer re-inlines the
tracker construction)
- cmd/root.go + cmd/extension_context.go: verbatim-duplicated tracker
refresh blocks replaced with ui.UpdateUsageTrackerForModel
- pkg/kit isAnthropicOAuth delegates to auth.IsAnthropicOAuth
- internal/models compares source against the constant
* pkg/kit: consolidate model-path helpers and argument tokenizer
- ExtractModelFromPath mis-parsed model IDs containing '/' (e.g.
'openrouter/meta/llama' -> 'meta'); it now delegates to
RemoveProviderFromModel and is deprecated alongside
ExtractProviderFromPath (-> GetCurrentProvider)
- parseFields delegated to prompts.ParseCommandArgs so extension argument
parsing and builtin prompt-template parsing share one quote/escape
grammar; ParseCommandArgs now also splits on tabs (superset of both
previous tokenizers)
* Unify the two {{variable}} template engines
internal/skills and pkg/kit/template_bridge each had their own grammar:
skills rejected '{{ name }}' (whitespace) but allowed digit-first names;
the bridge was the opposite. A template behaved differently depending on
whether it was loaded as a skill prompt or via the extension API.
internal/skills is now the single engine using the superset grammar
(\{\{\s*(\w+)\s*\}\}); pkg/kit ParseTemplate/RenderTemplate are thin
adapters over it. Expand is now regex-based so whitespace placeholders
expand consistently; missing variables are still left as-is.
* internal/ui: extract switchModel helper for model-switch flow
The model-selector handler (ModelSelectedMsg) and /model slash command
duplicated the full switch sequence (thinking-level fallback, setModel,
display-state update, preference persistence, ModelChange emit) and had
already drifted in ordering. Both now call a single switchModel method.
Display state is still updated directly (no prog.Send from Update).
* extbridge: extract shared BaseContext for extension wiring
cmd/extension_context.go and internal/acpserver/session.go each built a
giant extensions.Context literal, duplicating ~15 delegation closures
(GetContextStats, GetMessages, AppendEntry, options, SetModel core,
Complete, SpawnSubagent, ...) that had to be kept in sync by hand. New
data-access fields had to be wired in both places or ACP-mode extensions
silently got nil function fields.
extbridge.BaseContext now provides the headless half; both call sites
overlay only their UI-specific closures. As a side effect ACP mode gains
previously-missing APIs (state, tree navigation, skills, template
parsing, model resolution) that were nil before. The interactive TUI
keeps its exact SetModel/ReloadExtensions ordering via overrides.
* internal/tools: extract withOAuthRetry and marshalToolResult helpers
ExecuteTool repeated the OAuth-error/re-auth/retry stanza verbatim twice
(sync and task-augmented paths) and the marshal-and-wrap stanza four
times. Both are now single helpers with identical error strings, so a
fix to OAuth retry or error categorization applies everywhere at once.
* internal/ui: extract buildShareFile with defer-based cleanup
handleShareCommand repeated the close/remove/print/return cleanup chain
four times across its temp-file write error paths. File assembly now
lives in buildShareFile with a single deferred cleanup on error.
* cmd: extract flag validation, preference restore, and provider-URL routing from runNormalMode
runNormalMode opened with ~150 lines of policy logic (flag-combination
validation, persisted model/thinking-level preference restoration, and
two subtle --provider-url model-rewrite rules). These are now standalone
functions (validateModeFlags, restorePersistedPreferences,
applyProviderURLRouting) so the routing policy is independently readable
and testable. Behaviour unchanged; ordering preserved.
* fix: address review findings on SDK godoc and nil guard
- pkg/kit: remove internal package paths from exported godoc on
ParseTemplate and the ToolKind* constants (SDK doc surface must not
reference internal packages)
- internal/tools: guard marshalToolResult against a nil CallToolResult
(json.Marshal(nil) succeeds as 'null', then result.IsError panics if
a client returns nil result with nil error)
Skipped the TreeNode Children deep-copy suggestion: the slice already
comes from TreeManager.GetChildren which returns a fresh copy per call
into a throwaway intermediate, so no internal state is exposed.
215 lines
5.6 KiB
Go
215 lines
5.6 KiB
Go
package app
|
|
|
|
import (
|
|
"testing"
|
|
|
|
kit "github.com/mark3labs/kit/pkg/kit"
|
|
)
|
|
|
|
// makeTextMsg builds a minimal kit.LLMMessage with the given role and text.
|
|
func makeTextMsg(role, text string) kit.LLMMessage {
|
|
return kit.LLMMessage{
|
|
Role: kit.LLMMessageRole(role),
|
|
Content: []kit.LLMMessagePart{kit.LLMTextPart{Text: text}},
|
|
}
|
|
}
|
|
|
|
// textOf extracts the plain text from an LLMMessage for assertions.
|
|
func textOf(msg kit.LLMMessage) string {
|
|
for _, part := range msg.Content {
|
|
if tp, ok := part.(kit.LLMTextPart); ok {
|
|
return tp.Text
|
|
}
|
|
}
|
|
return ""
|
|
}
|
|
|
|
// --------------------------------------------------------------------------
|
|
// NewMessageStore / NewMessageStoreWithMessages
|
|
// --------------------------------------------------------------------------
|
|
|
|
func TestNewMessageStore_empty(t *testing.T) {
|
|
s := NewMessageStoreWithMessages(nil)
|
|
if s == nil {
|
|
t.Fatal("expected non-nil store")
|
|
}
|
|
if s.Len() != 0 {
|
|
t.Fatalf("expected 0 messages, got %d", s.Len())
|
|
}
|
|
}
|
|
|
|
func TestNewMessageStoreWithMessages_preloaded(t *testing.T) {
|
|
msgs := []kit.LLMMessage{
|
|
makeTextMsg("user", "hello"),
|
|
makeTextMsg("assistant", "hi"),
|
|
}
|
|
s := NewMessageStoreWithMessages(msgs)
|
|
if s.Len() != 2 {
|
|
t.Fatalf("expected 2 messages, got %d", s.Len())
|
|
}
|
|
}
|
|
|
|
// NewMessageStoreWithMessages must deep-copy the slice so that external
|
|
// modifications don't affect the store.
|
|
func TestNewMessageStoreWithMessages_isolatesInput(t *testing.T) {
|
|
msgs := []kit.LLMMessage{makeTextMsg("user", "hello")}
|
|
s := NewMessageStoreWithMessages(msgs)
|
|
|
|
// Mutate the source slice.
|
|
msgs[0] = makeTextMsg("user", "mutated")
|
|
|
|
got := s.GetAll()
|
|
if len(got) != 1 {
|
|
t.Fatalf("expected 1 message, got %d", len(got))
|
|
}
|
|
if textOf(got[0]) != "hello" {
|
|
t.Fatalf("store was mutated by external slice change; got %q", textOf(got[0]))
|
|
}
|
|
}
|
|
|
|
// --------------------------------------------------------------------------
|
|
// Add
|
|
// --------------------------------------------------------------------------
|
|
|
|
func TestAdd_appendsMessage(t *testing.T) {
|
|
s := NewMessageStoreWithMessages(nil)
|
|
s.Add(makeTextMsg("user", "first"))
|
|
s.Add(makeTextMsg("assistant", "second"))
|
|
|
|
if s.Len() != 2 {
|
|
t.Fatalf("expected 2 messages, got %d", s.Len())
|
|
}
|
|
}
|
|
|
|
func TestAdd_preservesOrder(t *testing.T) {
|
|
s := NewMessageStoreWithMessages(nil)
|
|
texts := []string{"a", "b", "c"}
|
|
for _, t2 := range texts {
|
|
s.Add(makeTextMsg("user", t2))
|
|
}
|
|
got := s.GetAll()
|
|
for i, expected := range texts {
|
|
if textOf(got[i]) != expected {
|
|
t.Fatalf("message[%d]: expected %q, got %q", i, expected, textOf(got[i]))
|
|
}
|
|
}
|
|
}
|
|
|
|
// --------------------------------------------------------------------------
|
|
// Replace
|
|
// --------------------------------------------------------------------------
|
|
|
|
func TestReplace_swapsHistory(t *testing.T) {
|
|
s := NewMessageStoreWithMessages(nil)
|
|
s.Add(makeTextMsg("user", "old"))
|
|
|
|
replacement := []kit.LLMMessage{
|
|
makeTextMsg("user", "new1"),
|
|
makeTextMsg("assistant", "new2"),
|
|
}
|
|
s.Replace(replacement)
|
|
|
|
if s.Len() != 2 {
|
|
t.Fatalf("expected 2 messages after replace, got %d", s.Len())
|
|
}
|
|
got := s.GetAll()
|
|
if textOf(got[0]) != "new1" || textOf(got[1]) != "new2" {
|
|
t.Fatalf("unexpected messages after replace: %q %q", textOf(got[0]), textOf(got[1]))
|
|
}
|
|
}
|
|
|
|
// Replace must deep-copy the incoming slice.
|
|
func TestReplace_isolatesInput(t *testing.T) {
|
|
s := NewMessageStoreWithMessages(nil)
|
|
replacement := []kit.LLMMessage{makeTextMsg("user", "original")}
|
|
s.Replace(replacement)
|
|
|
|
replacement[0] = makeTextMsg("user", "mutated")
|
|
|
|
got := s.GetAll()
|
|
if textOf(got[0]) != "original" {
|
|
t.Fatalf("store was mutated by external slice change after Replace; got %q", textOf(got[0]))
|
|
}
|
|
}
|
|
|
|
// --------------------------------------------------------------------------
|
|
// GetAll
|
|
// --------------------------------------------------------------------------
|
|
|
|
func TestGetAll_returnsCopy(t *testing.T) {
|
|
s := NewMessageStoreWithMessages(nil)
|
|
s.Add(makeTextMsg("user", "hello"))
|
|
|
|
got := s.GetAll()
|
|
// Mutate the returned copy — store must not be affected.
|
|
got[0] = makeTextMsg("user", "mutated")
|
|
|
|
internal := s.GetAll()
|
|
if textOf(internal[0]) != "hello" {
|
|
t.Fatalf("GetAll returned non-copy; store was mutated to %q", textOf(internal[0]))
|
|
}
|
|
}
|
|
|
|
func TestGetAll_emptyStore(t *testing.T) {
|
|
s := NewMessageStoreWithMessages(nil)
|
|
got := s.GetAll()
|
|
if len(got) != 0 {
|
|
t.Fatalf("expected empty slice, got %d elements", len(got))
|
|
}
|
|
}
|
|
|
|
// --------------------------------------------------------------------------
|
|
// Clear
|
|
// --------------------------------------------------------------------------
|
|
|
|
func TestClear_removesAllMessages(t *testing.T) {
|
|
s := NewMessageStoreWithMessages(nil)
|
|
s.Add(makeTextMsg("user", "a"))
|
|
s.Add(makeTextMsg("user", "b"))
|
|
s.Clear()
|
|
|
|
if s.Len() != 0 {
|
|
t.Fatalf("expected 0 messages after Clear, got %d", s.Len())
|
|
}
|
|
}
|
|
|
|
func TestClear_allowsSubsequentAdds(t *testing.T) {
|
|
s := NewMessageStoreWithMessages(nil)
|
|
s.Add(makeTextMsg("user", "before"))
|
|
s.Clear()
|
|
s.Add(makeTextMsg("user", "after"))
|
|
|
|
if s.Len() != 1 {
|
|
t.Fatalf("expected 1 message after Clear+Add, got %d", s.Len())
|
|
}
|
|
got := s.GetAll()
|
|
if textOf(got[0]) != "after" {
|
|
t.Fatalf("expected %q, got %q", "after", textOf(got[0]))
|
|
}
|
|
}
|
|
|
|
// --------------------------------------------------------------------------
|
|
// Concurrency smoke test
|
|
// --------------------------------------------------------------------------
|
|
|
|
func TestConcurrentAccess(t *testing.T) {
|
|
s := NewMessageStoreWithMessages(nil)
|
|
done := make(chan struct{})
|
|
|
|
// Writer goroutine.
|
|
go func() {
|
|
for range 100 {
|
|
s.Add(makeTextMsg("user", "concurrent"))
|
|
}
|
|
close(done)
|
|
}()
|
|
|
|
// Reader goroutine — must not race with writer.
|
|
for range 50 {
|
|
_ = s.GetAll()
|
|
_ = s.Len()
|
|
}
|
|
|
|
<-done
|
|
}
|