Skip to content

Commit f1681db

Browse files
Inline no-result constants
Remove the remaining public named no-result PermissionRequestResultKind conveniences and use raw no-result values internally instead. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 5e31212 commit f1681db

9 files changed

Lines changed: 9 additions & 18 deletions

File tree

dotnet/src/Client.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1397,7 +1397,7 @@ public async Task<PermissionRequestResponseV2> OnPermissionRequestV2(string sess
13971397
try
13981398
{
13991399
var result = await session.HandlePermissionRequestAsync(permissionRequest);
1400-
if (result.Kind == PermissionRequestResultKind.NoResult)
1400+
if (result.Kind == new PermissionRequestResultKind("no-result"))
14011401
{
14021402
throw new InvalidOperationException(NoResultPermissionV2ErrorMessage);
14031403
}

dotnet/src/Session.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ private async Task ExecutePermissionAndRespondAsync(string requestId, Permission
467467
};
468468

469469
var result = await handler(permissionRequest, invocation);
470-
if (result.Kind == PermissionRequestResultKind.NoResult)
470+
if (result.Kind == new PermissionRequestResultKind("no-result"))
471471
{
472472
return;
473473
}

dotnet/src/Types.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,6 @@ public class ToolInvocation
283283
/// <summary>Gets the kind indicating the permission was denied interactively by the user.</summary>
284284
public static PermissionRequestResultKind DeniedInteractivelyByUser { get; } = new("denied-interactively-by-user");
285285

286-
/// <summary>Gets the kind indicating the SDK should not answer the pending permission request.</summary>
287-
public static PermissionRequestResultKind NoResult { get; } = new("no-result");
288-
289286
/// <summary>Gets the underlying string value of this <see cref="PermissionRequestResultKind"/>.</summary>
290287
public string Value => _value ?? string.Empty;
291288

dotnet/test/PermissionRequestResultKindTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void WellKnownKinds_HaveExpectedValues()
2121
Assert.Equal("denied-by-rules", PermissionRequestResultKind.DeniedByRules.Value);
2222
Assert.Equal("denied-no-approval-rule-and-could-not-request-from-user", PermissionRequestResultKind.DeniedCouldNotRequestFromUser.Value);
2323
Assert.Equal("denied-interactively-by-user", PermissionRequestResultKind.DeniedInteractivelyByUser.Value);
24-
Assert.Equal("no-result", PermissionRequestResultKind.NoResult.Value);
24+
Assert.Equal("no-result", new PermissionRequestResultKind("no-result").Value);
2525
}
2626

2727
[Fact]
@@ -116,7 +116,7 @@ public void JsonRoundTrip_PreservesAllKinds()
116116
PermissionRequestResultKind.DeniedByRules,
117117
PermissionRequestResultKind.DeniedCouldNotRequestFromUser,
118118
PermissionRequestResultKind.DeniedInteractivelyByUser,
119-
PermissionRequestResultKind.NoResult,
119+
new PermissionRequestResultKind("no-result"),
120120
};
121121

122122
foreach (var kind in kinds)

go/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1533,7 +1533,7 @@ func (c *Client) handlePermissionRequestV2(req permissionRequestV2) (*permission
15331533
},
15341534
}, nil
15351535
}
1536-
if result.Kind == PermissionRequestResultKindNoResult {
1536+
if result.Kind == "no-result" {
15371537
return nil, &jsonrpc2.Error{Code: -32603, Message: noResultPermissionV2Error}
15381538
}
15391539

go/session.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ func (s *Session) executePermissionAndRespond(requestID string, permissionReques
562562
})
563563
return
564564
}
565-
if result.Kind == PermissionRequestResultKindNoResult {
565+
if result.Kind == "no-result" {
566566
return
567567
}
568568

go/types.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@ const (
124124
// PermissionRequestResultKindDeniedInteractivelyByUser indicates the permission was denied interactively by the user.
125125
PermissionRequestResultKindDeniedInteractivelyByUser PermissionRequestResultKind = "denied-interactively-by-user"
126126

127-
// PermissionRequestResultKindNoResult indicates the SDK should not answer the pending permission request.
128-
PermissionRequestResultKindNoResult PermissionRequestResultKind = "no-result"
129127
)
130128

131129
// PermissionRequestResult represents the result of a permission request

go/types_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func TestPermissionRequestResultKind_Constants(t *testing.T) {
1515
{"DeniedByRules", PermissionRequestResultKindDeniedByRules, "denied-by-rules"},
1616
{"DeniedCouldNotRequestFromUser", PermissionRequestResultKindDeniedCouldNotRequestFromUser, "denied-no-approval-rule-and-could-not-request-from-user"},
1717
{"DeniedInteractivelyByUser", PermissionRequestResultKindDeniedInteractivelyByUser, "denied-interactively-by-user"},
18-
{"NoResult", PermissionRequestResultKindNoResult, "no-result"},
18+
{"NoResult", PermissionRequestResultKind("no-result"), "no-result"},
1919
}
2020

2121
for _, tt := range tests {
@@ -43,7 +43,7 @@ func TestPermissionRequestResult_JSONRoundTrip(t *testing.T) {
4343
{"DeniedByRules", PermissionRequestResultKindDeniedByRules},
4444
{"DeniedCouldNotRequestFromUser", PermissionRequestResultKindDeniedCouldNotRequestFromUser},
4545
{"DeniedInteractivelyByUser", PermissionRequestResultKindDeniedInteractivelyByUser},
46-
{"NoResult", PermissionRequestResultKindNoResult},
46+
{"NoResult", PermissionRequestResultKind("no-result")},
4747
{"Custom", PermissionRequestResultKind("custom")},
4848
}
4949

nodejs/src/types.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,13 +240,9 @@ export interface PermissionRequest {
240240

241241
import type { SessionPermissionsHandlePendingPermissionRequestParams } from "./generated/rpc.js";
242242

243-
export interface NoResultPermissionRequestResult {
244-
kind: "no-result";
245-
}
246-
247243
export type PermissionRequestResult =
248244
| SessionPermissionsHandlePendingPermissionRequestParams["result"]
249-
| NoResultPermissionRequestResult;
245+
| { kind: "no-result" };
250246

251247
export type PermissionHandler = (
252248
request: PermissionRequest,

0 commit comments

Comments
 (0)