fix: allow native tools in manual resume

This commit is contained in:
2026-10-18 21:22:02 +01:00
parent e020d59b07
commit 915fa0a74d
2 changed files with 79 additions and 5 deletions
+78
View File
@@ -338,6 +338,84 @@ func TestRetryResumeReusesPrefixHandoffAndReplaysRequestAfterReopen(t *testing.T
}
}
func TestRetryResumeWithNativeToolsThroughHandlerAndCLI(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
dir := t.TempDir()
executable := filepath.Join(dir, "opencode")
script := `#!/bin/sh
if [ "$1" = "--help" ]; then echo ' api'; exit 0; fi
case "$3" in
/api/session/active) echo '{"data":{}}' ;;
/api/session)
n=0; if [ -f "@STATE@/sessions" ]; then n=$(cat "@STATE@/sessions"); fi
n=$((n+1)); echo "$n" > "@STATE@/sessions"
echo '{"data":{"id":"ses_native_'$n'"}}' ;;
*/prompt) echo '{}' ;;
*/wait) echo '{}' ;;
*/message*)
case "$3" in
*/ses_native_2/*) echo '{"data":[{"finish":"stop","content":[{"type":"text","text":"{\\"outcome\\":\\"invalid\\",\\"output\\":{\\"wrong\\":\\"format\\"}}"}]}]}' ;;
*/ses_native_3/*) echo '{"data":[{"finish":"stop","content":[{"type":"text","text":"{\\"outcome\\":\\"success\\",\\"output\\":{\\"handoff\\":\\"from-b\\"}}"}]}]}' ;;
*) echo '{"data":[{"finish":"stop","content":[{"type":"text","text":"{\\"outcome\\":\\"success\\",\\"output\\":{\\"handoff\\":\\"from-a\\",\\"summary\\":\\"done\\"}}"}]}]}' ;;
esac ;;
*) echo '{}' ;;
esac
`
if err := os.WriteFile(executable, []byte(strings.ReplaceAll(script, "@STATE@", dir)), 0700); err != nil {
t.Fatal(err)
}
t.Setenv("PIPELINES_OPENCODE", executable)
store, err := pipeline.Open(filepath.Join(dir, "runs.db"))
if err != nil {
t.Fatal(err)
}
defer store.Close()
source := "# stage a\n\n```output\n{ handoff, summary }\n```\n\n```prompt\nDo A.\n```\n\n```tools\nread\nglob\ngrep\nshell\n```\n\n```edges\nsuccess -> b\nerror -> #failure\n```\n\n```configs\ntype=model\nprovider=opencode-go\nmodel=deepseek-v4.1-flash\nretries=0\n```\n\n# stage b\n\n```output\n{ handoff }\n```\n\n```prompt\nDo B.\n```\n\n```tools\nread\nglob\ngrep\nshell\n```\n\n```edges\nsuccess -> c\nerror -> #failure\n```\n\n```configs\ntype=model\nprovider=opencode-go\nmodel=deepseek-v4.1-flash\nretries=0\n```\n\n# stage c\n\n```output\n{ handoff, summary }\n```\n\n```prompt\nDo C.\n```\n\n```tools\nread\nglob\ngrep\nshell\n```\n\n```edges\nsuccess -> #success\nerror -> #failure\n```\n\n```configs\ntype=model\nprovider=opencode-go\nmodel=deepseek-v4.1-flash\nretries=0\n```\n"
if _, err := store.Submit(ctx, "native-resume", source); err != nil {
t.Fatal(err)
}
handler := Handler(ctx, store)
defer func() { cancel(); WaitRuns(handler) }()
items, err := store.List(ctx)
if err != nil {
t.Fatal(err)
}
srv := httptest.NewServer(handler)
defer srv.Close()
url := "ws" + strings.TrimPrefix(srv.URL, "http") + "/connect"
workspace := t.TempDir()
runCLI := func(args ...string) (protocol.Message, error) {
var out bytes.Buffer
app := cli.App{Out: &out, Err: &out, In: strings.NewReader("")}
err := app.Run(ctx, append([]string{"--url", url}, args...))
var result protocol.Message
if len(out.Bytes()) > 0 {
_ = json.Unmarshal(out.Bytes(), &result)
}
return result, err
}
first, err := runCLI("run", fmt.Sprint(items[0].Name), "task", "--yes", "--json", "--wait", "--timeout", "10s", "--workspace", workspace, "--request-key", "native-original")
if err == nil || first.RunDetail == nil || first.RunDetail.Status != "failed" || len(first.RunDetail.Steps) != 2 {
t.Fatalf("initial native run did not fail at B: %v %#v", err, first.RunDetail)
}
retried, err := runCLI("retry", fmt.Sprint(first.RunDetail.ID), "--yes", "--json", "--wait", "--timeout", "10s", "--request-key", "native-resume-key", "--mode", "resume")
if err != nil || retried.RunDetail == nil || retried.RunDetail.Status != "succeeded" {
t.Fatalf("native resume failed: %v %#v", err, retried.RunDetail)
}
if retried.RunDetail.RetryOf != first.RunDetail.ID || len(retried.RunDetail.Steps) != 2 || retried.RunDetail.Steps[0].Stage != "b" || retried.RunDetail.Steps[1].Stage != "c" {
t.Fatalf("native resume lost provenance or replayed prefix: %#v", retried.RunDetail)
}
sessions, err := os.ReadFile(filepath.Join(dir, "sessions"))
if err != nil || strings.TrimSpace(string(sessions)) != "4" {
t.Fatalf("native stage execution count = %q, want 4 (A once, B twice, C once): %v", sessions, err)
}
again, err := runCLI("retry", fmt.Sprint(first.RunDetail.ID), "--yes", "--json", "--request-key", "native-resume-key")
if err != nil || again.RunDetail == nil || again.RunDetail.ID != retried.RunDetail.ID {
t.Fatalf("same-key replay was not idempotent: %v %#v", err, again.RunDetail)
}
}
// TestReadOnlyStageRetriesPostAdmissionTransportButMutatingStageDoesNot proves,
// through the real runner and CLI fixture, that a read-only stage retries a
// post-admission transport (final-readback) failure with a fresh session while
+1 -5
View File
@@ -459,13 +459,9 @@ func (r *runner) retrySourceCheckpoint(sourceID int64, pinned *protocol.Pipeline
return retryCheckpoint{}, fmt.Errorf("retry source %d cannot replay completed external stage %s", sourceID, failed.Stage)
}
if typ == stage.ModelType {
tools, explicit, toolErr := stage.ToolNames(pipeline.StageDefinition(declared))
if toolErr != nil {
if _, _, toolErr := stage.ToolNames(pipeline.StageDefinition(declared)); toolErr != nil {
return retryCheckpoint{}, toolErr
}
if explicit && len(tools) > 0 {
return retryCheckpoint{}, fmt.Errorf("retry source %d cannot safely replay admitted native stage %s", sourceID, failed.Stage)
}
}
return retryCheckpoint{detail: source, failed: failed, handoff: handoff}, nil
}