toki/iop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(openai): 발급된 artifact 경로를 정규화한다

Browse source 
로컬 모델이 선행 점을 슬래시로 바꾼 경우에도 정확한 Plan과 Review만 식별하고 일반 workspace 호출은 그대로 유지한다.
This commit is contained in:
toki 2026-08-15 08:15:15 +09:00
parent 71c66aeaab
commit 864a930b55
2 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
apps/edge/internal/openai/hot_path_light.go
View file

@ -5,6 +5,8 @@ import (
"encoding/json"
"fmt"
"net/http"
"path/filepath"
"sort"
"strconv"
"strings"
"sync"
@ -596,7 +598,7 @@ func hotPathToolAllowed(tools []any, name string) bool {
}
func hotPathWorkspaceCall(kind hotPathPendingKind, paths reservedPaths, call normalizedToolCall) (workspaceOperationKind, string, bool, error) {
reserved := reservedPathsFromToolCall(call)
reserved := workspaceArtifactPathsFromToolCall(call, paths)
if len(reserved) != 1 {
return "", "", false, nil
}
@ -618,6 +620,31 @@ func hotPathWorkspaceCall(kind hotPathPendingKind, paths reservedPaths, call nor
return "", "", false, nil
}
func workspaceArtifactPathsFromToolCall(call normalizedToolCall, paths reservedPaths) []string {
set := make(map[string]struct{})
for _, path := range reservedPathsFromToolCall(call) {
set[cleanRelativePath(path)] = struct{}{}
}
addAlias := func(value string) {
normalized := filepath.ToSlash(strings.TrimSpace(value))
if strings.HasPrefix(normalized, "/iop/job/") {
normalized = "." + strings.TrimPrefix(normalized, "/")
}
cleaned := cleanRelativePath(normalized)
if cleaned == cleanRelativePath(paths.PlanPath) || cleaned == cleanRelativePath(paths.ReviewPath) {
set[cleaned] = struct{}{}
}
}
addAlias(call.Path)
collectReservedStrings(call.Arguments, addAlias)
result := make([]string, 0, len(set))
for path := range set {
result = append(result, path)
}
sort.Strings(result)
return result
}
func (s *hotPathLightStore) consumeChat(ownerEdgeID, principalRef string, rawBody []byte, lineage logicalRequestContinuationLineage, coordinator *logicalRequestCoordinator) (logicalRequestSnapshot, hotPathLightDisposition, bool, error) {
results, err := decodeChatWorkspaceResults(rawBody)
if err != nil {

18
apps/edge/internal/openai/hot_path_light_test.go
View file

@ -76,6 +76,24 @@ func TestHotPathStageOrdinaryWorkspacePathPassesThrough(t *testing.T) {
}
}
func TestHotPathStageIssuedPlanSlashAliasMapsToCallerTool(t *testing.T) {
binding := mustBinding(t, fullWorkspaceAlternative("command", "bash", true), []any{openAIChatTool("bash", commandSchema())})
record := &hotPathLightRecord{
requestID: "req_stage_alias", phase: hotPathPhaseLocalActive, binding: binding,
}
coordinator := newLogicalRequestCoordinator(logicalRequestCoordinatorOptions{IDSource: func() (string, error) { return "call_public", nil }})
alias := "/" + strings.TrimPrefix(newReservedPaths(record.requestID).PlanPath, ".")
mapped, pending, err := mapHotPathStageCalls(record, normalizedStageOutput{ToolCalls: []normalizedToolCall{{
ID: "provider_read", Name: "read", Arguments: map[string]any{"filePath": alias},
}}}, hotPathPendingLocalTools, coordinator, nil)
if err != nil {
t.Fatal(err)
}
if len(mapped.ToolCalls) != 1 || mapped.ToolCalls[0].Name != "bash" || pending[mapped.ToolCalls[0].ID].payload == nil {
t.Fatalf("issued plan alias was not normalized: calls=%+v pending=%+v", mapped.ToolCalls, pending)
}
}
func TestWorkerProviderReceivesOnlyCallerTools(t *testing.T) {
callerTools := []any{openAIChatTool("run_command", commandSchema())}
tools := hotPathStageProviderTools(hotPathDispatchSnapshot{Phase: hotPathPhaseLocalActive, Tools: callerTools})