Fix Go and Python for consistent Result suffix types

- Go: Update session_fs_test.go handler signatures to return (*Result, error)
  for WriteFile, AppendFile, Mkdir, Rm, Rename (previously just error)
- Go: Fix Stat field types (int64, time.Time) and Timestamp format verb
- Go: Remove void-result assertions on Mode.Set
- Python: Fix import sort order in session.py

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: SteveSandersonMS

go/internal/e2e/rpc_test.go

@@ -36,7 +36,7 @@ func TestRpc(t *testing.T) {
 		}
 
 		if result.Timestamp < 0 {
-			t.Errorf("Expected timestamp >= 0, got %f", result.Timestamp)
+			t.Errorf("Expected timestamp >= 0, got %d", result.Timestamp)
 		}
 
 		if err := client.Stop(); err != nil {
@@ -223,13 +223,10 @@ func TestSessionRpc(t *testing.T) {
 		}
 
 		// Switch to plan mode
-		planResult, err := session.RPC.Mode.Set(t.Context(), &rpc.ModeSetRequest{Mode: rpc.SessionModePlan})
+		_, err = session.RPC.Mode.Set(t.Context(), &rpc.ModeSetRequest{Mode: rpc.SessionModePlan})
 		if err != nil {
 			t.Fatalf("Failed to set mode to plan: %v", err)
 		}
-		if *planResult != rpc.SessionModePlan {
-			t.Errorf("Expected mode 'plan', got %q", *planResult)
-		}
 
 		// Verify mode persisted
 		afterPlan, err := session.RPC.Mode.Get(t.Context())
@@ -241,13 +238,10 @@ func TestSessionRpc(t *testing.T) {
 		}
 
 		// Switch back to interactive
-		interactiveResult, err := session.RPC.Mode.Set(t.Context(), &rpc.ModeSetRequest{Mode: rpc.SessionModeInteractive})
+		_, err = session.RPC.Mode.Set(t.Context(), &rpc.ModeSetRequest{Mode: rpc.SessionModeInteractive})
 		if err != nil {
 			t.Fatalf("Failed to set mode to interactive: %v", err)
 		}
-		if *interactiveResult != rpc.SessionModeInteractive {
-			t.Errorf("Expected mode 'interactive', got %q", *interactiveResult)
-		}
 	})
 
 	t.Run("should read, update, and delete plan", func(t *testing.T) {

go/internal/e2e/session_fs_test.go

@@ -266,34 +266,37 @@ func (h *testSessionFsHandler) ReadFile(request *rpc.SessionFSReadFileRequest) (
 	return &rpc.SessionFSReadFileResult{Content: string(content)}, nil
 }
 
-func (h *testSessionFsHandler) WriteFile(request *rpc.SessionFSWriteFileRequest) error {
+func (h *testSessionFsHandler) WriteFile(request *rpc.SessionFSWriteFileRequest) (*rpc.SessionFSWriteFileResult, error) {
 	path := providerPath(h.root, h.sessionID, request.Path)
 	if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
-		return err
+		return nil, err
 	}
 	mode := os.FileMode(0o666)
 	if request.Mode != nil {
 		mode = os.FileMode(uint32(*request.Mode))
 	}
-	return os.WriteFile(path, []byte(request.Content), mode)
+	return &rpc.SessionFSWriteFileResult{}, os.WriteFile(path, []byte(request.Content), mode)
 }
 
-func (h *testSessionFsHandler) AppendFile(request *rpc.SessionFSAppendFileRequest) error {
+func (h *testSessionFsHandler) AppendFile(request *rpc.SessionFSAppendFileRequest) (*rpc.SessionFSAppendFileResult, error) {
 	path := providerPath(h.root, h.sessionID, request.Path)
 	if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
-		return err
+		return nil, err
 	}
 	mode := os.FileMode(0o666)
 	if request.Mode != nil {
 		mode = os.FileMode(uint32(*request.Mode))
 	}
 	f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, mode)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	defer f.Close()
 	_, err = f.WriteString(request.Content)
-	return err
+	if err != nil {
+		return nil, err
+	}
+	return &rpc.SessionFSAppendFileResult{}, nil
 }
 
 func (h *testSessionFsHandler) Exists(request *rpc.SessionFSExistsRequest) (*rpc.SessionFSExistsResult, error) {
@@ -312,26 +315,26 @@ func (h *testSessionFsHandler) Stat(request *rpc.SessionFSStatRequest) (*rpc.Ses
 	if err != nil {
 		return nil, err
 	}
-	ts := info.ModTime().UTC().Format(time.RFC3339)
+	ts := info.ModTime().UTC()
 	return &rpc.SessionFSStatResult{
 		IsFile:      !info.IsDir(),
 		IsDirectory: info.IsDir(),
-		Size:        float64(info.Size()),
+		Size:        info.Size(),
 		Mtime:       ts,
 		Birthtime:   ts,
 	}, nil
 }
 
-func (h *testSessionFsHandler) Mkdir(request *rpc.SessionFSMkdirRequest) error {
+func (h *testSessionFsHandler) Mkdir(request *rpc.SessionFSMkdirRequest) (*rpc.SessionFSMkdirResult, error) {
 	path := providerPath(h.root, h.sessionID, request.Path)
 	mode := os.FileMode(0o777)
 	if request.Mode != nil {
 		mode = os.FileMode(uint32(*request.Mode))
 	}
 	if request.Recursive != nil && *request.Recursive {
-		return os.MkdirAll(path, mode)
+		return &rpc.SessionFSMkdirResult{}, os.MkdirAll(path, mode)
 	}
-	return os.Mkdir(path, mode)
+	return &rpc.SessionFSMkdirResult{}, os.Mkdir(path, mode)
 }
 
 func (h *testSessionFsHandler) Readdir(request *rpc.SessionFSReaddirRequest) (*rpc.SessionFSReaddirResult, error) {
@@ -365,28 +368,28 @@ func (h *testSessionFsHandler) ReaddirWithTypes(request *rpc.SessionFSReaddirWit
 	return &rpc.SessionFSReaddirWithTypesResult{Entries: result}, nil
 }
 
-func (h *testSessionFsHandler) Rm(request *rpc.SessionFSRmRequest) error {
+func (h *testSessionFsHandler) Rm(request *rpc.SessionFSRmRequest) (*rpc.SessionFSRmResult, error) {
 	path := providerPath(h.root, h.sessionID, request.Path)
 	if request.Recursive != nil && *request.Recursive {
 		err := os.RemoveAll(path)
 		if err != nil && request.Force != nil && *request.Force && os.IsNotExist(err) {
-			return nil
+			return &rpc.SessionFSRmResult{}, nil
 		}
-		return err
+		return &rpc.SessionFSRmResult{}, err
 	}
 	err := os.Remove(path)
 	if err != nil && request.Force != nil && *request.Force && os.IsNotExist(err) {
-		return nil
+		return &rpc.SessionFSRmResult{}, nil
 	}
-	return err
+	return &rpc.SessionFSRmResult{}, err
 }
 
-func (h *testSessionFsHandler) Rename(request *rpc.SessionFSRenameRequest) error {
+func (h *testSessionFsHandler) Rename(request *rpc.SessionFSRenameRequest) (*rpc.SessionFSRenameResult, error) {
 	dest := providerPath(h.root, h.sessionID, request.Dest)
 	if err := os.MkdirAll(filepath.Dir(dest), 0o755); err != nil {
-		return err
+		return nil, err
 	}
-	return os.Rename(
+	return &rpc.SessionFSRenameResult{}, os.Rename(
 		providerPath(h.root, h.sessionID, request.Src),
 		dest,
 	)

python/copilot/session.py

@@ -24,7 +24,6 @@
 from .generated.rpc import (
     ClientSessionApiHandlers,
     CommandsHandlePendingCommandRequest,
-    UIHandlePendingElicitationRequest,
     Kind,
     LogRequest,
     ModelSwitchToRequest,
@@ -36,12 +35,13 @@
     SessionRpc,
     ToolCallResult,
     ToolsHandlePendingToolCallRequest,
-    UIElicitationResponseAction,
     UIElicitationRequest,
     UIElicitationResponse,
+    UIElicitationResponseAction,
     UIElicitationSchema,
     UIElicitationSchemaProperty,
     UIElicitationSchemaPropertyNumberType,
+    UIHandlePendingElicitationRequest,
 )
 from .generated.rpc import ModelCapabilitiesOverride as _RpcModelCapabilitiesOverride
 from .generated.session_events import (