Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 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
35 changes: 35 additions & 0 deletions internal/harness/compose.go
Original file line number Diff line number Diff line change
Expand Up @@ -902,6 +902,23 @@ func fetchBaseSkill(ctx context.Context, field, baseURLDir, skillPath string, al
if ok {
treePath, entry, err := fetch.CacheGetDir(opts.WorkspaceRoot, treeHash)
if err == nil && treePath != "" {
// Apply the same symlink renaming as fetchBaseSkillDir so
// cache-hit paths return the real skill name, not "tree".
skillName := filepath.Base(skillPath)
if skillName == "" || skillName == "." || skillName == ".." || skillName == "metadata.json" {
Comment thread
ralphbean marked this conversation as resolved.
Resolved
skillName = "tree"
}
namedPath := filepath.Join(filepath.Dir(treePath), skillName)
if namedPath != treePath {
if _, lErr := os.Lstat(namedPath); os.IsNotExist(lErr) {
Comment thread
ralphbean marked this conversation as resolved.
Resolved
if sErr := os.Symlink("tree", namedPath); sErr != nil && !os.IsExist(sErr) {
return Dependency{}, "", fmt.Errorf("base %s: creating named symlink: %w", field, sErr)
}
} else if lErr != nil {
return Dependency{}, "", fmt.Errorf("base %s: checking named symlink: %w", field, lErr)
}
treePath = namedPath
}
cachedDep := Dependency{
Field: field,
URL: skillFileURL,
Expand Down Expand Up @@ -992,6 +1009,24 @@ func fetchBaseSkillDir(ctx context.Context, field, skillDirURL, skillFileURL, sk
return Dependency{}, "", fmt.Errorf("base %s: reading cached skill directory: %w", field, err)
}

// Create a symlink named after the skill directory so downstream consumers
Comment thread
ralphbean marked this conversation as resolved.
Resolved
// (sandbox upload, logging) see the real skill name instead of "tree".
skillName := filepath.Base(forgeInfo.Path)
if skillName == "" || skillName == "." || skillName == ".." || skillName == "metadata.json" {
skillName = "tree"
}
namedPath := filepath.Join(filepath.Dir(treePath), skillName)
if namedPath != treePath {
if _, err := os.Lstat(namedPath); os.IsNotExist(err) {
if err := os.Symlink("tree", namedPath); err != nil && !os.IsExist(err) {
return Dependency{}, "", fmt.Errorf("base %s: creating named symlink: %w", field, err)
}
} else if err != nil {
return Dependency{}, "", fmt.Errorf("base %s: checking named symlink: %w", field, err)
}
treePath = namedPath
Comment thread
ralphbean marked this conversation as resolved.
Resolved
}

if iErr := urlIndexPut(opts.WorkspaceRoot, skillFileURL, treeHash); iErr != nil {
return Dependency{}, "", fmt.Errorf("base %s: updating URL index: %w", field, iErr)
}
Expand Down
25 changes: 25 additions & 0 deletions internal/harness/compose_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2798,6 +2798,31 @@ func TestFetchBaseSkill_CacheHit_AuditError(t *testing.T) {
assert.Contains(t, err.Error(), "audit")
}

func TestFetchBaseSkill_CacheHit_UsesSkillNameNotTree(t *testing.T) {
dir := t.TempDir()
cacheDir := filepath.Join(dir, "cache")

skillFileURL := "https://raw.githubusercontent.com/org/repo/ref1/skills/pr-review/SKILL.md"
allowlist := []string{"https://raw.githubusercontent.com/org/repo/"}

files := map[string][]byte{"SKILL.md": []byte("# PR Review")}
treeHash, err := fetch.CachePutDir(cacheDir, skillFileURL, files, fetch.DirCachePutOpts{FullListing: true})
require.NoError(t, err)
require.NoError(t, urlIndexPut(cacheDir, skillFileURL, treeHash))
require.NoError(t, urlIndexPut(cacheDir, "skill:"+skillFileURL, treeHash))

dep, localDir, err := fetchBaseSkill(context.Background(), "skills[0]",
"https://raw.githubusercontent.com/org/repo/ref1/",
"skills/pr-review", allowlist, ComposeOpts{
WorkspaceRoot: cacheDir,
FetchPolicy: fetch.FetchPolicy{Offline: true},
})
require.NoError(t, err)
assert.True(t, dep.CacheHit)
assert.Equal(t, "pr-review", filepath.Base(localDir), "cache-hit path should return skill name, not 'tree'")
assert.FileExists(t, filepath.Join(localDir, "SKILL.md"))
}

func TestFetchBaseSkill_DefaultTreeFetcherUsed(t *testing.T) {
dir := t.TempDir()
cacheDir := filepath.Join(dir, "cache")
Expand Down
19 changes: 19 additions & 0 deletions internal/resolve/resolve.go
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,25 @@ func resolveSkillDirURL(ctx context.Context, field, rawURL string, h *harness.Ha
fetchedAt = dirEntry.FetchTime
}

// Create a symlink named after the skill directory so downstream consumers
// (sandbox upload, logging) see the real skill name instead of "tree".
skillName := filepath.Base(forgeInfo.Path)
Comment thread
ralphbean marked this conversation as resolved.
Resolved
if skillName == "" || skillName == "." || skillName == ".." || skillName == "metadata.json" {
skillName = "tree"
}
namedPath := filepath.Join(filepath.Dir(treePath), skillName)
if namedPath != treePath {
// Idempotent: only create if it doesn't already exist.
Comment thread
ralphbean marked this conversation as resolved.
Resolved
if _, err := os.Lstat(namedPath); os.IsNotExist(err) {
Comment thread
ralphbean marked this conversation as resolved.
Resolved
if err := os.Symlink("tree", namedPath); err != nil && !os.IsExist(err) {
return Dependency{}, "", fmt.Errorf("creating named symlink for %s: %w", field, err)
}
} else if err != nil {
return Dependency{}, "", fmt.Errorf("checking named symlink for %s: %w", field, err)
}
treePath = namedPath
}
Comment thread
ralphbean marked this conversation as resolved.
Resolved
Comment thread
ralphbean marked this conversation as resolved.
Resolved

if opts.AuditLogPath != "" {
if err := fetch.AppendFetchAudit(opts.AuditLogPath, fetch.FetchAuditEntry{
TraceID: opts.TraceID,
Expand Down
57 changes: 56 additions & 1 deletion internal/resolve/resolve_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,13 @@ func TestResolveHarness_SkillDirFetchAndCache(t *testing.T) {
assert.Equal(t, treeHash, deps[0].SHA256)
assert.False(t, deps[0].CacheHit)

// Verify h.Skills[0] is a directory path (the tree/ subdirectory).
// Verify h.Skills[0] is a directory path whose basename is the skill
// directory name from the URL ("review"), not the cache-internal "tree".
info, err := os.Stat(h.Skills[0])
require.NoError(t, err)
assert.True(t, info.IsDir())
assert.Equal(t, "review", filepath.Base(h.Skills[0]),
"skill path basename should be the skill directory name from the URL, not 'tree'")

// Verify SKILL.md is inside the cached directory.
got, err := os.ReadFile(filepath.Join(h.Skills[0], "SKILL.md"))
Expand Down Expand Up @@ -254,6 +257,54 @@ func TestResolveHarness_SkillDirCacheHit(t *testing.T) {
require.NoError(t, err)
require.Len(t, deps, 1)
assert.True(t, deps[0].CacheHit)
assert.Equal(t, "cached", filepath.Base(h.Skills[0]),
"cache-hit skill path basename should be the skill directory name from the URL")
}

func TestResolveHarness_SkillDirDotDotFallsBackToTree(t *testing.T) {
skillMD := []byte("# DotDot skill")

reg := newSkillRegistry()
files := map[string][]byte{"SKILL.md": skillMD}
treeHash := reg.register("skills/..", files)

root := t.TempDir()
h := &harness.Harness{
Skills: []string{forgeSkillURL("skills/..", treeHash)},
AllowedRemoteResources: []string{testForgeBase},
}

deps, err := ResolveHarness(context.Background(), h, ResolveOpts{
WorkspaceRoot: root,
TreeFetcher: reg.fetcher(),
})
require.NoError(t, err)
require.Len(t, deps, 1)
assert.Equal(t, "tree", filepath.Base(h.Skills[0]),
"skill path with '..' basename should fall back to 'tree' to prevent traversal")
}

func TestResolveHarness_SkillDirMetadataJsonFallsBackToTree(t *testing.T) {
skillMD := []byte("# MetadataJson skill")

reg := newSkillRegistry()
files := map[string][]byte{"SKILL.md": skillMD}
treeHash := reg.register("skills/metadata.json", files)

root := t.TempDir()
h := &harness.Harness{
Skills: []string{forgeSkillURL("skills/metadata.json", treeHash)},
AllowedRemoteResources: []string{testForgeBase},
}

deps, err := ResolveHarness(context.Background(), h, ResolveOpts{
WorkspaceRoot: root,
TreeFetcher: reg.fetcher(),
})
require.NoError(t, err)
require.Len(t, deps, 1)
assert.Equal(t, "tree", filepath.Base(h.Skills[0]),
"skill path with 'metadata.json' basename should fall back to 'tree' to avoid cache file collision")
}

func TestResolveHarness_SkillDirHashMismatch(t *testing.T) {
Expand Down Expand Up @@ -607,6 +658,10 @@ func TestResolveHarness_MultipleSkills(t *testing.T) {
assert.False(t, harness.IsURL(h.Skills[1]))
assert.False(t, harness.IsURL(h.Skills[2]))

// Verify skills resolve to directories named after the URL path, not "tree".
assert.Equal(t, "one", filepath.Base(h.Skills[1]))
assert.Equal(t, "two", filepath.Base(h.Skills[2]))

// Verify skills resolve to directories with SKILL.md inside.
got1, err := os.ReadFile(filepath.Join(h.Skills[1], "SKILL.md"))
require.NoError(t, err)
Expand Down
Loading