Skip to content

Open-source LLM knowledge platform: turn raw documents into a queryable RAG, an autonomous reasoning agent, and a self-maintaining Wiki.

fix(cli): carry --modified-args/--reason in the exit-10 retry argv (#4686)

ydflowc554598f2218
diff --git a/cli/cmd/session/tool_approval.go b/cli/cmd/session/tool_approval.go
index 899b162c6..01d5f5889 100644
--- a/cli/cmd/session/tool_approval.go
+++ b/cli/cmd/session/tool_approval.go
@@ -199,7 +199,16 @@ func runResolve(ctx context.Context, opts *ResolveOptions, fopts *cmdutil.Format
return err
}
decision := decisionOf(opts.Reject)
+ // The retry argv is the exact argv that would proceed (AGENTS.md exit-10
+ // contract): the decision-relevant flags belong in it, or the envelope
+ // advertises an approval of the original arguments.
retryCmd := append([]string{"weknora", "session", "tool-approval", "resolve", opts.PendingID}, retryArgOf(opts.Reject)...)
+ if opts.ModifiedArgs != "" {
+ retryCmd = append(retryCmd, "--modified-args", opts.ModifiedArgs)
+ }
+ if opts.Reason != "" {
+ retryCmd = append(retryCmd, "--reason", opts.Reason)
+ }
retryCmd = append(retryCmd, "-y")
if err := cmdutil.ConfirmDestructive(p, opts.Yes, fopts.WantsJSON(), decision, "tool call", opts.PendingID, "session.tool_approval.resolve", retryCmd); err != nil {
return err
diff --git a/cli/cmd/session/tool_approval_retry_argv_test.go b/cli/cmd/session/tool_approval_retry_argv_test.go
new file mode 100644
index 000000000..17ef6ae61
--- /dev/null
+++ b/cli/cmd/session/tool_approval_retry_argv_test.go
@@ -0,0 +1,69 @@
+package sessioncmd
+
+import (
+ "context"
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+
+ "github.com/Tencent/WeKnora/cli/internal/cmdutil"
+ "github.com/Tencent/WeKnora/cli/internal/iostreams"
+ "github.com/Tencent/WeKnora/cli/internal/testutil"
+)
+
+// AGENTS.md exit-10 contract: "retry_argv showing the exact argv that would
+// proceed". The decision-relevant flags are part of that argv — dropping
+// --modified-args means the retry envelope advertises an approval of the
+// ORIGINAL (possibly dangerous) arguments.
+func TestRunResolve_Exit10RetryArgvCarriesModifiedArgsAndReason(t *testing.T) {
+ _, _ = iostreams.SetForTest(t)
+ svc := &fakeResolveSvc{}
+ err := runResolve(context.Background(), &ResolveOptions{
+ PendingID: "p1",
+ ModifiedArgs: `{"cmd":"safe command"}`,
+ Reason: "reviewed by human",
+ }, jsonOpts(), svc, &testutil.ConfirmPrompter{})
+ require.Error(t, err)
+ var typed *cmdutil.Error
+ require.ErrorAs(t, err, &typed)
+ assert.Equal(t, cmdutil.CodeInputConfirmationRequired, typed.Code)
+ require.NotEmpty(t, typed.RetryArgv)
+ assert.Contains(t, typed.RetryArgv, "--modified-args")
+ assert.Contains(t, typed.RetryArgv, `{"cmd":"safe command"}`)
+ assert.Contains(t, typed.RetryArgv, "--reason")
+ assert.Contains(t, typed.RetryArgv, "reviewed by human")
+ assert.Contains(t, typed.RetryArgv, "-y")
+ assert.NotContains(t, typed.RetryArgv, "--reject")
+ assert.Empty(t, svc.gotPendingID, "SDK must not be called without confirmation")
+}
+
+func TestRunResolve_Exit10RetryArgvRejectCarriesReason(t *testing.T) {
+ _, _ = iostreams.SetForTest(t)
+ svc := &fakeResolveSvc{}
+ err := runResolve(context.Background(), &ResolveOptions{
+ PendingID: "p1",
+ Reject: true,
+ Reason: "wrong target",
+ }, jsonOpts(), svc, &testutil.ConfirmPrompter{})
+ require.Error(t, err)
+ var typed *cmdutil.Error
+ require.ErrorAs(t, err, &typed)
+ require.NotEmpty(t, typed.RetryArgv)
+ assert.Contains(t, typed.RetryArgv, "--reject")
+ assert.Contains(t, typed.RetryArgv, "--reason")
+ assert.Contains(t, typed.RetryArgv, "wrong target")
+}
+
+func TestRunResolve_Exit10RetryArgvPlainApproveStaysMinimal(t *testing.T) {
+ _, _ = iostreams.SetForTest(t)
+ svc := &fakeResolveSvc{}
+ err := runResolve(context.Background(), &ResolveOptions{PendingID: "p1"},
+ jsonOpts(), svc, &testutil.ConfirmPrompter{})
+ require.Error(t, err)
+ var typed *cmdutil.Error
+ require.ErrorAs(t, err, &typed)
+ assert.NotContains(t, typed.RetryArgv, "--modified-args")
+ assert.NotContains(t, typed.RetryArgv, "--reason")
+ assert.NotContains(t, typed.RetryArgv, "--reject")
+}